Skip to content

Fixed username and domain separation in getACL #26738

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

Closed
Snafu wants to merge 2 commits into from
Closed

Fixed username and domain separation in getACL #26738

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2df89a
Fixed getACL to return the username without domain
Snafu Apr 24, 2021
5616fda
Fixed username containing separator if workgroup is empty
Snafu Apr 24, 2021
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
Prev Previous commit
Fixed username containing separator if workgroup is empty 
Signed-off-by: Christopher Gabriel <[email protected]>
  • Loading branch information
@Snafu
Snafu committed Apr 30, 2021
commit 5616fda1edf44121616e9b788603306d65b11841
2 changes: 1 addition & 1 deletion 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 @@ -142,7 +142,7 @@ public function __construct($params) {
private function splitUser($user) {
if (strpos($user, '/')) {
Copy link
Author

@Snafu Snafu Apr 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with this ACL user notation containing a slash. Maybe the strpos() check here also has to be changed to strpos($user, '/') !== false

return explode('/', $user, 2);
} elseif (strpos($user, '\\')) {
} elseif (strpos($user, '\\') !== false) {
return explode('\\', $user);
} else {
return [null, $user];
Expand Down