diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-12-12 13:21:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-12 13:21:43 +0100 |
| commit | 38e29369353b81d0cb3650a92d3d3b5140793b3c (patch) | |
| tree | d12b59f33fd0c3eb25fcc80d560f796fad13b132 /apps | |
| parent | 26ba904883f5e1f64a3777d6aa25c6d0c0866603 (diff) | |
| parent | f92de57ba0c2369ffe247da4ff7a029fa947da79 (diff) | |
| download | nextcloud-server-38e29369353b81d0cb3650a92d3d3b5140793b3c.tar.gz nextcloud-server-38e29369353b81d0cb3650a92d3d3b5140793b3c.zip | |
Merge pull request #49651 from nextcloud/backport/49288/stable30
[stable30] 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 8b367ca4511..a646345cc69 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -205,7 +205,12 @@ class SMB extends Common implements INotifyStorage { * @return ACL|null */ 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()) { |