upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-03 14:01:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

fix(files_external): Catch correct exception

Browse source 
SMB#getFileInfo used to throw an icewind/smb exception, but nowadays throws \OCP\Files\ForbiddenException. This fixes downstream methods to catch the new exception.

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
Marcel Klehr 2024-09-25 09:07:33 +02:00 committed by backportbot[bot]
parent fa6f516c3c
commit e98196b6c3
1 changed files with 9 additions and 7 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

@ -190,6 +190,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 {
@ -366,7 +368,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;
@ -587,7 +589,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) {
@ -663,7 +665,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;
}
}
@ -698,7 +700,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);
@ -711,7 +713,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;
}
}
@ -724,7 +726,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;
}
}
@ -735,7 +737,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;
}
}