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

Merge pull request #8285 from nextcloud/apps_files-smb-catch-exceptions-on-listing 

Make SMB module more fault-tolerant
This commit is contained in:
Roeland Jago Douma 2018-02-27 13:10:54 +01:00 committed by GitHub
parent 048ad0df1d 8e251e5d5a
commit 017e1325f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,13 @@ class SMB extends Common implements INotifyStorage {
$this->statCache[$path . '/' . $file->getName()] = $file; $this->statCache[$path . '/' . $file->getName()] = $file;
} }
return array_filter($files, function (IFileInfo $file) { return array_filter($files, function (IFileInfo $file) {
return !$file->isHidden(); try {
return !$file->isHidden();
} catch (ForbiddenException $e) {
return false;
} catch (NotFoundException $e) {
return false;
}
}); });
} catch (ConnectException $e) { } catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
@ -226,8 +232,12 @@ class SMB extends Common implements INotifyStorage {
$highestMTime = 0; $highestMTime = 0;
$files = $this->share->dir($this->root); $files = $this->share->dir($this->root);
foreach ($files as $fileInfo) { foreach ($files as $fileInfo) {
if ($fileInfo->getMTime() > $highestMTime) { try {
$highestMTime = $fileInfo->getMTime(); if ($fileInfo->getMTime() > $highestMTime) {
$highestMTime = $fileInfo->getMTime();
}
} catch (NotFoundException $e) {
// Ignore this, can happen on unavailable DFS shares
} }
} }
return $highestMTime; return $highestMTime;