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

Merge pull request #22700 from owncloud/only_1_linkshare

Browse source 
For now only allow 1 link share per file/folder
This commit is contained in:
Thomas Müller 2016-03-01 09:22:39 +01:00
commit 1652541150
3 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_sharing/api/share20ocs.php
View file

@ -303,6 +303,15 @@ class Share20OCS {
return new \OC_OCS_Result(null, 404, 'public link sharing is disabled by the administrator');
}
/*
* For now we only allow 1 link share.
* Return the existing link share if this is a duplicate
*/
$existingShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $path, false, 1, 0);
if (!empty($existingShares)) {
return new \OC_OCS_Result($this->formatShare($existingShares[0]));
}
$publicUpload = $this->request->getParam('publicUpload', null);
if ($publicUpload === 'true') {
// Check if public upload is allowed

20
build/integration/features/bootstrap/Sharing.php
View file

@ -17,6 +17,9 @@ trait Sharing{
/** @var SimpleXMLElement */
private $lastShareData = null;
/** @var int */
private $savedShareId = null;
/**
* @Given /^as "([^"]*)" creating a share with$/
* @param \Behat\Gherkin\Node\TableNode|null $formData
@ -422,5 +425,22 @@ trait Sharing{
}
}
/**
* @When save last share id
*/
public function saveLastShareId()
{
$this->savedShareId = $this->lastShareData['data']['id'];
}
/**
* @Then share ids should match
*/
public function shareIdsShouldMatch()
{
if ($this->savedShareId !== $this->lastShareData['data']['id']) {
throw new \Excetion('Expected the same link share to be returned');
}
}
}

12
build/integration/features/sharing-v1.feature
View file

@ -547,3 +547,15 @@ Feature: sharing
When Updating last share with
| permissions | 31 |
Then the OCS status code should be "404"
Scenario: Only allow 1 link share per file/folder
Given user "user0" exists
And As an "user0"
And creating a share with
| path | welcome.txt |
| shareType | 3 |
When save last share id
And creating a share with
| path | welcome.txt |
| shareType | 3 |
Then share ids should match