diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-12-04 18:22:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 18:22:09 +0100 |
| commit | 0e10bb59a196af4b75cbd5a4ef786be059d97b29 (patch) | |
| tree | 79b3b6e203fbde6585211e64584fd2c802b5c0e2 /apps | |
| parent | 1ef3e3e753aa1e1e767f6e1ed6576a0c00b27030 (diff) | |
| parent | cc39714fb59aeaea74fa873820fca5d499d17c06 (diff) | |
| download | nextcloud-server-0e10bb59a196af4b75cbd5a4ef786be059d97b29.tar.gz nextcloud-server-0e10bb59a196af4b75cbd5a4ef786be059d97b29.zip | |
Merge pull request #49288 from nextcloud/smb-acl-fail-soft
fix: smb: don't fail hard if we can't load acls for a file
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/SMB.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index dd7f1ae8224..4483cfd1bdf 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -193,7 +193,12 @@ class SMB extends Common implements INotifyStorage { * get the acl from fileinfo that is relevant for the configured user */ private function getACL(IFileInfo $file): ?ACL { - $acls = $file->getAcls(); + try { + $acls = $file->getAcls(); + } catch (Exception $e) { + $this->logger->error('Error while getting file acls', ['exception' => $e]); + return null; + } foreach ($acls as $user => $acl) { [, $user] = $this->splitUser($user); // strip domain if ($user === $this->server->getAuth()->getUsername()) { |