Skip to content

fix: handle InvalidArumentException as availability failure in smb->getFileInfo #57493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icewind1991 merged 2 commits into from
Jan 14, 2026
+10 −2
Merged

fix: handle InvalidArumentException as availability failure in smb->getFileInfo #57493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43727cb
fix: handle InvalidArumentException as availability failure in smb->g…
icewind1991 Jan 12, 2026
4dcd422
fix: make smb auth failure on forbidden exception more reliable
icewind1991 Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions apps/files_external/lib/Lib/Storage/SMB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,21 @@ protected function getFileInfo(string $path): IFileInfo {
}
} catch (ConnectException $e) {
$this->throwUnavailable($e);
} catch (InvalidArgumentException $e) {
$this->throwUnavailable($e);
} catch (NotFoundException $e) {
throw new \OCP\Files\NotFoundException($e->getMessage(), 0, $e);
} catch (ForbiddenException $e) {
// with php-smbclient, this exception is thrown when the provided password is invalid.
// Possible is also ForbiddenException with a different error code, so we check it.
if ($e->getCode() === 1) {
// we check if we can stat the root, which should only fail in authentication failures
if ($path === '') {
$this->throwUnavailable($e);
} else {
try {
$this->share->stat('');
} catch (\Exception $e) {
$this->throwUnavailable($e);
}
}
throw new \OCP\Files\ForbiddenException($e->getMessage(), false, $e);
}
Expand Down
Loading