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

Merge pull request #24196 from nextcloud/backport/24098/stable20 

[stable20] circleId too short in some request
This commit is contained in:
Roeland Jago Douma 2020-11-19 10:09:45 +01:00 committed by GitHub
parent d0417e0d1f d4ea5fd63f
commit 2c5a1fd636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files_sharing/lib/Controller/ShareAPIController.php
View File

@ -1648,10 +1648,11 @@ class ShareAPIController extends OCSController {
$hasCircleId = (substr($share->getSharedWith(), -1) === ']'); $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0); $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' ')); $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
if (is_bool($shareWithLength)) { if ($shareWithLength === false) {
$shareWithLength = -1; $sharedWith = substr($share->getSharedWith(), $shareWithStart);
} else {
$sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
} }
$sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
try { try {
$member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1); $member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1);
if ($member->getLevel() >= 4) { if ($member->getLevel() >= 4) {