Skip to content

[stable9.1] Skip null groups in group manager #26871

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
PVince81 merged 8 commits into from
Jan 17, 2017
Merged

[stable9.1] Skip null groups in group manager #26871

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83318d4
Skip null groups in group manager
Dec 23, 2016
a9a1e42
Also skip null groups in group manager's search function
Jan 12, 2017
af97752
Add more group null checks in sharing code
Jan 12, 2017
6bad08e
Add unit tests for null group safety in group manager
Jan 12, 2017
ee42733
Add unit tests for sharing code null group checks
Jan 12, 2017
1923e9a
Added tests for null groups handling in sharing code
Jan 12, 2017
44874fd
Ignore moveShare optional repair in mount provider
Jan 12, 2017
56ca62a
Adjust null group handing + tests
Jan 13, 2017
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
Adjust null group handing + tests
  • Loading branch information
Vincent Petry committed Jan 17, 2017
commit 56ca62ae46914d8ea1e9b27b52af2450aa6cfc60
4 changes: 4 additions & 0 deletions apps/files_sharing/lib/MountProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ private function buildSuperShares(array $allShares, \OCP\IUser $user) {
// such issue can usually happen when dealing with
// null groups which usually appear with group backend
// caching inconsistencies
Copy link
Member

@jvillafanez jvillafanez Jan 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather log something. It will be easier to debug possible errors or to know what is being ignored.

\OC::$server->getLogger()->debug(
'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
['app' => 'files_sharing']
);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/tests/API/Share20OCSTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ public function testCanAccessShare() {
// null group
$share = $this->getMock('OCP\Share\IShare');
$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_GROUP);
$share->method('getSharedWith')->willReturn('group2');
$share->method('getSharedWith')->willReturn('groupnull');
$this->assertFalse($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));

$share = $this->getMock('OCP\Share\IShare');
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/Share20/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ public function testUserCreateChecksIdenticalPathSharedViaDeletedGroup() {
->with($path)
->willReturn([$share2]);

$this->invokePrivate($this->manager, 'userCreateChecks', [$share]);
$this->assertNull($this->invokePrivate($this->manager, 'userCreateChecks', [$share]));
}

public function testUserCreateChecksIdenticalPathNotSharedWithUser() {
Expand Down Expand Up @@ -1253,7 +1253,7 @@ public function testGroupCreateChecksShareWithGroupMembersOnlyNullGroup() {
['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
]));

$this->invokePrivate($this->manager, 'groupCreateChecks', [$share]);
$this->assertNull($this->invokePrivate($this->manager, 'groupCreateChecks', [$share]));
}

public function testGroupCreateChecksShareWithGroupMembersOnlyInGroup() {
Expand Down