Skip to content

Fix resharing of federated shares that were created out of links #19793

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
MorrisJobke merged 4 commits into from
Apr 27, 2020
Merged

Fix resharing of federated shares that were created out of links #19793

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45c3ee7
Set proper share type when converting link shares to federated shares
juliusknorr Mar 5, 2020
5646f7c
Link shares have reshare permission if outgoing federated shares are …
juliusknorr Mar 5, 2020
397ab1c
Remove unneeded test since links have resharing permissions by default
juliusknorr Apr 9, 2020
7a9469f
Adjust integration tests to new permissions
juliusknorr Apr 23, 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 Apr 21, 2020
commit 397ab1c3c55411053d843ee0618493b41a3471e9
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 @@ -1373,24 +1373,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')
->willReturnMap([
['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