Request 2837 (accepted)

Overview

Request 2837 (accepted)

Check in 1.4.11.18

Created by vanmeeuwen over 2 years ago
In state accepted

Submit roundcubemail-plugins-kolab

Submit package Kolab:Winterfell / roundcubema...gins-kolab to package Kolab:16 / roundcubemail-plugins-kolab

roundcubemail-plugins-kolab.spec Changed

debian.changelog Changed

roundcubemail-plugins-kolab-3.5.7.tar.gz/plugins/calendar/calendar_ui.js -> roundcubemail-plugins-kolab-3.5.8.tar.gz/plugins/calendar/calendar_ui.js Changed

roundcubemail-plugins-kolab-3.5.7.tar.gz/plugins/calendar/composer.json -> roundcubemail-plugins-kolab-3.5.8.tar.gz/plugins/calendar/composer.json Changed

roundcubemail-plugins-kolab-3.5.7.tar.gz/plugins/kolab_2fa/composer.json -> roundcubemail-plugins-kolab-3.5.8.tar.gz/plugins/kolab_2fa/composer.json Changed

roundcubemail-plugins-kolab-3.5.7.tar.gz/plugins/kolab_2fa/kolab_2fa.php -> roundcubemail-plugins-kolab-3.5.8.tar.gz/plugins/kolab_2fa/kolab_2fa.php Changed

@@ -88,24 +88,34 @@
         // parse $host URL
         $a_host = parse_url($args['host']);
         $hostname = $_SESSION['hostname'] = $a_host['host'] ?: $args['host'];
+        $username = !empty($_SESSION['kolab_auth_admin']) ? $_SESSION['kolab_auth_admin'] : $args['user'];
 
-        // 1. find user record (and its prefs) before IMAP login
-        if ($user = rcube_user::query($args['user'], $hostname)) {
-            $rcmail->config->set_user_prefs($user->get_prefs());
+        // Convert username to lowercase. Copied from rcmail::login()
+        $login_lc = $rcmail->config->get('login_lc', 2);
+        if ($login_lc) {
+            if ($login_lc == 2 || $login_lc === true) {
+                $username = mb_strtolower($username);
+            }
+            else if (strpos($username, '@')) {
+                // lowercase domain name
+                list($local, $domain) = explode('@', $username);
+                $username = $local . '@' . mb_strtolower($domain);
+            }
         }
 
         // 2a. let plugins provide the list of active authentication factors
         $lookup = $rcmail->plugins->exec_hook('kolab_2fa_lookup', array(
-            'user'    => $args['user'],
+            'user'    => $username,
             'host'    => $hostname,
-            'factors' => $rcmail->config->get('kolab_2fa_factors'),
+            'factors' => null,
             'check'   => $rcmail->config->get('kolab_2fa_check', true),
         ));
+
         if (isset($lookup['factors'])) {
             $factors = (array)$lookup['factors'];
         }
         // 2b. check storage if this user has 2FA enabled
-        else if ($lookup['check'] !== false && ($storage = $this->get_storage($args['user']))) {
+        else if ($lookup['check'] !== false && ($storage = $this->get_storage($username))) {
             $factors = (array)$storage->enumerate();
         }
 
@@ -149,14 +159,15 @@
      */
     public function login_verify($args)
     {
-        $rcmail = rcmail::get_instance();
+        $this->login_verified = false;
 
-        $time  = $_SESSION['kolab_2fa_time'];
-        $nonce = $_SESSION['kolab_2fa_nonce'];
-        $factors = (array)$_SESSION['kolab_2fa_factors'];
+        $rcmail = rcmail::get_instance();
 
-        $this->login_verified = false;
-        $expired = $time < time() - $rcmail->config->get('kolab_2fa_timeout', 120);
+        $time     = $_SESSION['kolab_2fa_time'];
+        $nonce    = $_SESSION['kolab_2fa_nonce'];
+        $factors  = (array)$_SESSION['kolab_2fa_factors'];
+        $expired  = $time < time() - $rcmail->config->get('kolab_2fa_timeout', 120);
+        $username = !empty($_SESSION['kolab_auth_admin']) ? $_SESSION['kolab_auth_admin'] : $_SESSION['username'];
 
         if (!empty($factors) && !empty($nonce) && !$expired) {
             // TODO: check signature
@@ -167,7 +178,7 @@
 
                 // verify the submitted code
                 $code = rcube_utils::get_input_value("_${nonce}_${method}", rcube_utils::INPUT_POST);
-                $this->login_verified = $this->verify_factor_auth($factor, $code);
+                $this->login_verified = $this->verify_factor_auth($factor, $code, $username);
 
                 // accept first successful method
                 if ($this->login_verified) {
@@ -181,6 +192,11 @@
             $_POST['_user'] = $_SESSION['username'];
             $_POST['_host'] = $_SESSION['host'];
             $_POST['_pass'] = $rcmail->decrypt($_SESSION['password']);
+
+            if ($_SESSION['kolab_auth_admin']) {
+                $_POST['_user']    = $_SESSION['kolab_auth_admin'];
+                $_POST['_loginas'] = $_SESSION['username'];
+            }
         }
 
         // proceed with regular login ...
@@ -195,15 +211,15 @@
 
         return $args;
     }
-    
+
     /**
      * Helper method to verify the given method/code tuple
      */
-    protected function verify_factor_auth($method, $code)
+    protected function verify_factor_auth($method, $code, $username)
     {
         if (strlen($code) && ($driver = $this->get_driver($method))) {
             // set properties from login
-            $driver->username  = $_SESSION['username'];
+            $driver->username = $username;
 
             try {
                 // verify the submitted code

roundcubemail-plugins-kolab-3.5.7.tar.gz/plugins/kolab_auth/composer.json -> roundcubemail-plugins-kolab-3.5.8.tar.gz/plugins/kolab_auth/composer.json Changed

roundcubemail-plugins-kolab-3.5.7.tar.gz/plugins/kolab_auth/kolab_auth.php -> roundcubemail-plugins-kolab-3.5.8.tar.gz/plugins/kolab_auth/kolab_auth.php Changed

@@ -433,13 +433,20 @@
             return $args;
         }
 
+        // Don't add the extra field on 2FA form
+        if (strpos($args['content'], 'plugin.kolab-2fa-login')) {
+            return $args;
+        }
+
         $input = new html_inputfield(array('name' => '_loginas', 'id' => 'rcmloginas',
             'type' => 'text', 'autocomplete' => 'off'));
         $row = html::tag('tr', null,
             html::tag('td', 'title', html::label('rcmloginas', rcube::Q($this->gettext('loginas'))))
             . html::tag('td', 'input', $input->show(trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST))))
         );
-        $args['content'] = preg_replace('/<\/tbody>/i', $row . '</tbody>', $args['content']);
+        // add icon style for Elastic
+        $style = html::tag('style', [], '#login-form .input-group .icon.loginas::before { content: "\f508"; } ');
+        $args['content'] = preg_replace('/<\/tbody>/i', $row . '</tbody>' . $style, $args['content']);
 
         return $args;
     }

roundcubemail-plugins-kolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2837 0

Request History

vanmeeuwen created request over 2 years ago

Check in 1.4.11.18

vanmeeuwen accepted review over 2 years ago

vanmeeuwen approved review over 2 years ago

vanmeeuwen accepted request over 2 years ago