Merge pull request hestiacp#1867 from jaapmarcus/fix/admin-login-as-user

jaapmarcus · web-flow · commit dcdef2984393 · 2021-05-31T14:03:38.000+02:00
Fix issues where admin users folders is show when loggin into FM
diff --git a/install/deb/filemanager/filegator/configuration.php b/install/deb/filemanager/filegator/configuration.php
@@ -15,9 +15,12 @@
         if (isset($_SESSION['user'])) {
             $v_user = $_SESSION['user'];
         }
-        if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'no')) {
+        if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin')) {
             $v_user = $_SESSION['look'];
         }
+        if ((isset($_SESSION['look']) && ($_SESSION['look'] == 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] == 'yes') )) {
+            header('Location: /');
+        }
         # Create filemanager sftp key if missing and trash it after 30 min
         if (! file_exists('/home/'.basename($v_user).'/.ssh/hst-filemanager-key')) {
             exec ("sudo /usr/local/hestia/bin/v-add-user-sftp-key " . escapeshellarg(basename($v_user)) . " 30", $output, $return_var);

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,12 @@`
`15`	`15`	`if (isset($_SESSION['user'])) {`
`16`	`16`	`$v_user = $_SESSION['user'];`
`17`	`17`	`}`
`18`		`- if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'no')) {`
	`18`	`+ if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin')) {`
`19`	`19`	`$v_user = $_SESSION['look'];`
`20`	`20`	`}`
	`21`	`+ if ((isset($_SESSION['look']) && ($_SESSION['look'] == 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] == 'yes') )) {`
	`22`	`+ header('Location: /');`
	`23`	`+ }`
`21`	`24`	`# Create filemanager sftp key if missing and trash it after 30 min`
`22`	`25`	`if (! file_exists('/home/'.basename($v_user).'/.ssh/hst-filemanager-key')) {`
`23`	`26`	`exec ("sudo /usr/local/hestia/bin/v-add-user-sftp-key " . escapeshellarg(basename($v_user)) . " 30", $output, $return_var);`