Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Avoid failing with duplicate checks #36830

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Conversation

juliusknorr
Copy link
Member

@juliusknorr juliusknorr commented Feb 23, 2023

Summary

When receiving a share the workflow mimetype check the patch was always checked but was an empty string (considered as application/octet-stream then).

There is no need for performing this check anymore here since it is covered within getActualValue these days.

Steps to reproduce:

  • Block access with files_accesscontrol with the followin rules
    • If not mimetype httpd/directory
    • If not mimetype application/pdf
  • Uplaod a pdf file and share it to user B

Before this the file was not visible to the recipient

Note this seems to occur only after #25768

Covered with integration tests by nextcloud/files_accesscontrol#321

Checklist

@juliusknorr juliusknorr force-pushed the bugfix/noid/flow-mime-share branch from d1c07c6 to 77e0403 Compare February 23, 2023 12:39
@juliusknorr juliusknorr added bug 3. to review Waiting for reviews labels Feb 23, 2023
@juliusknorr juliusknorr added this to the Nextcloud 26 milestone Feb 23, 2023
@juliusknorr

This comment was marked as outdated.

@nickvergessen nickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Feb 23, 2023
@blizzz blizzz mentioned this pull request Mar 7, 2023
@blizzz blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 7, 2023
juliusknorr added a commit to nextcloud/files_accesscontrol that referenced this pull request Mar 24, 2023
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr force-pushed the bugfix/noid/flow-mime-share branch from 77e0403 to 39874cc Compare March 27, 2023 07:30
juliusknorr added a commit to nextcloud/files_accesscontrol that referenced this pull request Mar 28, 2023
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr force-pushed the bugfix/noid/flow-mime-share branch from 39874cc to b695fa7 Compare April 14, 2023 13:58
juliusknorr added a commit to nextcloud/files_accesscontrol that referenced this pull request Apr 14, 2023
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Apr 14, 2023
This was referenced May 3, 2023
@juliusknorr juliusknorr force-pushed the bugfix/noid/flow-mime-share branch from b695fa7 to 10c2c73 Compare May 9, 2023 17:23
@juliusknorr juliusknorr requested a review from blizzz May 10, 2023 11:08
@blizzz blizzz mentioned this pull request May 17, 2023
@blizzz blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023
@juliusknorr
Copy link
Member Author

Another ping for review here

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr force-pushed the bugfix/noid/flow-mime-share branch from 10c2c73 to 06d80ba Compare July 12, 2023 14:54
@blizzz blizzz merged commit 5182962 into master Jul 12, 2023
@blizzz blizzz deleted the bugfix/noid/flow-mime-share branch July 12, 2023 17:12
@juliusknorr
Copy link
Member Author

/backport to stable27

@juliusknorr
Copy link
Member Author

/backport to stable26

@juliusknorr
Copy link
Member Author

/backport to stable25

@juliusknorr
Copy link
Member Author

/backport to stable24

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable24 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable24
git pull origin stable24

# Create the new backport branch
git checkout -b fix/foo-stable24

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants