holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Admin/Filemanager: correctly encode user "WORKGROUP\$user" for SMB mounts and do NOT require mountpoints to exist

Browse Source 
same as for filemanager/cli.php
This commit is contained in:
Ralf Becker 2021-11-22 13:09:00 +01:00
parent 8239e5ad91
commit 87c17d5e75
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
filemanager/inc/class.filemanager_admin.inc.php
View File

@ -160,7 +160,7 @@ class filemanager_admin extends filemanager_ui
{ {
throw new Api\Exception\WrongUserinput(lang('SMB, WebDAVs and VFS require a username!')); throw new Api\Exception\WrongUserinput(lang('SMB, WebDAVs and VFS require a username!'));
} }
$url .= $content['mounts']['url']['user'] === '$user' ? '$user' : urlencode(trim($content['mounts']['url']['user'])); $url .= str_replace(urlencode('$user'), '$user', urlencode(trim($content['mounts']['url']['user'])));
if (!empty($content['mounts']['url']['pass'])) if (!empty($content['mounts']['url']['pass']))
{ {
$url .= ':' . ($content['mounts']['url']['pass'] === '$pass' ? '$pass' : urlencode(trim($content['mounts']['url']['pass']))); $url .= ':' . ($content['mounts']['url']['pass'] === '$pass' ? '$pass' : urlencode(trim($content['mounts']['url']['pass'])));
@ -174,7 +174,7 @@ class filemanager_admin extends filemanager_ui
{ {
throw new Api\Exception\WrongUserinput(lang('Versioning requires EGroupware EPL')); throw new Api\Exception\WrongUserinput(lang('Versioning requires EGroupware EPL'));
} }
elseif (!Vfs::file_exists(Vfs::decodePath($path)) || Vfs::file_exists($path) && !Vfs::is_dir($path)) elseif (Vfs::file_exists($path) && !Vfs::is_dir($path))
{ {
throw new Api\Exception\WrongUserinput(lang('Path %1 not found or not a directory!', $path)); throw new Api\Exception\WrongUserinput(lang('Path %1 not found or not a directory!', $path));
} }
@ -186,7 +186,8 @@ class filemanager_admin extends filemanager_ui
else else
{ {
$msg = Vfs::mount($url, $path, true) ? $msg = Vfs::mount($url, $path, true) ?
lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path); lang('Successful mounted %1 on %2.', str_replace('%5C', '\\', $url), $path) :
lang('Error mounting %1 on %2!', str_replace('%5C', '\\', $url), $path);
} }
} }
if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions']) if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions'])
@ -297,7 +298,8 @@ class filemanager_admin extends filemanager_ui
{ {
$content['mounts'][$n++] = array( $content['mounts'][$n++] = array(
'path' => $path, 'path' => $path,
'url' => preg_replace('#://([^:@/]+):((?!\$pass)[^@/]+)@#', '://$1:****@', $url), 'url' => preg_replace('#://([^:@/]+):((?!\$pass)[^@/]+)@#', '://$1:****@',
str_replace('%5c', '\\', $url)),
); );
$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root || $readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning; Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;