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

Merge pull request #25422 from nextcloud/backport/25383/stable19 

[stable19] Properly handle SMB ACL blocking scanning a directory
This commit is contained in:
Julius Härtl 2021-02-02 11:58:43 +01:00 committed by GitHub
parent 5c8be9ac66 6f6f45b77b
commit 5b898fa60e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dav/lib/Connector/Sabre/Directory.php
View File

@ -40,6 +40,7 @@ use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
use OCP\Files\FileInfo; use OCP\Files\FileInfo;
use OCP\Files\ForbiddenException; use OCP\Files\ForbiddenException;
use OCP\Files\InvalidPathException; use OCP\Files\InvalidPathException;
use OCP\Files\NotPermittedException;
use OCP\Files\StorageNotAvailableException; use OCP\Files\StorageNotAvailableException;
use OCP\Lock\ILockingProvider; use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException; use OCP\Lock\LockedException;
@ -340,6 +341,8 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol
return $this->quotaInfo; return $this->quotaInfo;
} catch (\OCP\Files\StorageNotAvailableException $e) { } catch (\OCP\Files\StorageNotAvailableException $e) {
return [0, 0]; return [0, 0];
} catch (NotPermittedException $e) {
return [0, 0];
} }
} }

7
apps/files_external/lib/Lib/Storage/SMB.php
View File

@ -61,6 +61,7 @@ use OCP\Constants;
use OCP\Files\EntityTooLargeException; use OCP\Files\EntityTooLargeException;
use OCP\Files\Notify\IChange; use OCP\Files\Notify\IChange;
use OCP\Files\Notify\IRenameChange; use OCP\Files\Notify\IRenameChange;
use OCP\Files\NotPermittedException;
use OCP\Files\Storage\INotifyStorage; use OCP\Files\Storage\INotifyStorage;
use OCP\Files\StorageAuthException; use OCP\Files\StorageAuthException;
use OCP\Files\StorageNotAvailableException; use OCP\Files\StorageNotAvailableException;
@ -235,7 +236,11 @@ class SMB extends Common implements INotifyStorage {
protected function getFolderContents($path): iterable { protected function getFolderContents($path): iterable {
try { try {
$path = ltrim($this->buildPath($path), '/'); $path = ltrim($this->buildPath($path), '/');
try {
$files = $this->share->dir($path); $files = $this->share->dir($path);
} catch (ForbiddenException $e) {
throw new NotPermittedException();
}
foreach ($files as $file) { foreach ($files as $file) {
$this->statCache[$path . '/' . $file->getName()] = $file; $this->statCache[$path . '/' . $file->getName()] = $file;
} }
@ -595,7 +600,7 @@ class SMB extends Common implements INotifyStorage {
$files = $this->getFolderContents($path); $files = $this->getFolderContents($path);
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
return false; return false;
} catch (ForbiddenException $e) { } catch (NotPermittedException $e) {
return false; return false;
} }
$names = array_map(function ($info) { $names = array_map(function ($info) {