Skip to content

[stable24] Fix file public link permissions if public upload is not enabled #33439

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.

Sign up for GitHub

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

Merged
blizzz merged 2 commits into from
Aug 3, 2022
Merged

[stable24] Fix file public link permissions if public upload is not enabled #33439

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
933bd27
don't reduce file public link permissions if public upload is not ena…
Jun 21, 2022
008a9f5
fix share manager tests
Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
don't reduce file public link permissions if public upload is not ena… 
…bled

Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
@backportbot-nextcloud
Julien Veyssier authored and backportbot-nextcloud[bot] committed Aug 2, 2022
commit 933bd27ea9d83a1368bb8067dd5238eb426cfeae
4 changes: 2 additions & 2 deletions lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ protected function linkCreateChecks(IShare $share) {
}

// Check if public upload is allowed
if (!$this->shareApiLinkAllowPublicUpload() &&
if ($share->getNodeType() === 'folder' && !$this->shareApiLinkAllowPublicUpload() &&
($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) {
throw new \InvalidArgumentException('Public upload is not allowed');
}
Expand Down Expand Up @@ -1543,7 +1543,7 @@ public function getShareByToken($token) {
* Reduce the permissions for link or email shares if public upload is not enabled
*/
if (($share->getShareType() === IShare::TYPE_LINK || $share->getShareType() === IShare::TYPE_EMAIL)
&& !$this->shareApiLinkAllowPublicUpload()) {
&& $share->getNodeType() === 'folder' && !$this->shareApiLinkAllowPublicUpload()) {
$share->setPermissions($share->getPermissions() & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE));
}

Expand Down