upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #61067 from nextcloud/fix-public-link-mask-ext

Browse source 
fix: use correct permissions mask for non-home storage public links
This commit is contained in:
Stephan Orbaugh 2026-06-09 17:25:07 +02:00 committed by GitHub
commit 50d07d6256
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/dav/appinfo/v2/publicremote.php
View file

@ -7,6 +7,7 @@
*/
use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\DirPermissionsMask;
use OC\Files\Storage\Wrapper\PermissionsMask;
use OC\Files\View;
use OCA\DAV\Connector\Sabre\PublicAuth;
use OCA\DAV\Connector\Sabre\ServerFactory;
@ -21,6 +22,7 @@ use OCP\App\IAppManager;
use OCP\BeforeSabrePubliclyLoadedEvent;
use OCP\Constants;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\IHomeStorage;
use OCP\Files\IRootFolder;
use OCP\Files\Mount\IMountManager;
use OCP\ICacheFactory;
@ -115,11 +117,15 @@ $server = $serverFactory->createServer(true, $baseuri, $requestUri, $authPlugin,
$mask |= Constants::PERMISSION_READ | Constants::PERMISSION_DELETE;
}
return new DirPermissionsMask([
'storage' => $storage,
'mask' => $mask,
'path' => 'files',
]);
if ($storage instanceof IHomeStorage) {
return new DirPermissionsMask([
'storage' => $storage,
'mask' => $mask,
'path' => 'files',
]);
} else {
return new PermissionsMask(['storage' => $storage, 'mask' => $mask]);
}
});
/** @psalm-suppress MissingClosureParamType */

17
build/integration/features/bootstrap/WebDav.php
View file

@ -334,6 +334,23 @@ trait WebDav {
}
}
/**
* @When Uploading public file :filename with content :content
*/
public function uploadingPublicFile(string $filename, string $content) {
$token = $this->lastShareData->data->token;
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/dav/files/$token/$filename";
$client = new GClient();
try {
$this->response = $client->request('PUT', $fullUrl, [
'body' => $content
]);
} catch (\GuzzleHttp\Exception\ClientException $e) {
$this->response = $e->getResponse();
}
}
/**
* @Then /^as "([^"]*)" gets properties of (file|folder|entry) "([^"]*)" with$/
* @param string $user

23
build/integration/sharing_features/sharing-v1.feature
View file

@ -556,7 +556,28 @@ Feature: sharing
And Share fields of last share match with
| expiration | +3 days |
Scenario: getting all shares of a user using that user
Scenario: Writing to a read-only link share of an external storage
Given user "user0" exists
Then As an "user0"
When creating a share with
| path | local_storage |
| shareType | 3 |
And the OCS status code should be "100"
And the HTTP status code should be "200"
Then Uploading public file "foo.txt" with content "bar"
And the HTTP status code should be "403"
Scenario: Writing to a read-write link share of an external storage
Given user "user0" exists
Then As an "user0"
When creating a share with
| path | local_storage |
| shareType | 3 |
| permissions | 7 |
Then Uploading public file "foo.txt" with content "bar"
And the HTTP status code should be "201"
Scenario: getting all shares of a user using that user
Given user "user0" exists
And user "user1" exists
When User "user1" deletes file "/textfile0.txt"