Skip to content

[stable16] Fix SMB availability status + higher delay on auth issues #17070

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
blizzz merged 3 commits into from
Sep 10, 2019
Merged

[stable16] Fix SMB availability status + higher delay on auth issues #17070

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f29395e
catch auth issues also when php-smbclient is in use
blizzz Aug 22, 2019
f42a6e0
set a storage availability delay on auth issues to avoid lock out
blizzz Aug 22, 2019
f48f8f9
adjust tests
blizzz Aug 26, 2019
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
Next Next commit
catch auth issues also when php-smbclient is in use 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz authored and Backportbot committed Sep 9, 2019
commit f29395e89dd511ab9840197aa3038c9503eacb1c
8 changes: 8 additions & 0 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,6 +172,14 @@ protected function getFileInfo($path) {
} catch (ConnectException $e) {
$this->logger->logException($e, ['message' => 'Error while getting file info']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} catch (ForbiddenException $e) {
// with php-smbclient, this exceptions 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) {
$this->logger->logException($e, ['message' => 'Error while getting file info']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
}
throw $e;
}
}

Expand Down