wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19591 from nextcloud/backport/19528/stable18

Browse source 
[stable18] Strip of users home path from share api message
This commit is contained in:
Roeland Jago Douma 2020-02-23 11:39:54 +01:00 committed by GitHub
commit 51d75fc7ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/Share20/Manager.php
View file

@ -289,7 +289,8 @@ class Manager implements IManager {
// Check if we actually have share permissions
if (!$share->getNode()->isShareable()) {
$message_t = $this->l->t('You are not allowed to share %s', [$share->getNode()->getPath()]);
$path = $userFolder->getRelativePath($share->getNode()->getPath());
$message_t = $this->l->t('You are not allowed to share %s', [$path]);
throw new GenericShareException($message_t, $message_t, 404);
}
@ -333,7 +334,8 @@ class Manager implements IManager {
// Check that we do not share with more permissions than we have
if ($share->getPermissions() & ~$permissions) {
$message_t = $this->l->t('Can’t increase permissions of %s', [$share->getNode()->getPath()]);
$path = $userFolder->getRelativePath($share->getNode()->getPath());
$message_t = $this->l->t('Can’t increase permissions of %s', [$path]);
throw new GenericShareException($message_t, $message_t, 404);
}

3
tests/lib/Share20/ManagerTest.php
View file

@ -708,6 +708,9 @@ class ManagerTest extends \Test\TestCase {
$userFolder = $this->createMock(Folder::class);
$userFolder->method('getPath')->willReturn('myrootfolder');
$userFolder->expects($this->any())
->method('getRelativePath')
->willReturnArgument(0);
$this->rootFolder->method('getUserFolder')->willReturn($userFolder);