baculum: Change storing HTTP Basic passwords to hash form

diff --git a/gui/baculum/protected/Class/ConfigurationManager.php b/gui/baculum/protected/Class/ConfigurationManager.php
index f658136a460174b709a520b0fec065d8fc3c074a..0986ba5d16618e1dd2334b3107abd0d3123dbd9e 100644 (file)
--- a/gui/baculum/protected/Class/ConfigurationManager.php
+++ b/gui/baculum/protected/Class/ConfigurationManager.php
@@ -159,6 +159,7 @@ class ConfigurationManager extends TModule
         */
        public function setUsersConfig($user, $password, $firstUsage = false, $oldUser = null) {
                $usersFile = Prado::getPathOfNamespace(self::USERS_FILE, '.users');
+               $password = crypt($password, base64_encode($password));
                if($firstUsage === true) {
                        $this->clearUsersConfig();
                }

diff --git a/gui/baculum/protected/Pages/ConfigurationWizard.php b/gui/baculum/protected/Pages/ConfigurationWizard.php
index a2965527843ca8d0375740c69476b057f89bd596..29472aaac2846239e71bd10483fd001b400bbb33 100644 (file)
--- a/gui/baculum/protected/Pages/ConfigurationWizard.php
+++ b/gui/baculum/protected/Pages/ConfigurationWizard.php
@@ -114,7 +114,7 @@ class ConfigurationWizard extends BaculumPage
                                $urlPrefix = $this->Application->getModule('friendly-url')->getUrlPrefix();
                                $location = sprintf("%s://%s:%s@%s:%d%s", $http_protocol, $cfgData['baculum']['login'], $cfgData['baculum']['password'], $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $urlPrefix);
                                header("Location: $location");
-                               return;
+                               exit();
                        } else { // standard version (user defined auth method)
                                $this->goToDefaultPage();
                        }