diff options
| author | Daniel <mail@danielkesselberg.de> | 2024-09-26 14:39:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-26 14:39:52 +0200 |
| commit | e4a564392ed820f8ea48634a5cf4f2e699409680 (patch) | |
| tree | 68a0c3d6852ae3b01df398d7502c4f14877ad9bd /apps | |
| parent | 5cc1fb9d0b56850dc8c84a85387c6683815568a5 (diff) | |
| parent | 3b29a3959eeca9ce1a19c5d120e16657330f4685 (diff) | |
| download | nextcloud-server-e4a564392ed820f8ea48634a5cf4f2e699409680.tar.gz nextcloud-server-e4a564392ed820f8ea48634a5cf4f2e699409680.zip | |
Merge pull request #48365 from nextcloud/backport/48345/stable30
[stable30] fix(files_external): Catch correct exception
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/SMB.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index 066d0d08f5b..8b367ca4511 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -160,6 +160,8 @@ class SMB extends Common implements INotifyStorage { * @param string $path * @return IFileInfo * @throws StorageAuthException + * @throws \OCP\Files\NotFoundException + * @throws \OCP\Files\ForbiddenException */ protected function getFileInfo($path) { try { @@ -336,7 +338,7 @@ class SMB extends Common implements INotifyStorage { public function stat($path, $retry = true) { try { $result = $this->formatInfo($this->getFileInfo($path)); - } catch (ForbiddenException $e) { + } catch (\OCP\Files\ForbiddenException $e) { return false; } catch (\OCP\Files\NotFoundException $e) { return false; @@ -557,7 +559,7 @@ class SMB extends Common implements INotifyStorage { $fileInfo = $this->getFileInfo($path); } catch (\OCP\Files\NotFoundException $e) { return null; - } catch (ForbiddenException $e) { + } catch (\OCP\Files\ForbiddenException $e) { return null; } if (!$fileInfo) { @@ -633,7 +635,7 @@ class SMB extends Common implements INotifyStorage { return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file'; } catch (\OCP\Files\NotFoundException $e) { return false; - } catch (ForbiddenException $e) { + } catch (\OCP\Files\ForbiddenException $e) { return false; } } @@ -668,7 +670,7 @@ class SMB extends Common implements INotifyStorage { return true; } catch (\OCP\Files\NotFoundException $e) { return false; - } catch (ForbiddenException $e) { + } catch (\OCP\Files\ForbiddenException $e) { return false; } catch (ConnectException $e) { throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e); @@ -681,7 +683,7 @@ class SMB extends Common implements INotifyStorage { return $this->showHidden || !$info->isHidden(); } catch (\OCP\Files\NotFoundException $e) { return false; - } catch (ForbiddenException $e) { + } catch (\OCP\Files\ForbiddenException $e) { return false; } } @@ -694,7 +696,7 @@ class SMB extends Common implements INotifyStorage { return ($this->showHidden || !$info->isHidden()) && (!$info->isReadOnly() || $info->isDirectory()); } catch (\OCP\Files\NotFoundException $e) { return false; - } catch (ForbiddenException $e) { + } catch (\OCP\Files\ForbiddenException $e) { return false; } } @@ -705,7 +707,7 @@ class SMB extends Common implements INotifyStorage { return ($this->showHidden || !$info->isHidden()) && !$info->isReadOnly(); } catch (\OCP\Files\NotFoundException $e) { return false; - } catch (ForbiddenException $e) { + } catch (\OCP\Files\ForbiddenException $e) { return false; } } |