mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19820 from owncloud/properError_sharing_with_owner 

When sharing with the owner show the path
This commit is contained in:
Roeland Douma 2015-10-16 21:26:30 +02:00
parent 9e6a4dce43 8fdb12f8fb
commit 0f309c0977
2 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/share/share.php
View File

@ -619,10 +619,13 @@ class Share extends Constants {
if (is_null($itemSourceName)) { if (is_null($itemSourceName)) {
$itemSourceName = $itemSource; $itemSourceName = $itemSource;
} }
$itemName = $itemSourceName;
// check if file can be shared // check if file can be shared
if ($itemType === 'file' or $itemType === 'folder') { if ($itemType === 'file' or $itemType === 'folder') {
$path = \OC\Files\Filesystem::getPath($itemSource); $path = \OC\Files\Filesystem::getPath($itemSource);
$itemName = $path;
// verify that the file exists before we try to share it // verify that the file exists before we try to share it
if (!$path) { if (!$path) {
$message = 'Sharing %s failed, because the file does not exist'; $message = 'Sharing %s failed, because the file does not exist';
@ -677,9 +680,9 @@ class Share extends Constants {
// Verify share type and sharing conditions are met // Verify share type and sharing conditions are met
if ($shareType === self::SHARE_TYPE_USER) { if ($shareType === self::SHARE_TYPE_USER) {
if ($shareWith == $uidOwner) { if ($shareWith == $uidOwner) {
$message = 'Sharing %s failed, because the user %s is the item owner'; $message = 'Sharing %s failed, because you can not share with yourself';
$message_t = $l->t('Sharing %s failed, because the user %s is the item owner', array($itemSourceName, $shareWith)); $message_t = $l->t('Sharing %s failed, because you can not share with yourself', [$itemName]);
\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG); \OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
throw new \Exception($message_t); throw new \Exception($message_t);
} }
if (!\OC_User::userExists($shareWith)) { if (!\OC_User::userExists($shareWith)) {
@ -2209,7 +2212,7 @@ class Share extends Constants {
// Check if attempting to share back to owner // Check if attempting to share back to owner
if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) { if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
$message = 'Sharing %s failed, because the user %s is the original sharer'; $message = 'Sharing %s failed, because the user %s is the original sharer';
$message_t = $l->t('Sharing %s failed, because the user %s is the original sharer', array($itemSourceName, $shareWith)); $message_t = $l->t('Sharing failed, because the user %s is the original sharer', [$shareWith]);
\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG); \OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
throw new \Exception($message_t); throw new \Exception($message_t);

47
tests/lib/share/share.php
View File

@ -218,7 +218,7 @@ class Test_Share extends \Test\TestCase {
public function testShareWithUser() { public function testShareWithUser() {
// Invalid shares // Invalid shares
$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner'; $message = 'Sharing test.txt failed, because you can not share with yourself';
try { try {
OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ); OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ);
$this->fail('Exception was expected: '.$message); $this->fail('Exception was expected: '.$message);
@ -255,7 +255,7 @@ class Test_Share extends \Test\TestCase {
// Attempt to share back // Attempt to share back
OC_User::setUserId($this->user2); OC_User::setUserId($this->user2);
$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer'; $message = 'Sharing failed, because the user '.$this->user1.' is the original sharer';
try { try {
OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ); OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ);
$this->fail('Exception was expected: '.$message); $this->fail('Exception was expected: '.$message);
@ -640,7 +640,7 @@ class Test_Share extends \Test\TestCase {
// Attempt to share back to owner of group share // Attempt to share back to owner of group share
OC_User::setUserId($this->user2); OC_User::setUserId($this->user2);
$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer'; $message = 'Sharing failed, because the user '.$this->user1.' is the original sharer';
try { try {
OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ); OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ);
$this->fail('Exception was expected: '.$message); $this->fail('Exception was expected: '.$message);
@ -1735,6 +1735,47 @@ class Test_Share extends \Test\TestCase {
); );
$this->assertCount(4, $res); $this->assertCount(4, $res);
} }
public function testShareWithSelfError() {
OC_User::setUserId($this->user1);
$view = new \OC\Files\View('/' . $this->user1 . '/');
$view->mkdir('files/folder1');
$fileInfo = $view->getFileInfo('files/folder1');
$this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
$fileId = $fileInfo->getId();
try {
OCP\Share::shareItem('folder', $fileId, OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_ALL);
$this->fail();
} catch (\Exception $e) {
$this->assertEquals('Sharing /folder1 failed, because you can not share with yourself', $e->getMessage());
}
}
public function testShareWithOwnerError() {
OC_User::setUserId($this->user1);
$view = new \OC\Files\View('/' . $this->user1 . '/');
$view->mkdir('files/folder1');
$fileInfo = $view->getFileInfo('files/folder1');
$this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
$fileId = $fileInfo->getId();
$this->assertTrue(
OCP\Share::shareItem('folder', $fileId, OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_ALL),
'Failed asserting that user 1 successfully shared "test" with user 2.'
);
OC_User::setUserId($this->user2);
try {
OCP\Share::shareItem('folder', $fileId, OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_ALL);
$this->fail();
} catch (\Exception $e) {
$this->assertEquals('Sharing failed, because the user ' . $this->user1 . ' is the original sharer', $e->getMessage());
}
}
} }
class DummyShareClass extends \OC\Share\Share { class DummyShareClass extends \OC\Share\Share {