From d2df89a02f31ac508b1d1cf9803fb9b2dced2de4 Mon Sep 17 00:00:00 2001 From: Christopher Gabriel Date: Sat, 24 Apr 2021 10:05:21 +0200 Subject: [PATCH 1/2] Fixed getACL to return the username without domain Inspired by anikrooz commit https://github.com/nextcloud/server/commit/1f95f9b4791880e8d054b27fd4b9f50a7434cc65 Signed-off-by: Christopher Gabriel --- apps/files_external/lib/Lib/Storage/SMB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index e795e7cfd9..e07bea7321 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -219,7 +219,7 @@ class SMB extends Common implements INotifyStorage { private function getACL(IFileInfo $file): ?ACL { $acls = $file->getAcls(); foreach ($acls as $user => $acl) { - [, $user] = explode('\\', $user); // strip domain + [, $user] = $this->splitUser($user); // strip domain if ($user === $this->server->getAuth()->getUsername()) { return $acl; } From 5616fda1edf44121616e9b788603306d65b11841 Mon Sep 17 00:00:00 2001 From: Christopher Gabriel Date: Sat, 24 Apr 2021 12:52:24 +0200 Subject: [PATCH 2/2] Fixed username containing separator if workgroup is empty Signed-off-by: Christopher Gabriel --- apps/files_external/lib/Lib/Storage/SMB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index e07bea7321..aaca4f58f0 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -142,7 +142,7 @@ class SMB extends Common implements INotifyStorage { private function splitUser($user) { if (strpos($user, '/')) { return explode('/', $user, 2); - } elseif (strpos($user, '\\')) { + } elseif (strpos($user, '\\') !== false) { return explode('\\', $user); } else { return [null, $user];