Skip to content

[stable18] Fix resharing of federated shares that were created out of links #21109

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
rullzer merged 8 commits into from
May 28, 2020
Merged

[stable18] Fix resharing of federated shares that were created out of links #21109

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b74da3
Set proper share type when converting link shares to federated shares
juliusknorr Mar 5, 2020
4a2ded0
Link shares have reshare permission if outgoing federated shares are …
juliusknorr Mar 5, 2020
a822942
Remove unneeded test since links have resharing permissions by default
juliusknorr Apr 9, 2020
4b7b102
Adjust integration tests to new permissions
juliusknorr Apr 23, 2020
04b0257
Have share permissions on link shares if it is enabled
rullzer May 6, 2020
20c47cf
Update public link share permission code
rullzer May 6, 2020
9a1275b
Fix share update test
juliusknorr May 15, 2020
9d422a2
Fix federated link sharing permissions
skjnldsv Apr 29, 2020
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
Prev Previous commit
Next Next commit
Remove unneeded test since links have resharing permissions by default 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed May 26, 2020
commit a8229421df8a6e4e5b5aa8295b917ec1ca0d3103
18 changes: 0 additions & 18 deletions tests/lib/Share20/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,24 +1375,6 @@ public function testLinkCreateChecksNoLinkSharesAllowed() {
}


public function testLinkCreateChecksSharePermissions() {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Link shares can’t have reshare permissions');

$share = $this->manager->newShare();

$share->setPermissions(\OCP\Constants::PERMISSION_SHARE);

$this->config
->method('getAppValue')
->will($this->returnValueMap([
['core', 'shareapi_allow_links', 'yes', 'yes'],
]));

self::invokePrivate($this->manager, 'linkCreateChecks', [$share]);
}


public function testLinkCreateChecksNoPublicUpload() {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Public upload is not allowed');
Expand Down