Kolab Groupware OBS

kolab-hkccp.spec Changed

kolab-hkccp-0.7.18.1.tar.gz/binaries Added

kolab-hkccp-0.7.18.1.tar.gz/binaries/kolab-hkccp-0.7.17-2.1.el7.kolab_16.src.rpm Added

kolab-hkccp-0.7.18.1.tar.gz/binaries/kolab-hkccp-0.7.17.tar.gz Added

kolab-hkccp-0.7.18.1.tar.gz/binaries/kolab-hkccp-0.7.4-bootstrap.css.map.patch Added

kolab-hkccp-0.7.18.1.tar.gz/binaries/kolab-hkccp.spec Added

@@ -0,0 +1,280 @@
+%if 0%{?opensuse_bs}
+#!BuildIgnore:  httpd
+%endif
+
+Name:           kolab-hkccp
+Version:        0.7.17
+Release:        2.1%{?dist}
+Summary:        Hosted Kolab Customer Control Panel
+License:        AGPLv3+
+Group:          Productivity/Office/Organizers
+Url:            http://kolab.org
+
+Source0:        %{name}-%{version}.tar.gz
+
+Patch0:         kolab-hkccp-0.7.4-bootstrap.css.map.patch
+
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+Requires(pre):  httpd
+Requires:       kolab-webadmin
+Requires:       php >= 5.3
+Requires:       php-gd
+Requires:       php-mysqlnd
+Requires:		php-xml
+
+%description
+The HKCCP - or (H)osted (K)olab (C)ustomer (C)ontrol (P)anel - allows customers to
+register for a Hosted Kolab Groupware account, or domain, add/remove options from
+the service offering, examine and pay their invoices.
+
+%prep
+%setup -q
+
+%patch0 -p1
+
+%build
+
+%install
+mkdir -p \
+    %{buildroot}/%{_sysconfdir}/%{name}/ \
+    %{buildroot}/%{_datadir}/%{name}/ \
+    %{buildroot}/%{_sysconfdir}/httpd/conf.d/ \
+    %{buildroot}/%{_var}/lib/%{name} \
+    %{buildroot}/%{_var}/log/%{name}
+
+cp -a bin/ lib/ localization/ public_html/ %{buildroot}/%{_datadir}/%{name}/.
+cp -a doc/kolab-hkccp.conf %{buildroot}/%{_sysconfdir}/httpd/conf.d/
+cp -a config/config.ini.sample %{buildroot}/%{_sysconfdir}/%{name}/config.ini
+pushd %{buildroot}/%{_datadir}/%{name}/
+ln -s ../../..%{_sysconfdir}/%{name}/ config
+ln -s ../../..%{_var}/lib/%{name} temp
+ln -s ../../..%{_var}/log/%{name} logs
+
+pushd lib/ext/dompdf/lib/
+chmod a-x fonts/dompdf_font_family_cache
+mv fonts %{buildroot}/%{_var}/lib/%{name}/fonts
+ln -s ../../../../../../..%{_var}/lib/%{name}/fonts fonts
+popd
+
+%pretrans
+if [ -d "%{_datadir}/%{name}/lib/ext/dompdf/lib/fonts" ]
+then
+    rm -rf %{_datadir}/%{name}/lib/ext/dompdf/lib/fonts
+fi
+
+%pre
+if [ -d "%{_datadir}/%{name}/lib/ext/dompdf/lib/fonts" ]
+then
+    rm -rf %{_datadir}/%{name}/lib/ext/dompdf/lib/fonts
+fi
+
+%post
+if [ -f "%{php_inidir}/apc.ini" ]; then
+    if [ ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc.ini`" ]; then
+%if 0%{?fedora} > 15
+        /sbin/systemctl condrestart httpd.service
+%else
+        /sbin/service httpd condrestart
+%endif
+    fi
+fi
+
+rm -rf /tmp/twig_cache/*
+
+%clean
+%__rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root)
+%doc doc/* SQL/ bin/
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%attr(0640,kolab-n,kolab) %config(noreplace) %{_sysconfdir}/%{name}/config.ini
+%{_datadir}/%{name}
+%dir %attr(0770,apache,apache) %{_var}/lib/%{name}
+%dir %attr(0770,apache,apache) %{_var}/lib/%{name}/fonts
+%attr(0664,apache,apache) %{_var}/lib/%{name}/fonts/dompdf_font_family_cache
+%{_var}/lib/%{name}/fonts/*.afm
+%{_var}/lib/%{name}/fonts/*.htm
+%{_var}/lib/%{name}/fonts/*.html
+%{_var}/lib/%{name}/fonts/*.php
+%{_var}/lib/%{name}/fonts/*.ttf
+%{_var}/lib/%{name}/fonts/*.ufm
+%attr(0770,apache,apache) %{_var}/log/%{name}
+
+%changelog
+* Tue Jul 25 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.17-1
+- Release of version 0.7.17
+
+* Wed Aug 24 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.16-1
+- Release of version 0.7.16
+
+* Tue May 10 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.15-1
+- Release of version 0.7.15
+
+* Wed Jan 27 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.14-1
+- New upstream release.
+
+* Mon Jan 25 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.13-1
+- New upstream release.
+
+* Tue Nov 10 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.12-1
+- New upstream release.
+
+* Wed Nov  4 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.11-1
+- New upstream release.
+
+* Fri Oct 30 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.9-1
+- New upstream release.
+
+* Mon Sep 28 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.8-1
+- New upstream release, reverting forcefully removing the uid attribute
+
+* Wed Sep 23 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.7-1
+- New upstream release
+
+* Sun Sep 20 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.6-1
+- New upstream release
+- Fix general oversights
+- Add dynamic domain field
+
+* Thu Sep 17 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.5-1
+- New upstream release
+
+* Fri Mar 27 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.4-1
+- New upstream release
+
+* Tue Feb 10 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.3-1
+- New upstream release
+
+* Wed Feb  4 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.2-1
+- New upstream release
+
+* Tue Jan 27 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.1-3
+- New upstream release
+
+* Mon Jan 26 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.0-1
+- New upstream release
+
+* Thu Sep 25 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.6.2-1
+- New upstream release
+
+* Thu Sep 18 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.6.1-1
+- Fix duplicate items on invoices viewed by admins
+- Fix the creation of invoices for a new period when only oneoff items
+  exist (#3063)
+- Only consider the last invoice when calculating credit on subscription
+  changes (#3064)
+- Fix redundant subscriptions (for deleted users) on list viewed by
+  admins (#3066)
+- Fix invalid customer ID on invoice printed by admin (#3096)
+- Fix Q() function is undefined (#2962)
+- Fix bug where paid invoices were listed on pending invoices
+  list (#3130)
+- Get capabilities for current domain only (#3140)
+- Add locking in duecheck action to prevent many processes doing
+  the same (#3158)
+- Support more than one due-check reminders, make sure accounts are
+  not suspended on the same day as sent reminders (#3159)
+- Add "Account info" button in invoice overview (#3154)
+- Fix decission about when to create a new invoice from one-off
+  items (#3067)
+- Don't show password length when it's anonymized for logging (#2861)
+- Put password fields below the Desired Email field (#2823)
+- Fix API error handling
+- Implemented --dry-run=X mode for backend scripts
+- Improve data logged in auditlog for kolabuser.update action
+- Added sanity check to never change status of system domain
+- Do not suspend accounts with remaining credit (#3203)
+- Update localization
+
+* Fri Apr  4 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.6.0-1
+- New upstream release of refactored subscription tracking and invoicing
+
+* Tue Jan 28 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.4-1
+- New upstream release
+
+* Tue Jan 14 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.3-1
+- New upstream release

kolab-hkccp-0.7.18.tar.gz/composer.phar -> kolab-hkccp-0.7.18.1.tar.gz/composer.phar Changed

kolab-hkccp-0.7.18.tar.gz/config/config.ini.sample -> kolab-hkccp-0.7.18.1.tar.gz/config/config.ini.sample Changed

kolab-hkccp-0.7.18.1.tar.gz/lib/Kolab/Hosted/Controller/Auth2F.php Added

@@ -0,0 +1,262 @@
+<?php
+
+/**
+ * A class to maintain 2-factor authentication
+ *
+ * This file is part of the Kolab Hosted Customer Control Panel
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2017, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab\Hosted\Controller;
+
+use Kolab\Log;
+use Kolab\Utils;
+use Kolab\Hosted\Config;
+
+/**
+ * A class to maintain 2-factor authentication
+ */
+class Auth2F
+{
+    protected $username;
+    protected $session;
+    protected $output;
+    protected $config;
+    protected $storage;
+    protected $drivers = array();
+
+
+    /**
+     * Class constructor
+     *
+     * @param Kolab\Hosting\Controller\Session Session object
+     * @param Kolab\Hosted\View\AbstractOutput Output object
+     * @param string                           Username
+     */
+    public function __construct($session, $output, $username)
+    {
+        $this->session  = $session;
+        $this->output   = $output;
+        $this->username = $username;
+        $this->config   = Config::get_instance();
+    }
+
+    /**
+     * Handle login action
+     */
+    public function login($user)
+    {
+        if (empty($user) || empty($this->username) || !$user->is_2fa()) {
+            return;
+        }
+
+        // get list of configured authentication factors
+        $factors = $this->factors();
+
+        // do nothing if no factors configured
+        if (empty($factors)) {
+            return;
+        }
+
+        $factors = array_unique($factors);
+
+        // flag session for 2nd factor verification
+        $_SESSION['2fa_time']     = time();
+        $_SESSION['2fa_nonce']    = bin2hex(openssl_random_pseudo_bytes(32));
+        $_SESSION['2fa_factors']  = $factors;
+        $_SESSION['2fa_username'] = $this->username;
+        $_SESSION['2fa_account']  = $user;
+
+        // define login form
+        $nonce   = $_SESSION['2fa_nonce'];
+        $methods = array_unique(array_map(function($factor) {
+                list($method, $id) = explode(':', $factor);
+                return $method;
+            },
+            $factors
+        ));
+        $required = count($methods) == 1;
+
+        foreach ($methods as $i => $method) {
+            $methods[$i] = array(
+                'name'     => "${nonce}-${method}",
+                'label'    => T("login.$method"),
+                'required' => $required,
+            );
+        }
+
+        $this->output->set(array(
+                'title'    => T('login.2fauth'),
+                'submit'   => T('login.2fsubmit'),
+                'username' => $this->username,
+                'form_url' => '/login/2fa',
+                'factors'  => $methods,
+        ));
+
+        $this->output->render('login.html');
+    }
+
+    /**
+     * Validate 2-factor authentication code
+     */
+    public function verify($post)
+    {
+        if (empty($this->username)
+            || empty($_SESSION['2fa_username'])
+            || $_SESSION['2fa_username'] != $post['username']
+        ) {
+            return;
+        }
+
+        $time     = $_SESSION['2fa_time'];
+        $nonce    = $_SESSION['2fa_nonce'];
+        $factors  = (array) $_SESSION['2fa_factors'];
+        $expired  = $time < time() - $this->config->get('2fa.timeout', 120, Config::INT);
+        $verified = false;
+
+        if (!empty($factors) && !empty($nonce) && !$expired) {
+            // try to verify each configured factor
+            foreach ($factors as $factor) {
+                list($method) = explode(':', $factor, 2);
+
+                // verify the submitted code
+                $code = strip_tags($_POST["${nonce}-${method}"]);
+                if ($code && ($verified = $this->verify_factor_auth($factor, $code))) {
+                    // accept first successful method
+                    break;
+                }
+            }
+        }
+
+        if (!$verified) {
+            Log::info("2-FACTOR failure for {$this->username} from " . Utils::remote_ip());
+            $this->output->add_message(T('login.invalid2facode'), 'warning');
+            $this->login($_SESSION['2fa_account']);
+            return;
+        }
+
+        $user = $_SESSION['2fa_account'];
+
+        // clean up
+        unset($_SESSION['2fa_time'], $_SESSION['2fa_nonce'], $_SESSION['2fa_factors'],
+            $_SESSION['2fa_username'], $_SESSION['2fa_account']);
+
+        return $user;
+    }
+
+    /**
+     * Returns a list of 2nd factor methods configured for the user
+     */
+    protected function factors()
+    {
+        if ($storage = $this->get_storage($this->username)) {
+            return (array) $storage->enumerate();
+        }
+    }
+
+    /**
+     * Helper method to verify the given method/code tuple
+     *
+     * @param string $factor Factor identifier (<method>:<id>)
+     * @param string $code   Authentication code
+     *
+     * @return boolean
+     */
+    protected function verify_factor_auth($factor, $code)
+    {
+        if (strlen($code) && ($driver = $this->get_driver($factor))) {
+            $driver->username = $this->username;
+
+            try {
+                // verify the submitted code
+                return $driver->verify($code, $_SESSION['2fa_time']);
+            }
+            catch (Exception $e) {
+                Log::error("2-FACTOR failure for {$this->username} from " . Utils::remote_ip()
+                    . ": " . $e->getMessage());
+            }
+        }
+
+        return false;
+    }
+
+    /**

kolab-hkccp-0.7.18.tar.gz/lib/Kolab/Hosted/Controller/FrontendController.php -> kolab-hkccp-0.7.18.1.tar.gz/lib/Kolab/Hosted/Controller/FrontendController.php Changed

kolab-hkccp-0.7.18.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php -> kolab-hkccp-0.7.18.1.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php Changed

kolab-hkccp-0.7.18.tar.gz/lib/Kolab/Hosted/Model/Account.php -> kolab-hkccp-0.7.18.1.tar.gz/lib/Kolab/Hosted/Model/Account.php Changed

@@ -634,6 +634,32 @@
     }
 
     /**
+     * Determine whether this account has 2FA enabled
+     *
+     * @return boolean
+     */
+    public function is_2fa()
+    {
+        $config = Config::get_instance();
+        $role   = $config->get('2fa.role');
+
+        if ($role && !empty($this->_data['nsroledn'])) {
+            if (strpos($role, '$root_dn') !== false) {
+                $api = API\Client::get_user_instance();
+                $api->select_domain($this->_data['domain']);
+
+                $role = str_replace('$root_dn', $api->domain_root_dn(), $role);
+            }
+
+            if (in_array($role, (array) $this->_data['nsroledn'])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Determine whether this account is a domain account
      *
      * @return boolean True if it's NOT a domain account
@@ -1609,11 +1635,7 @@
                     self::$auth_error = self::AUTH_ACCOUNT_UNCONFIRMED;
                 }
             }
-
-            return null;
         }
-
-        return null;
     }
 
     /**

kolab-hkccp-0.7.18.tar.gz/lib/Kolab/Hosted/Model/KolabUser.php -> kolab-hkccp-0.7.18.1.tar.gz/lib/Kolab/Hosted/Model/KolabUser.php Changed

@@ -568,13 +568,10 @@
     /**
      * Reset a user's password
      *
-     * @param array $tags          An associative array containing column-value pairs.
-     * @param array $types         Types of the inserted data.
-     * @param array $where         Additional SQL query parameters
-     * @param array $subscriptions List of subscription names/values
-     * @param array $errors        Reference to errors variable
+     * @param array $tags   An associative array containing column-value pairs.
+     * @param array $errors Reference to errors variable
      *
-     * @return boolean|int True on success, 2 on success and subscriptions change, false on failure
+     * @return boolean True on success, False on failure
      */
     public function reset(array $tags, &$errors = array())
     {
@@ -582,40 +579,45 @@
         $success  = true;
         $log_data = array('changed' => array());
 
-        if (empty($where)) {
-            // sanity check
-            if (empty($this->_ldapdata)) {
-                return false;
-            }
+        // sanity check
+        if (empty($this->_ldapdata)) {
+            return false;
+        }
 
-            if (!empty($tags['userpassword'])) {
-                $this->_ldapdata['userpassword'] = $tags['userpassword'];
-                $log_data['changed'][]           = 'userpassword';
-                $updates++;
-            }
-            unset($tags['userpassword']);
+        if (!empty($tags['userpassword'])) {
+            $this->_ldapdata['userpassword'] = $tags['userpassword'];
+            $log_data['changed'][]           = 'userpassword';
+            $updates++;
+        }
+        unset($tags['userpassword']);
 
-            // save changes to LDAP
-            if ($updates) {
-                $api     = API\Client::get_user_instance();
-                $config = Config::get_instance();
+        // save changes to LDAP
+        if ($updates) {
+            $api     = API\Client::get_user_instance();
+            $config  = Config::get_instance();
 
-                $api->login(
-                        $config->get('kolab_wap.backend_auth_dn'),
-                        $config->get('kolab_wap.backend_auth_pw')
-                    );
+            $api->login(
+                $config->get('kolab_wap.backend_auth_dn'),
+                $config->get('kolab_wap.backend_auth_pw')
+            );
 
-                list(, $domain) = explode('@', $this->email);
-                $api->select_domain($domain);
+            list(, $domain) = explode('@', $this->email);
+            $api->select_domain($domain);
 
-                $success = self::parse_api_result($api->post('user.edit', array(), $this->_ldapdata), 'user.edit', $api_error);
+            $success = self::parse_api_result($api->post('user.edit', array(), $this->_ldapdata), 'user.edit', $api_error);
 
-                if (!$success && $api_error) {
-                    $errors = self::parse_api_error($api_error, $tags);
-                }
+            if ($success) {
+                $log_data['action'] = 'password-reset';
+                $log_data = array_merge($log_data, $this->_ldapdata);
 
-                $api->logout();
+                // we don't want to log user passwords
+                unset($log_data['userpassword']);
             }
+            else if ($api_error) {
+                $errors = self::parse_api_error($api_error, $tags);
+            }
+
+            $api->logout();
         }
 
         Audit::log($this->account, $this->UUID, 'kolabuser.update', $success ? $log_data : false);

kolab-hkccp-0.7.18.tar.gz/lib/bootstrap.php -> kolab-hkccp-0.7.18.1.tar.gz/lib/bootstrap.php Changed

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Base32.php Added

@@ -0,0 +1,146 @@
+<?php
+namespace Base32;
+
+/**
+ * Base32 encoder and decoder
+ *
+ * Last update: 2012-06-20
+ *
+ * RFC 4648 compliant
+ * @link http://www.ietf.org/rfc/rfc4648.txt
+ *
+ * Some groundwork based on this class
+ * https://github.com/NTICompass/PHP-Base32
+ *
+ * @author Christian Riesen <chris.riesen@gmail.com>
+ * @link http://christianriesen.com
+ * @license MIT License see LICENSE file
+ */
+class Base32
+{
+    /**
+     * Alphabet for encoding and decoding base32
+     *
+     * @var array
+     */
+    private static $alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=';
+
+    /**
+     * Creates an array from a binary string into a given chunk size
+     *
+     * @param string $binaryString String to chunk
+     * @param integer $bits Number of bits per chunk
+     * @return array
+     */
+    private static function chunk($binaryString, $bits)
+    {
+        $binaryString = chunk_split($binaryString, $bits, ' ');
+
+        if (substr($binaryString, (strlen($binaryString)) - 1)  == ' ') {
+            $binaryString = substr($binaryString, 0, strlen($binaryString)-1);
+        }
+
+        return explode(' ', $binaryString);
+    }
+
+    /**
+     * Encodes into base32
+     *
+     * @param string $string Clear text string
+     * @return string Base32 encoded string
+     */
+    public static function encode($string)
+    {
+        if (strlen($string) == 0) {
+            // Gives an empty string
+
+            return '';
+        }
+
+        // Convert string to binary
+        $binaryString = '';
+
+        foreach (str_split($string) as $s) {
+            // Return each character as an 8-bit binary string
+            $binaryString .= sprintf('%08b', ord($s));
+        }
+
+        // Break into 5-bit chunks, then break that into an array
+        $binaryArray = self::chunk($binaryString, 5);
+
+        // Pad array to be divisible by 8
+        while (count($binaryArray) % 8 !== 0) {
+            $binaryArray[] = null;
+        }
+
+        $base32String = '';
+
+        // Encode in base32
+        foreach ($binaryArray as $bin) {
+            $char = 32;
+
+            if (!is_null($bin)) {
+                // Pad the binary strings
+                $bin = str_pad($bin, 5, 0, STR_PAD_RIGHT);
+                $char = bindec($bin);
+            }
+
+            // Base32 character
+            $base32String .= self::$alphabet[$char];
+        }
+
+        return $base32String;
+    }
+
+    /**
+     * Decodes base32
+     *
+     * @param string $base32String Base32 encoded string
+     * @return string Clear text string
+     */
+    public static function decode($base32String)
+    {
+        // Only work in upper cases
+        $base32String = strtoupper($base32String);
+
+        // Remove anything that is not base32 alphabet
+        $pattern = '/[^A-Z2-7]/';
+
+        $base32String = preg_replace($pattern, '', $base32String);
+
+        if (strlen($base32String) == 0) {
+            // Gives an empty string
+            return '';
+        }
+
+        $base32Array = str_split($base32String);
+
+        $string = '';
+
+        foreach ($base32Array as $str) {
+            $char = strpos(self::$alphabet, $str);
+
+            // Ignore the padding character
+            if ($char !== 32) {
+                $string .= sprintf('%05b', $char);
+            }
+        }
+
+        while (strlen($string) %8 !== 0) {
+            $string = substr($string, 0, strlen($string)-1);
+        }
+
+        $binaryArray = self::chunk($string, 8);
+
+        $realString = '';
+
+        foreach ($binaryArray as $bin) {
+            // Pad each value to 8 bits
+            $bin = str_pad($bin, 8, 0, STR_PAD_RIGHT);
+            // Convert binary strings to ASCII
+            $realString .= chr(bindec($bin));
+        }
+
+        return $realString;
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Driver Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Driver/Base.php Added

@@ -0,0 +1,344 @@
+<?php
+
+/**
+ * Kolab 2-Factor-Authentication Driver base class
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Driver;
+
+abstract class Base
+{
+    public $method;
+    public $id;
+    public $storage;
+
+    protected $config          = array();
+    protected $props           = array();
+    protected $user_props      = array();
+    protected $pending_changes = false;
+    protected $temporary       = false;
+    protected $allowed_props   = array('username');
+
+    public $user_settings = array(
+        'active' => array(
+            'type'     => 'boolean',
+            'editable' => false,
+            'hidden'   => false,
+            'default'  => false,
+        ),
+        'label' => array(
+            'type'      => 'text',
+            'editable'  => true,
+            'label'     => 'label',
+            'generator' => 'default_label',
+        ),
+        'created' => array(
+            'type'      => 'datetime',
+            'editable'  => false,
+            'hidden'    => false,
+            'label'     => 'created',
+            'generator' => 'time',
+        ),
+    );
+
+    /**
+     * Static factory method
+     */
+    public static function factory($id, $config)
+    {
+        list($method) = explode(':', $id);
+
+        $classmap = array(
+            'totp'    => '\\Kolab2FA\\Driver\\TOTP',
+            'hotp'    => '\\Kolab2FA\\Driver\\HOTP',
+            'yubikey' => '\\Kolab2FA\\Driver\\Yubikey',
+        );
+
+        $cls = $classmap[strtolower($method)];
+        if ($cls && class_exists($cls)) {
+            return new $cls($config, $id);
+        }
+
+        throw new Exception("Unknown 2FA driver '$method'");
+    }
+
+    /**
+     * Default constructor
+     */
+    public function __construct($config = null, $id = null)
+    {
+        $this->init($config);
+
+        if (!empty($id) && $id != $this->method) {
+            $this->id = $id;
+        }
+        else { // generate random ID
+            $this->id = $this->method . ':' . bin2hex(openssl_random_pseudo_bytes(12));
+            $this->temporary = true;
+        }
+    }
+
+    /**
+     * Initialize the driver with the given config options
+     */
+    public function init($config)
+    {
+        if (is_array($config)) {
+            $this->config = array_merge($this->config, $config);
+        }
+
+        if ($config['storage']) {
+            $this->storage = \Kolab2FA\Storage\Base::factory($config['storage'], $config['storage_config']);
+        }
+    }
+
+    /**
+     * Verify the submitted authentication code
+     *
+     * @param string $code The 2nd authentication factor to verify
+     * @param int    $timestamp  Timestamp of authentication process (window start)
+     * @return boolean True if valid, false otherwise
+     */
+    abstract function verify($code, $timestamp = null);
+
+    /**
+     * Getter for user-visible properties
+     */
+    public function props($force = false)
+    {
+        $data = array();
+
+        foreach ($this->user_settings as $key => $p) {
+            if ($p['private']) {
+                continue;
+            }
+
+            $data[$key] = array(
+                'type'     => $p['type'],
+                'editable' => $p['editable'],
+                'hidden'   => $p['hidden'],
+                'label'    => $p['label'],
+                'value'    => $this->get($key, $force),
+            );
+
+            // format value into text
+            switch ($p['type']) {
+                case 'boolean':
+                    $data[$key]['value'] = (bool)$data[$key]['value'];
+                    $data[$key]['text'] = $data[$key]['value'] ? 'yes' : 'no';
+                    break;
+
+                case 'datetime':
+                    if (is_numeric($data[$key]['value'])) {
+                        $data[$key]['text'] = date('c', $data[$key]['value']);
+                        break;
+                    }
+
+                default:
+                    $data[$key]['text'] = $data[$key]['value'];
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Implement this method if the driver can be prpvisioned via QR code
+     */
+    /* abstract function get_provisioning_uri(); */
+
+    /**
+     * Generate a random secret string
+     */
+    public function generate_secret($length = 16)
+    {
+        // Base32 characters
+        $chars = array(
+            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', //  7
+            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 15
+            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 23
+            'Y', 'Z', '2', '3', '4', '5', '6', '7', // 31
+        );
+
+        $secret = '';
+        for ($i = 0; $i < $length; $i++) {
+            $secret .= $chars[array_rand($chars)];
+        }
+        return $secret;
+    }
+
+    /**
+     * Generate the default label based on the method
+     */
+    public function default_label()
+    {
+        if (class_exists('\\rcmail', false)) {
+            return \rcmail::get_instance()->gettext($this->method, 'kolab_2fa');
+        }
+
+        return strtoupper($this->method);
+    }
+
+    /**

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Driver/Exception.php Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Driver/HOTP.php Added

@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Kolab 2-Factor-Authentication HOTP driver implementation
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Driver;
+
+class HOTP extends Base
+{
+    public $method = 'hotp';
+
+    protected $config = array(
+        'digits'   => 6,
+        'window'   => 4,
+        'digest'   => 'sha1',
+    );
+
+    protected $backend;
+
+    /**
+     *
+     */
+    public function init($config)
+    {
+        parent::init($config);
+
+        $this->user_settings += array(
+            'secret' => array(
+                'type'      => 'text',
+                'private'   => true,
+                'label'     => 'secret',
+                'generator' => 'generate_secret',
+            ),
+            'counter' => array(
+                'type'      => 'integer',
+                'editable'  => false,
+                'hidden'    => true,
+                'generator' => 'random_counter',
+            ),
+        );
+
+        // copy config options
+        $this->backend = new \Kolab2FA\OTP\HOTP();
+        $this->backend
+            ->setDigits($this->config['digits'])
+            ->setDigest($this->config['digest'])
+            ->setIssuer($this->config['issuer'])
+            ->setIssuerIncludedAsParameter(true);
+    }
+
+    /**
+     *
+     */
+    public function verify($code, $timestamp = null)
+    {
+        // get my secret from the user storage
+        $secret  = $this->get('secret');
+        $counter = $this->get('counter');
+
+        if (!strlen($secret)) {
+            // LOG: "no secret set for user $this->username"
+            // rcube::console("VERIFY HOTP: no secret set for user $this->username");
+            return false;
+        }
+
+        try {
+            $this->backend->setLabel($this->username)->setSecret($secret)->setCounter(intval($this->get('counter')));
+            $pass = $this->backend->verify($code, $counter, $this->config['window']);
+
+            // store incremented counter value
+            $this->set('counter', $this->backend->getCounter());
+            $this->commit();
+        }
+        catch (\Exception $e) {
+            // LOG: exception
+            // rcube::console("VERIFY HOTP: $this->id, " . strval($e));
+            $pass = false;
+        }
+
+        // rcube::console('VERIFY HOTP', $this->username, $secret, $counter, $code, $pass);
+        return $pass;
+    }
+
+    /**
+     *
+     */
+    public function get_provisioning_uri()
+    {
+        if (!$this->secret) {
+            // generate new secret and store it
+            $this->set('secret', $this->get('secret', true));
+            $this->set('counter', $this->get('counter', true));
+            $this->set('created', $this->get('created', true));
+            $this->commit();
+        }
+
+        // TODO: deny call if already active?
+
+        $this->backend->setLabel($this->username)->setSecret($this->secret)->setCounter(intval($this->get('counter')));
+        return $this->backend->getProvisioningUri();
+    }
+
+    /**
+     * Generate a random counter value
+     */
+    public function random_counter()
+    {
+        return mt_rand(1, 999);
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Driver/TOTP.php Added

@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * Kolab 2-Factor-Authentication TOTP driver implementation
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Driver;
+
+class TOTP extends Base
+{
+    public $method = 'totp';
+
+    protected $config = array(
+        'digits'   => 6,
+        'interval' => 30,
+        'digest'   => 'sha1',
+    );
+
+    protected $backend;
+
+    /**
+     *
+     */
+    public function init($config)
+    {
+        parent::init($config);
+
+        $this->user_settings += array(
+            'secret' => array(
+                'type'      => 'text',
+                'private'   => true,
+                'label'     => 'secret',
+                'generator' => 'generate_secret',
+            ),
+        );
+
+        // copy config options
+        $this->backend = new \Kolab2FA\OTP\TOTP();
+        $this->backend
+            ->setDigits($this->config['digits'])
+            ->setInterval($this->config['interval'])
+            ->setDigest($this->config['digest'])
+            ->setIssuer($this->config['issuer'])
+            ->setIssuerIncludedAsParameter(true);
+    }
+
+    /**
+     *
+     */
+    public function verify($code, $timestamp = null)
+    {
+        // get my secret from the user storage
+        $secret = $this->get('secret');
+
+        if (!strlen($secret)) {
+            // LOG: "no secret set for user $this->username"
+            // rcube::console("VERIFY TOTP: no secret set for user $this->username");
+            return false;
+        }
+
+        $this->backend->setLabel($this->username)->setSecret($secret);
+
+        // PHP gets a string, but we're comparing integers.
+        $code = (int)$code;
+//$code = (string) $code;
+        // Pass a window to indicate the maximum timeslip between client (mobile
+        // device) and server.
+        $pass = $this->backend->verify($code, $timestamp, 150);
+
+        // try all codes from $timestamp till now
+        if (!$pass && $timestamp) {
+            $now = time();
+            while (!$pass && $timestamp < $now) {
+                $pass = $code === $this->backend->at($timestamp);
+                $timestamp += $this->config['interval'];
+            }
+        }
+
+        // rcube::console('VERIFY TOTP', $this->username, $secret, $code, $timestamp, $pass);
+        return $pass;
+    }
+
+    /**
+     *
+     */
+    public function get_provisioning_uri()
+    {
+        // rcube::console('PROV', $this->secret);
+        if (!$this->secret) {
+            // generate new secret and store it
+            $this->set('secret', $this->get('secret', true));
+            $this->set('created', $this->get('created', true));
+            // rcube::console('PROV2', $this->secret);
+            $this->commit();
+        }
+
+        // TODO: deny call if already active?
+
+        $this->backend->setLabel($this->username)->setSecret($this->secret);
+        return $this->backend->getProvisioningUri();
+    }
+
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Driver/Yubikey.php Added

@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Kolab 2-Factor-Authentication Yubikey driver implementation
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Driver;
+
+class Yubikey extends Base
+{
+    public $method = 'yubikey';
+
+    protected $backend;
+
+    /**
+     *
+     */
+    public function init(array $config)
+    {
+        parent::init($config);
+
+        $this->user_settings += array(
+            'yubikeyid' => array(
+                'type'     => 'text',
+                'editable' => true,
+                'label'    => 'secret',
+            ),
+        );
+
+        // initialize validator
+        $this->backend = new \Yubikey\Validate($this->config['apikey'], $this->config['clientid']);
+
+        // set configured validation hosts
+        if (!empty($this->config['hosts'])) {
+            $this->backend->setHosts((array)$this->config['hosts']);
+        }
+
+        if (isset($this->config['use_https'])) {
+            $this->backend->setUseSecure((bool)$this->config['use_https']);
+        }
+    }
+
+    /**
+     *
+     */
+    public function verify($code, $timestamp = null)
+    {
+        // get my secret from the user storage
+        $keyid = $this->get('yubikeyid');
+        $pass  = false;
+
+        if (!strlen($keyid)) {
+            // LOG: "no key registered for user $this->username"
+            return false;
+        }
+
+        // check key prefix with associated Yubikey ID
+        if (strpos($code, $keyid) === 0) {
+            try {
+                $response = $this->backend->check($code);
+                $pass     = $response->success() === true;
+            }
+            catch (\Exception $e) {
+                // TODO: log exception
+            }
+        }
+
+        // rcube::console('VERIFY Yubikey', $this->username, $keyid, $code, $pass);
+        return $pass;
+    }
+
+    /**
+     * @override
+     */
+    public function set($key, $value)
+    {
+        if ($key == 'yubikeyid' && strlen($value) > 12) {
+            // verify the submitted code
+            try {
+                $response = $this->backend->check($value);
+                if ($response->success() !== true) {
+                    // TODO: report error
+                    return false;
+                }
+            }
+            catch (\Exception $e) {
+                return false;
+            }
+
+            // truncate the submitted yubikey code to 12 characters
+            $value = substr($value, 0, 12);
+        }
+
+        return parent::set($key, $value);
+    }
+
+    /**
+     * @override
+     */
+    protected function set_user_prop($key, $value)
+    {
+        // set created timestamp
+        if ($key !== 'created' && !isset($this->created)) {
+            parent::set_user_prop('created', $this->get('created', true));
+        }
+
+        return parent::set_user_prop($key, $value);
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Log Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Log/Logger.php Added

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Logging interface for the Kolab 2-Factor-Authentication components
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Log;
+
+interface Logger
+{
+    /**
+     * Setter for the log name
+     */
+    public function set_name($name);
+
+    /**
+     * Setter for the minimum log level
+     */
+    public function set_level($level);
+
+    /**
+     * Do log the given message at the given level
+     */
+    public function log($level, $message);
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Log/RcubeLogger.php Added

@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Kolab 2-Factor-Authentication Logging class to log messages
+ * through the Roundcube logging facilities.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Log;
+
+use \rcube;
+
+class RcubeLogger implements Logger
+{
+    protected $name = null;
+    protected $level = LOG_DEBUG;
+
+    public function __construct($name = null)
+    {
+        if ($name !== null) {
+            $this->set_name($name);
+        }
+    }
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_level($name)
+    {
+        $this->level = $level;
+    }
+
+    public function log($level, $message)
+    {
+        if (!is_string($message)) {
+            $message = var_export($message, true);
+        }
+
+        switch ($level) {
+        case LOG_DEBUG:
+        case LOG_INFO:
+        case LOG_NOTICE:
+            if ($level >= $this->level) {
+                rcube::write_log($this->name ?: 'console', $message);
+            }
+            break;
+
+        case LOG_EMERGE:
+        case LOG_ALERT:
+        case LOG_CRIT:
+        case LOG_ERR:
+        case LOG_WARNING:
+            rcube::raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'message' => $message,
+            ), true, false);
+            break;
+        }
+    }
+}
+

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Log/Syslog.php Added

@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Kolab 2-Factor-Authentication Logging class to log messages
+ * through the Roundcube logging facilities.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Log;
+
+use \rcube;
+
+class Syslog implements Logger
+{
+    protected $name = 'Kolab2FA';
+    protected $level = LOG_INFO;
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_level($name)
+    {
+        $this->level = $level;
+    }
+
+    public function log($level, $message)
+    {
+        if ($level >= $this->level) {
+            if (!is_string($message)) {
+                $message = var_export($message, true);
+            }
+
+            syslog($level, '[' . $this->name . '] ' . $message);
+        }
+    }
+}
\ No newline at end of file

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/OTP Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/OTP/HOTP.php Added

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Kolab HOTP implementation based on Spomky-Labs/otphp
+ *
+ * This basically follows the exmaple implementation from
+ * https://github.com/Spomky-Labs/otphp/tree/master/examples
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace Kolab2FA\OTP;
+
+use OTPHP\HOTP as Base;
+
+class HOTP extends Base
+{
+    use OTP;
+    protected $counter = 0;
+
+    public function setCounter($counter)
+    {
+        if (!is_integer($counter) || $counter < 0) {
+            throw new \Exception('Counter must be at least 0.');
+        }
+        $this->counter = $counter;
+
+        return $this;
+    }
+
+    public function getCounter()
+    {
+        return $this->counter;
+    }
+
+    public function updateCounter($counter)
+    {
+        $this->counter = $counter;
+
+        return $this;
+    }
+}
\ No newline at end of file

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/OTP/OTP.php Added

@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * Kolab OTP trait based on Spomky-Labs/otphp
+ *
+ * This basically follows the exmaple implementation from
+ * https://github.com/Spomky-Labs/otphp/tree/master/examples
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\OTP;
+
+trait OTP
+{
+    protected $secret = null;
+    protected $issuer = null;
+    protected $issuer_included_as_parameter = false;
+    protected $label = null;
+    protected $digest = 'sha1';
+    protected $digits = 6;
+
+    public function setSecret($secret)
+    {
+        $this->secret = $secret;
+
+        return $this;
+    }
+
+    public function getSecret()
+    {
+        return $this->secret;
+    }
+
+    public function setLabel($label)
+    {
+        if ($this->hasSemicolon($label)) {
+            throw new \Exception('Label must not contain a semi-colon.');
+        }
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
+    public function setIssuer($issuer)
+    {
+        if ($this->hasSemicolon($issuer)) {
+            throw new \Exception('Issuer must not contain a semi-colon.');
+        }
+        $this->issuer = $issuer;
+
+        return $this;
+    }
+
+    public function getIssuer()
+    {
+        return $this->issuer;
+    }
+
+    public function isIssuerIncludedAsParameter()
+    {
+        return $this->issuer_included_as_parameter;
+    }
+
+    public function setIssuerIncludedAsParameter($issuer_included_as_parameter)
+    {
+        $this->issuer_included_as_parameter = $issuer_included_as_parameter;
+
+        return $this;
+    }
+
+    public function setDigits($digits)
+    {
+        if (!is_numeric($digits) || $digits < 1) {
+            throw new \Exception('Digits must be at least 1.');
+        }
+        $this->digits = $digits;
+
+        return $this;
+    }
+
+    public function getDigits()
+    {
+        return $this->digits;
+    }
+
+    public function setDigest($digest)
+    {
+        if (!in_array($digest, array('md5', 'sha1', 'sha256', 'sha512'))) {
+            throw new \Exception("'$digest' digest is not supported.");
+        }
+        $this->digest = $digest;
+
+        return $this;
+    }
+
+    public function getDigest()
+    {
+        return $this->digest;
+    }
+
+    private function hasSemicolon($value)
+    {
+        $semicolons = array(':', '%3A', '%3a');
+        foreach ($semicolons as $semicolon) {
+            if (false !== strpos($value, $semicolon)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
\ No newline at end of file

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/OTP/TOTP.php Added

@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Kolab TOTP implementation based on Spomky-Labs/otphp
+ *
+ * This basically follows the exmaple implementation from
+ * https://github.com/Spomky-Labs/otphp/tree/master/examples
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\OTP;
+
+use OTPHP\TOTP as Base;
+
+class TOTP extends Base
+{
+    use OTP;
+    protected $interval = 30;
+
+    public function setInterval($interval)
+    {
+        if (!is_integer($interval) || $interval < 1) {
+            throw new \Exception('Interval must be at least 1.');
+        }
+        $this->interval = $interval;
+
+        return $this;
+    }
+
+    public function getInterval()
+    {
+        return $this->interval;
+    }
+}
\ No newline at end of file

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Storage Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Storage/Base.php Added

@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Abstract storage backend class for the Kolab 2-Factor-Authentication plugin
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Storage;
+
+use \Kolab2FA\Log;
+
+
+abstract class Base
+{
+    public $username = null;
+    protected $config = array();
+    protected $logger;
+
+    /**
+     *
+     */
+    public static function factory($backend, $config)
+    {
+        $classmap = array(
+            'ldap' => '\\Kolab2FA\\Storage\\LDAP',
+            'roundcube' => '\\Kolab2FA\\Storage\\RcubeUser',
+            'rcubeuser' => '\\Kolab2FA\\Storage\\RcubeUser',
+            'hkccp' => '\\Kolab2FA\\Storage\\HKCCP',
+        );
+
+        $cls = $classmap[strtolower($backend)];
+        if ($cls && class_exists($cls)) {
+            return new $cls($config);
+        }
+
+        throw new Exception("Unknown storage backend '$backend'");
+    }
+
+    /**
+     * Default constructor
+     */
+    public function __construct($config = null)
+    {
+        if (is_array($config)) {
+            $this->init($config);
+        }
+    }
+
+    /**
+     * Initialize the driver with the given config options
+     */
+    public function init(array $config)
+    {
+        $this->config = array_merge($this->config, $config);
+
+        // use syslog logger by default
+        $this->set_logger(new Log\Syslog());
+    }
+
+    /**
+     * 
+     */
+    public function set_logger(Log\Logger $logger)
+    {
+        $this->logger = $logger;
+
+        if ($this->config['debug']) {
+            $this->logger->set_level(LOG_DEBUG);
+        }
+        else if ($this->config['loglevel']) {
+            $this->logger->set_level($this->config['loglevel']);
+        }
+    }
+
+    /**
+     * Set username to store data for
+     */
+    public function set_username($username)
+    {
+        $this->username = $username;
+    }
+
+    /**
+     * Send messager to the logging system
+     */
+    protected function log($level, $message)
+    {
+        if ($this->logger) {
+            $this->logger->log($level, $message);
+        }
+    }
+
+    /**
+     * List keys holding settings for 2-factor-authentication
+     */
+    abstract public function enumerate();
+
+    /**
+     * Read data for the given key
+     */
+    abstract public function read($key);
+
+    /**
+     * Save data for the given key
+     */
+    abstract public function write($key, $value);
+
+    /**
+     * Remove the data stored for the given key
+     */
+    abstract public function remove($key);
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Storage/Exception.php Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Storage/HKCCP.php Added

@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * Storage backend to use the Roundcube user prefs to store 2-Factor-Authentication settings
+ * This is the same as RcubeUser storage driver, but with HKCCP framework
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2017, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Storage;
+
+use Kolab\SQL;
+
+class HKCCP extends Base
+{
+    // sefault config
+    protected $config = array(
+        'keymap' => array(),
+    );
+
+    private $cache = array();
+
+
+    /**
+     * List/set methods activated for this user
+     */
+    public function enumerate()
+    {
+        if ($factors = $this->get_factors()) {
+            return array_keys(array_filter($factors, function($prop) {
+                return !empty($prop['active']);
+            }));
+        }
+
+        return array();
+    }
+
+    /**
+     * Read data for the given key
+     */
+    public function read($key)
+    {
+        if (!isset($this->cache[$key])) {
+            $factors = $this->get_factors();
+//            $this->log(LOG_DEBUG, 'read() ' . $key);
+            $this->cache[$key] = $factors[$key];
+        }
+
+        return $this->cache[$key];
+    }
+
+    /**
+     * Save data for the given key
+     */
+    public function write($key, $value)
+    {
+//        $this->log(LOG_DEBUG, 'write() ' . @json_encode($value));
+
+        $factors = $this->get_factors();
+        $factors[$key] = $this->cache[$key] = $value;
+
+        $pkey         = $this->key2property('blob');
+        $save_data    = array($pkey => $factors);
+        $update_index = false;
+
+        // remove entry
+        if ($value === null) {
+            unset($factors[$key]);
+            $update_index = true;
+        }
+        // remove non-active entries
+        else if (!empty($value['active'])) {
+            $factors = array_filter($factors, function($prop) {
+                return !empty($prop['active']);
+            });
+            $update_index = true;
+        }
+
+        // update the index of active factors
+        if ($update_index) {
+            $save_data[$this->key2property('factors')] = array_keys(
+                array_filter($factors, function($prop) {
+                    return !empty($prop['active']);
+                })
+            );
+        }
+
+        $success = $this->save_prefs($save_data);
+
+        if (!$success) {
+//            $this->log(LOG_WARNING, sprintf('Failed to save prefs for user %s', $this->username));
+        }
+
+        return $success;
+    }
+
+    /**
+     * Remove the data stored for the given key
+     */
+    public function remove($key)
+    {
+        return $this->write($key, null);
+    }
+
+    /**
+     * Set username to store data for
+     */
+    public function set_username($username)
+    {
+        parent::set_username($username);
+
+        // reset cached values
+        $this->cache = array();
+    }
+
+    /**
+     *
+     */
+    private function get_factors()
+    {
+        $prefs = $this->get_prefs();
+
+        return (array) $prefs[$this->key2property('blob')];
+    }
+
+    /**
+     *
+     */
+    private function key2property($key)
+    {
+        // map key to configured property name
+        if (is_array($this->config['keymap']) && isset($this->config['keymap'][$key])) {
+            return $this->config['keymap'][$key];
+        }
+
+        // default
+        return 'kolab_2fa_' . $key;
+    }
+
+    /**
+     * Gets user preferences from Roundcube users table
+     */
+    private function get_prefs()
+    {
+        $dbh  = $this->get_dbh();
+        $user = $dbh->fetchAssoc('SELECT preferences FROM users WHERE username = ?',
+            array(strtolower($this->username)));
+
+        return $user ? (array) unserialize($user['preferences']) : null;
+    }
+
+    /**
+     * Saves user preferences in Roundcube users table.
+     * This will merge into old preferences
+     */
+    private function save_prefs($prefs)
+    {
+// TODO
+return false;
+        $dbh       = $this->get_dbh();
+        $old_prefs = $this->get_prefs();
+
+        $prefs = serialize($prefs);
+
+        return $dbh->update('users',
+            array('preferences' => $prefs),
+            array('username' => strtolower($this->username))
+        );
+    }
+
+    /**
+     * Returns database handler (for Roundcube database)
+     */
+    private function get_dbh()
+    {
+        return SQL\Connection::get_dbh($this->config['dsn']);
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Storage/LDAP.php Added

@@ -0,0 +1,349 @@
+<?php
+
+/**
+ * Storage backend to store 2-Factor-Authentication settings in LDAP
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Storage;
+
+use \Net_LDAP3;
+use \Kolab2FA\Log\Logger;
+
+class LDAP extends Base
+{
+    public $userdn;
+
+    private $cache = array();
+    private $ldapcache = array();
+    private $conn;
+    private $error;
+
+    public function init(array $config)
+    {
+        parent::init($config);
+
+        $this->conn = new Net_LDAP3($config);
+        $this->conn->config_set('log_hook', array($this, 'log'));
+
+        $this->conn->connect();
+
+        $bind_pass = $this->config['bind_pass'];
+        $bind_user = $this->config['bind_user'];
+        $bind_dn   = $this->config['bind_dn'];
+
+        $this->ready = $this->conn->bind($bind_dn, $bind_pass);
+
+        if (!$this->ready) {
+            throw new Exception("LDAP storage not ready: " . $this->error);
+        }
+    }
+
+    /**
+     * List/set methods activated for this user
+     */
+    public function enumerate($active = true)
+    {
+        $filter  = $this->parse_vars($this->config['filter'],  '*');
+        $base_dn = $this->parse_vars($this->config['base_dn'], '*');
+        $scope   = $this->config['scope'] ?: 'sub';
+        $ids     = array();
+
+        if ($this->ready && ($result = $this->conn->search($base_dn, $filter, $scope, array($this->config['fieldmap']['id'], $this->config['fieldmap']['active'])))) {
+            foreach ($result as $dn => $entry) {
+                $rec = $this->field_mapping($dn, Net_LDAP3::normalize_entry($entry, true));
+                if (!empty($rec['id']) && ($active === null || $active == $rec['active'])) {
+                    $ids[] = $rec['id'];
+                }
+            }
+        }
+
+        // TODO: cache this in memory
+
+        return $ids;
+    }
+
+    /**
+     * Read data for the given key
+     */
+    public function read($key)
+    {
+        if (!isset($this->cache[$key])) {
+            $this->cache[$key] = $this->get_ldap_record($this->username, $key);
+        }
+
+        return $this->cache[$key];
+    }
+
+    /**
+     * Save data for the given key
+     */
+    public function write($key, $value)
+    {
+        $success = false;
+        $ldap_attrs = array();
+
+        if (is_array($value)) {
+            // add some default values
+            $value += (array)$this->config['defaults'] + array('active' => false, 'username' => $this->username, 'userdn' => $this->userdn);
+
+            foreach ($value as $k => $val) {
+                if ($attr = $this->config['fieldmap'][$k]) {
+                    $ldap_attrs[$attr] = $this->value_mapping($k, $val, false);
+                }
+            }
+        }
+        else {
+            // invalid data structure
+            return false;
+        }
+
+        // update existing record
+        if ($rec = $this->get_ldap_record($this->username, $key)) {
+            $old_attrs = $rec['_raw'];
+            $new_attrs = array_merge($old_attrs, $ldap_attrs);
+
+            $result = $this->conn->modify_entry($rec['_dn'], $old_attrs, $new_attrs);
+            $success = !empty($result);
+        }
+        // insert new record
+        else if ($this->ready) {
+            $entry_dn = $this->get_entry_dn($this->username, $key);
+
+            // add object class attribute
+            $me = $this;
+            $ldap_attrs['objectclass'] = array_map(function($cls) use ($me, $key) {
+                return $me->parse_vars($cls, $key);
+            }, (array)$this->config['objectclass']);
+
+            $success = $this->conn->add_entry($entry_dn, $ldap_attrs);
+        }
+
+        if ($success) {
+            $this->cache[$key] = $value;
+            $this->ldapcache = array();
+
+            // cleanup: remove disabled/inactive/temporary entries
+            if ($value['active']) {
+                foreach ($this->enumerate(false) as $id) {
+                    if ($id != $key) {
+                        $this->remove($id);
+                    }
+                }
+
+                // set user roles according to active factors
+                $this->set_user_roles();
+            }
+        }
+
+        return $success;
+    }
+
+    /**
+     * Remove the data stored for the given key
+     */
+    public function remove($key)
+    {
+        if ($this->ready) {
+            $entry_dn = $this->get_entry_dn($this->username, $key);
+            $success = $this->conn->delete_entry($entry_dn);
+
+            // set user roles according to active factors
+            if ($success) {
+                $this->set_user_roles();
+            }
+
+            return $success;
+        }
+
+        return false;
+    }
+
+    /**
+     * Set username to store data for
+     */
+    public function set_username($username)
+    {
+        parent::set_username($username);
+
+        // reset cached values
+        $this->cache = array();
+        $this->ldapcache = array();
+    }
+
+    /**
+     *
+     */
+    protected function set_user_roles()
+    {
+        if (!$this->ready || !$this->userdn || empty($this->config['user_roles'])) {
+            return false;
+        }
+
+        $auth_roles = array();

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/Kolab2FA/Storage/RcubeUser.php Added

@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * Storage backend to use the Roundcube user prefs to store 2-Factor-Authentication settings
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Kolab2FA\Storage;
+
+use \rcmail;
+use \rcube_user;
+
+class RcubeUser extends Base
+{
+    // sefault config
+    protected $config = array(
+        'keymap' => array(),
+    );
+
+    private $cache = array();
+    private $user;
+
+    public function init(array $config)
+    {
+        parent::init($config);
+
+        $rcmail = rcmail::get_instance();
+        $this->config['hostname'] = $rcmail->user->ID ? $rcmail->user->data['mail_host'] : $_SESSION['hostname'];
+    }
+
+    /**
+     * List/set methods activated for this user
+     */
+    public function enumerate()
+    {
+        if ($factors = $this->get_factors()) {
+            return array_keys(array_filter($factors, function($prop) {
+                return !empty($prop['active']);
+            }));
+        }
+
+        return array();
+    }
+
+    /**
+     * Read data for the given key
+     */
+    public function read($key)
+    {
+        if (!isset($this->cache[$key])) {
+            $factors = $this->get_factors();
+            $this->log(LOG_DEBUG, 'RcubeUser::read() ' . $key);
+            $this->cache[$key] = $factors[$key];
+        }
+
+        return $this->cache[$key];
+    }
+
+    /**
+     * Save data for the given key
+     */
+    public function write($key, $value)
+    {
+        $this->log(LOG_DEBUG, 'RcubeUser::write() ' . @json_encode($value));
+
+        if ($user = $this->get_user($this->username)) {
+            $this->cache[$key] = $value;
+
+            $factors = $this->get_factors();
+            $factors[$key] = $value;
+
+            $pkey = $this->key2property('blob');
+            $save_data = array($pkey => $factors);
+            $update_index = false;
+
+            // remove entry
+            if ($value === null) {
+                unset($factors[$key]);
+                $update_index = true;
+            }
+            // remove non-active entries
+            else if (!empty($value['active'])) {
+                $factors = array_filter($factors, function($prop) {
+                    return !empty($prop['active']);
+                });
+                $update_index = true;
+            }
+
+            // update the index of active factors
+            if ($update_index) {
+                $save_data[$this->key2property('factors')] = array_keys(
+                    array_filter($factors, function($prop) {
+                        return !empty($prop['active']);
+                    })
+                );
+            }
+
+            $success = $user->save_prefs($save_data, true);
+
+            if (!$success) {
+                $this->log(LOG_WARNING, sprintf('Failed to save prefs for user %s', $this->username));
+            }
+
+            return $success;
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove the data stored for the given key
+     */
+    public function remove($key)
+    {
+        return $this->write($key, null);
+    }
+
+    /**
+     * Set username to store data for
+     */
+    public function set_username($username)
+    {
+        parent::set_username($username);
+
+        // reset cached values
+        $this->cache = array();
+        $this->user = null;
+    }
+
+    /**
+     * Helper method to get a rcube_user instance for storing prefs
+     */
+    private function get_user($username)
+    {
+        // use global instance if we have a valid Roundcube session
+        $rcmail = rcmail::get_instance();
+        if ($rcmail->user->ID && $rcmail->user->get_username() == $username) {
+            return $rcmail->user;
+        }
+
+        if (!$this->user) {
+            $this->user = rcube_user::query($username, $this->config['hostname']);
+        }
+
+        if (!$this->user) {
+            $this->log(LOG_WARNING, sprintf('No user record found for %s @ %s', $username, $this->config['hostname']));
+        }
+
+        return $this->user;
+    }
+
+    /**
+     *
+     */
+    private function get_factors()
+    {
+        if ($user = $this->get_user($this->username)) {
+            $prefs = $user->get_prefs();
+            return (array)$prefs[$this->key2property('blob')];
+        }
+
+        return null;
+    }
+
+    /**
+     *
+     */
+    private function key2property($key)
+    {
+        // map key to configured property name
+        if (is_array($this->config['keymap']) && isset($this->config['keymap'][$key])) {
+            return $this->config['keymap'][$key];
+        }
+
+        // default
+        return 'kolab_2fa_' . $key;
+    }
+
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/.coveralls.yml Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/.scrutinizer.yml Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/.travis.yml Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/LICENCE Added

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Florent Morselli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/README.md Added

@@ -0,0 +1,60 @@
+# TOTP / HOTP library in PHP #
+
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Spomky-Labs/otphp/badges/quality-score.png?s=a184d180414b30764d19b421a12d6cf7e9e5e7c2)](https://scrutinizer-ci.com/g/Spomky-Labs/otphp/)
+[![Code Coverage](https://scrutinizer-ci.com/g/Spomky-Labs/otphp/badges/coverage.png?s=d1bd1b26b56e581d6a4d1deb87eaadc51a05f31d)](https://scrutinizer-ci.com/g/Spomky-Labs/otphp/)
+
+[![Build Status](https://travis-ci.org/Spomky-Labs/otphp.svg?branch=master)](https://travis-ci.org/Spomky-Labs/otphp)
+[![HHVM Status](http://hhvm.h4cc.de/badge/Spomky-Labs/otphp.png)](http://hhvm.h4cc.de/package/Spomky-Labs/otphp)
+
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/49e5925d-0dd8-4b89-a215-5eb33b4d96d9/big.png)](https://insight.sensiolabs.com/projects/49e5925d-0dd8-4b89-a215-5eb33b4d96d9)
+
+[![Latest Stable Version](https://poser.pugx.org/spomky-labs/otphp/v/stable.png)](https://packagist.org/packages/spomky-labs/otphp) [![Total Downloads](https://poser.pugx.org/spomky-labs/otphp/downloads.png)](https://packagist.org/packages/spomky-labs/otphp) [![Latest Unstable Version](https://poser.pugx.org/spomky-labs/otphp/v/unstable.png)](https://packagist.org/packages/spomky-labs/otphp) [![License](https://poser.pugx.org/spomky-labs/otphp/license.png)](https://packagist.org/packages/spomky-labs/otphp)
+
+A php library for generating one time passwords according to [ RFC 4226 ](http://tools.ietf.org/html/rfc4226) (HOTP Algorithm) and the [ RFC 6238 ](http://tools.ietf.org/html/rfc6238) (TOTP Algorithm)
+
+This library is compatible with Google Authenticator apps available for Android and iPhone. It is also compatible with other applications such as [FreeOTP](https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp) for example.
+
+This is a fork of https://github.com/lelag/otphp with the following changes:
+
+* Continuous unit and functional tests using Travis-CI
+* 100% test coverage
+* Code Quality improvement
+* Better namespace usage
+* Issuer support
+* Window support
+* Completely abstract objects
+
+## The Release Process ##
+
+The release process [is described here](doc/Release.md).
+
+## Prerequisites ##
+
+This library needs at least `PHP 5.3`.
+It has been successfully tested using `PHP 5.3` to `PHP 5.6`, `PHP 7` and `HHVM`
+
+## Installation ##
+
+The preferred way to install this library is to rely on Composer:
+
+```sh
+composer require "spomky-labs/otphp" "~4.0.0"
+```
+
+## Extend the library ##
+
+This library only contains the logic. You must extend all classes to define setters and getters.
+
+Look at [Extend classes](doc/Extend.md) for more information and examples.
+
+## How to use ##
+
+Your classes are ready to use? Have a look at [How to use](doc/Use.md) to generate your first OTP.
+
+## Contributing
+
+Requests for new features, bug fixed and all other ideas to make this library useful are welcome. [Please follow these best practices](doc/Contributing.md).
+
+## Licence
+
+This software is release under [MIT licence](LICENSE).

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/composer.json Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/doc Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/doc/Contributing.md Added

@@ -0,0 +1,26 @@
+Contributing
+=============================
+
+First of all, **thank you** for contributing.
+
+Bugs or feature requests can be posted online on the GitHub issues section of the project.
+
+Few rules to ease code reviews and merges:
+
+- You MUST follow the [PSR-1](http://www.php-fig.org/psr/psr-1/), [PSR-2](http://www.php-fig.org/psr/psr-2/) and [PSR-4](http://www.php-fig.org/psr/psr-4/).
+- You MUST run the test suite.
+- You MUST write (or update) unit tests when bugs are fixed or features are added.
+- You SHOULD write documentation.
+
+We use [Git-Flow](Please see http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/) to automate our git branching workflow.
+
+To contribute use [Pull Requests](https://help.github.com/articles/using-pull-requests), please, write commit messages that make sense, and rebase your branch before submitting your PR.
+
+May be asked to squash your commits too. This is used to "clean" your Pull Request before merging it, avoiding commits such as fix tests, fix 2, fix 3, etc.
+
+Run test suite
+------------
+
+* install composer: `curl -s http://getcomposer.org/installer | php`
+* install dependencies: `php composer.phar install`
+* run tests: `vendor/bin/phpunit`

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/doc/Extend.md Added

@@ -0,0 +1,331 @@
+# Extending all classes #
+
+## Description of classes ##
+
+This library has three abstract classes:
+
+* OTP: the base of all OTP classes
+* TOTP: Time Based OTP
+* HOTP: Counter Based OTP
+
+## OTP Class ##
+
+The all classes must implement the following methods:
+
+* ```public functon getLabel();```
+* ```public functon getIssuer();```
+* ```public functon isIssuerIncludedAsParameter();```
+* ```public functon getDigits();```
+* ```public functon getDigest();```
+
+If you wand to extend
+
+* TOTP Class, you must also implement ```public functon getInterval();```.
+* HOTP Class, you must also implement ```public functon getCounter();``` and ```protected functon updateCounter($counter);```.
+
+## Implementation
+
+### TOTP Class
+
+The following class is a possible implementation of the TOTP Class:
+
+```php
+<?php
+
+namespace MyProject;
+
+use OTPHP\TOTP as BaseTOTP;
+
+class TOTP extends BaseTOTP
+{
+    protected $secret = null;
+    protected $issuer = null;
+    protected $issuer_included_as_parameter = false;
+    protected $label = null;
+    protected $digest = 'sha1';
+    protected $digits = 6;
+    protected $interval = 30;
+
+    public function setSecret($secret)
+    {
+        //You must check that the secret is a valid Base32 string
+        $this->secret = $secret;
+        return $this;
+    }
+
+    public function getSecret()
+    {
+        return $this->secret;
+    }
+
+    public function setLabel($label)
+    {
+        if ($this->hasSemicolon($label)) {
+            throw new \Exception("Label must not containt a semi-colon.");
+        }
+        $this->label = $label;
+        return $this;
+    }
+
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
+    public function setIssuer($issuer)
+    {
+        if ($this->hasSemicolon($issuer)) {
+            throw new \Exception("Issuer must not containt a semi-colon.");
+        }
+        $this->issuer = $issuer;
+        return $this;
+    }
+
+    public function getIssuer()
+    {
+        return $this->issuer;
+    }
+
+    public function isIssuerIncludedAsParameter()
+    {
+        return $this->issuer_included_as_parameter;
+    }
+
+    public function setIssuerIncludedAsParameter($issuer_included_as_parameter)
+    {
+        $this->issuer_included_as_parameter = $issuer_included_as_parameter;
+        return $this;
+    }
+
+    public function setDigits($digits)
+    {
+        if( !is_numeric($digits) || $digits < 1 ) {
+            throw new \Exception("Digits must be at least 1.");
+        }
+        $this->digits = $digits;
+        return $this;
+    }
+
+    public function getDigits()
+    {
+        return $this->digits;
+    }
+
+    public function setDigest($digest)
+    {
+        if( !in_array($digest, array('md5', 'sha1', 'sha256', 'sha512')) ) {
+            throw new \Exception("'$digest' digest is not supported.");
+        }
+        $this->digest = $digest;
+        return $this;
+    }
+
+    public function getDigest()
+    {
+        return $this->digest;
+    }
+
+    public function setInterval($interval)
+    {
+        if( !is_integer($interval) || $interval < 1 ) {
+            throw new \Exception("Interval must be at least 1.");
+        }
+        $this->interval = $interval;
+        return $this;
+    }
+
+    public function getInterval()
+    {
+        return $this->interval;
+    }
+
+    private function hasSemicolon($value)
+    {
+        $semicolons = array(':', '%3A', '%3a');
+        foreach ($semicolons as $semicolon) {
+            if (false !== strpos($value, $semicolon)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
+```
+
+This this class, you can easily create a TOTP object:
+
+```php
+<?php
+use MyProject\TOTP;
+
+$totp = new TOTP;
+$totp->setSecret('JDDK4U6G3BJLEZ7Y');
+```
+
+Your object is ready to use.
+You can also change all options:
+
+```php
+$totp->setLabel('foo@bar.baz')
+     ->setIssuer('My Project')
+     ->setDigits(4)
+     ->setDigest('sha512')
+     ->setInterval(60);
+```
+
+
+### HOTP Class
+
+The following class is a possible implementation of the HOTP Class:
+
+```php
+<?php
+
+namespace MyProject;
+
+use OTPHP\HOTP as BaseHOTP;
+
+class HOTP extends BaseHOTP
+{
+    protected $secret = null;
+    protected $issuer = null;
+    protected $issuer_included_as_parameter = false;
+    protected $label = null;
+    protected $digest = 'sha1';
+    protected $digits = 6;
+    protected $counter = 0;
+
+    public function setSecret($secret)

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/doc/Release.md Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/doc/Use.md Added

@@ -0,0 +1,131 @@
+# How to Use
+
+## Common methods
+
+TOTP and HOTP objects have the following common methods:
+
+* ```public function at($input);```: generate an OTP at the specified counter
+* ```public function verify($otp, $input, $window);```: verify if the OTP is valid for the specified input (timestamp, counter...)
+* ```public function getProvisioningUri()```: return a provisioning URI to ease integration in applications
+
+Example:
+
+```php
+$my_otp_object->at(1000); //e.g. will return 123456
+$my_otp_object->verify(123456, 1000); //Will return true
+$my_otp_object->verify(123456, 1001); //Will return false
+```
+
+## Counter Based OTP (HOTP)
+
+### The window parameter
+
+The `windows` parameter will try all OTP within a window of counters.
+
+By default, this value is `null`. It means that the OTP will be tested at the exact counter.
+
+If the parameter is an integer, the OTP from `counter` to `counter+window` will be tested.
+For example, if the `counter`is `1000` and the window `10`, the OTP tested are within `1000` and `1010`.
+
+```php
+$my_otp_object->verify(123456, 999); //Will return false
+$my_otp_object->verify(123456, 999, 10); //Will return true (1000 is tested)
+```
+
+If the verification succeed, the counter will be updated.
+
+## Time Based OTP (TOTP)
+
+This OTP object has a specific method:
+
+* ```public function now()```: return an OTP at the current timestamp
+
+Example:
+
+```php
+$my_otp_object->now(); //e.g. will return 123456
+$my_otp_object->verify(123456); //Will return true.
+```
+    
+After the interval defined by the object:
+
+```php
+$my_otp_object->verify(123456); //Will return false
+```
+
+### The window parameter
+
+The `windows` parameter will try all OTP within a window of timestamps.
+
+By default, this value is `null`. It means that the OTP will be tested at the exact timestamp.
+If the parameter is an integer, the OTP before and after the timestamp will be tested.
+
+The window of timestamps goes from `- $window * interval + timestamp` to `+ $window * interval + timestamp`. For example, if the `window`is `5`, the interval `30` and the timestamp `600`, the OTP tested are within `450` and `750`.
+
+### Google Authenticator Compatible
+
+The library works with the Google Authenticator iPhone and Android app, and also
+includes the ability to generate provisioning URI's for use with the QR Code scanner
+built into the app.
+
+Google only supports SHA-1 digest algorithm, 30 second interval and 6 digits OTP. Other values for these parameters are ignored by the Google Authenticator application.
+
+```php
+<?php
+use MyProject\TOTP;
+
+$totp = new TOTP;
+$totp->setLabel("alice@google.com")
+     ->setDigits(6)
+     ->setDigest('sha1')
+     ->setInterval(30)
+     ->setSecret("JBSWY3DPEHPK3PXP");
+
+$totp->getProvisioningUri(); // => 'otpauth://totp/alice%40google.com?secret=JBSWY3DPEHPK3PXP'
+```
+
+### Working examples
+
+#### Compatible with Google Authenticator
+
+Scan the following barcode with your phone, using Google Authenticator
+
+![QR Code for OTP](http://chart.apis.google.com/chart?cht=qr&chs=250x250&chl=otpauth%3A%2F%2Ftotp%2FMy%2520Big%2520Compagny%3Aalice%2540google.com%3Fsecret%3DJBSWY3DPEHPK3PXP%26issuer%3DMy%2520Big%2520Compagny)
+
+Now run the following and compare the output
+
+```php
+<?php
+use MyProject\TOTP;
+
+$totp = new TOTP;
+$totp->setLabel("alice@google.com")
+     ->setDigits(6)
+     ->setDigest('sha1')
+     ->setInterval(30);
+     ->setSecret("JBSWY3DPEHPK3PXP");
+
+echo "Current OTP: ". $totp->now();
+```
+
+#### Not Compatible with Google Authenticator
+
+The following barcode will not work with Google Authenticator because digest algoritm is not SHA-1, there are 8 digits and counter is not 30 seconds.
+
+![QR Code for OTP](http://chart.apis.google.com/chart?cht=qr&chs=250x250&chl=otpauth%3A%2F%2Ftotp%2FMy%2520Big%2520Compagny%3Aalice%2540google.com%3Falgorithm%3Dsha512%26digits%3D8%26period%3D10%26secret%3DJBSWY3DPEHPK3PXP%26issuer%3DMy%2520Big%2520Compagny)
+
+Now run the following and compare the output
+
+```php
+<?php
+use MyProject\TOTP;
+
+$totp = new TOTP;
+$totp->setLabel("alice@google.com")
+     ->setDigits(8)
+     ->setDigest('sha512')
+     ->setInterval(10)
+     ->setSecret("JBSWY3DPEHPK3PXP");
+
+echo "Current OTP: ". $totp->now();
+```

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/lib Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/lib/HOTP.php Added

@@ -0,0 +1,44 @@
+<?php
+
+namespace OTPHP;
+
+abstract class HOTP extends OTP implements HOTPInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getProvisioningUri($google_compatible = true)
+    {
+        return $this->generateURI('hotp', array('counter' => $this->getCounter()), $google_compatible);
+    }
+
+    /**
+     * @param int $counter The new initial counter (a positive integer)
+     */
+    abstract protected function updateCounter($counter);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function verify($otp, $counter, $window = null)
+    {
+        if ($counter < $this->getCounter()) {
+            return false;
+        }
+
+        if (!is_integer($window)) {
+            $window = 0;
+        }
+        $window = abs($window);
+
+        for ($i = $counter; $i <= $counter + $window; $i++) {
+            if ($otp === $this->at($i)) {
+                $this->updateCounter($i + 1);
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/lib/HOTPInterface.php Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/lib/OTP.php Added

@@ -0,0 +1,139 @@
+<?php
+
+namespace OTPHP;
+
+use Base32\Base32;
+
+abstract class OTP implements OTPInterface
+{
+    /**
+     * @param int $input
+     *
+     * @return int The OTP at the specified input
+     */
+    protected function generateOTP($input)
+    {
+        $hash = hash_hmac($this->getDigest(), $this->intToByteString($input), $this->getDecodedSecret());
+        $hmac = array();
+        foreach (str_split($hash, 2) as $hex) {
+            $hmac[] = hexdec($hex);
+        }
+        $offset = $hmac[count($hmac) - 1] & 0xf;
+        $code = ($hmac[$offset + 0] & 0x7F) << 24 |
+            ($hmac[$offset + 1] & 0xFF) << 16 |
+            ($hmac[$offset + 2] & 0xFF) << 8 |
+            ($hmac[$offset + 3] & 0xFF);
+
+        return $code % pow(10, $this->getDigits());
+    }
+
+    /**
+     * @return bool Return true is it must be included as parameter, else false
+     */
+    protected function issuerAsParameter()
+    {
+        if (!is_null($this->getIssuer()) && $this->isIssuerIncludedAsParameter() === true) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @throws \InvalidArgumentException
+     *
+     * @return array
+     */
+    private function getParameters()
+    {
+        $options = array(
+            'algorithm' => $this->getDigest(),
+            'digits' => $this->getDigits(),
+            'secret' => $this->getSecret(),
+        );
+        if ($this->issuerAsParameter()) {
+            $options['issuer'] = $this->getIssuer();
+        }
+
+        return $options;
+    }
+
+    /**
+     * @param array $options
+     * @param bool  $google_compatible
+     */
+    protected function filterOptions(array &$options, $google_compatible)
+    {
+        if (true === $google_compatible) {
+            foreach (array('algorithm' => 'sha1', 'period' => 30, 'digits' => 6) as $key => $default) {
+                if (isset($options[$key]) && $default === $options[$key]) {
+                    unset($options[$key]);
+                }
+            }
+        }
+
+        ksort($options);
+    }
+
+    /**
+     * @param       $type
+     * @param array $options
+     * @param       $google_compatible
+     *
+     * @return string
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function generateURI($type, array $options = array(), $google_compatible)
+    {
+        if ($this->getLabel() === null) {
+            throw new \InvalidArgumentException('No label defined.');
+        }
+        $options = array_merge($options, $this->getParameters());
+        $this->filterOptions($options, $google_compatible);
+
+        $params = str_replace(
+            array('+', '%7E'),
+            array('%20', '~'),
+            http_build_query($options)
+        );
+
+        return "otpauth://$type/".rawurlencode((!is_null($this->getIssuer()) ? $this->getIssuer().':' : '').$this->getLabel())."?$params";
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function at($input)
+    {
+        return $this->generateOTP($input);
+    }
+
+    /**
+     * @return string
+     *
+     * @throws \InvalidArgumentException
+     */
+    private function getDecodedSecret()
+    {
+        $secret = Base32::decode($this->getSecret());
+
+        return $secret;
+    }
+
+    /**
+     * @param int $int
+     *
+     * @return string
+     */
+    private function intToByteString($int)
+    {
+        $result = array();
+        while ($int != 0) {
+            $result[] = chr($int & 0xFF);
+            $int >>= 8;
+        }
+
+        return str_pad(implode(array_reverse($result)), 8, "\000", STR_PAD_LEFT);
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/lib/OTPInterface.php Added

@@ -0,0 +1,61 @@
+<?php
+
+namespace OTPHP;
+
+interface OTPInterface
+{
+    /**
+     * @param int $input
+     *
+     * @return int Return the OTP at the specified input
+     */
+    public function at($input);
+
+    /**
+     * Verify that the OTP is valid with the specified input.
+     *
+     * @param int      $otp
+     * @param int|null $input
+     * @param int|null $window
+     *
+     * @return bool
+     */
+    public function verify($otp, $input, $window = null);
+
+    /**
+     * @return string The secret of the OTP
+     */
+    public function getSecret();
+
+    /**
+     * @return string The label of the OTP
+     */
+    public function getLabel();
+
+    /**
+     * @return string The issuer
+     */
+    public function getIssuer();
+
+    /**
+     * @return bool If true, the issuer will be added as a parameter in the provisioning URI
+     */
+    public function isIssuerIncludedAsParameter();
+
+    /**
+     * @return int Number of digits in the OTP
+     */
+    public function getDigits();
+
+    /**
+     * @return string Digest algorithm used to calculate the OTP. Possible values are 'md5', 'sha1', 'sha256' and 'sha512'
+     */
+    public function getDigest();
+
+    /**
+     * @param bool $google_compatible If true (default), will produce provisioning URI compatible with Google Authenticator. Only applicable if algorithm="sha1", period=30 and digits=6.
+     *
+     * @return string Get the provisioning URI
+     */
+    public function getProvisioningUri($google_compatible = true);
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/lib/TOTP.php Added

@@ -0,0 +1,68 @@
+<?php
+
+namespace OTPHP;
+
+abstract class TOTP extends OTP implements TOTPInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function at($timestamp)
+    {
+        return $this->generateOTP($this->timecode($timestamp));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function now()
+    {
+        return $this->at(time());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function verify($otp, $timestamp = null, $window = null)
+    {
+        if (is_null($timestamp)) {
+            $timestamp = time();
+        }
+
+        if (!is_integer($window)) {
+            return $otp === $this->at($timestamp);
+        }
+        $window = abs($window);
+
+        for ($i = -$window; $i <= $window; $i++) {
+            if ($otp === $this->at($i * $this->getInterval() + $timestamp)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProvisioningUri($google_compatible = true)
+    {
+        $params = array();
+        if (true !== $google_compatible || 30 !== $this->getInterval()) {
+            $params = array('period' => $this->getInterval());
+        }
+
+        return $this->generateURI('totp', $params, $google_compatible);
+    }
+
+    /**
+     * @param int $timestamp
+     *
+     * @return int
+     */
+    private function timecode($timestamp)
+    {
+        return (int) ((((int) $timestamp * 1000) / ($this->getInterval() * 1000)));
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/lib/TOTPInterface.php Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/phpunit.xml.dist Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/tests Added

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/tests/HOTPTest.php Added

@@ -0,0 +1,144 @@
+<?php
+
+class HOTPTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetProvisioningUri()
+    {
+        $otp = $this->getMockBuilder('OTPHP\HOTP')
+            ->setMethods(array('getSecret', 'getDigits', 'getDigest', 'getIssuer', 'getLabel', 'isIssuerIncludedAsParameter', 'getCounter', 'updateCounter'))
+            ->getMock();
+
+        $otp->expects($this->any())
+            ->method('getLabel')
+            ->will($this->returnValue('alice@foo.bar'));
+
+        $otp->expects($this->any())
+            ->method('getSecret')
+            ->will($this->returnValue('JDDK4U6G3BJLEZ7Y'));
+
+        $otp->expects($this->any())
+            ->method('getIssuer')
+            ->will($this->returnValue('My Project'));
+
+        $otp->expects($this->any())
+            ->method('getDigest')
+            ->will($this->returnValue('sha1'));
+
+        $otp->expects($this->any())
+            ->method('getDigits')
+            ->will($this->returnValue(8));
+
+        $otp->expects($this->any())
+            ->method('getCounter')
+            ->will($this->returnValue(1000));
+
+        $otp->expects($this->never())
+            ->method('updateCounter');
+
+        $this->assertEquals('otpauth://hotp/My%20Project%3Aalice%40foo.bar?counter=1000&digits=8&secret=JDDK4U6G3BJLEZ7Y', $otp->getProvisioningUri());
+    }
+
+    public function testVerifyCounterInvalid()
+    {
+        $otp = $this->getMockBuilder('OTPHP\HOTP')
+            ->setMethods(array('getSecret', 'getDigits', 'getDigest', 'getIssuer', 'getLabel', 'isIssuerIncludedAsParameter', 'getCounter', 'updateCounter'))
+            ->getMock();
+
+        $otp->expects($this->any())
+            ->method('getLabel')
+            ->will($this->returnValue('alice@foo.bar'));
+
+        $otp->expects($this->any())
+            ->method('getSecret')
+            ->will($this->returnValue('JDDK4U6G3BJLEZ7Y'));
+
+        $otp->expects($this->any())
+            ->method('getIssuer')
+            ->will($this->returnValue('My Project'));
+
+        $otp->expects($this->any())
+            ->method('getDigest')
+            ->will($this->returnValue('sha1'));
+
+        $otp->expects($this->any())
+            ->method('getDigits')
+            ->will($this->returnValue(8));
+
+        $otp->expects($this->any())
+            ->method('getCounter')
+            ->will($this->returnValue(1000));
+
+        $otp->expects($this->never())
+            ->method('updateCounter');
+
+        $this->assertFalse($otp->verify(0, 100));
+    }
+
+    public function testVerifyCounterChanged()
+    {
+        $otp = $this->getMockBuilder('OTPHP\HOTP')
+            ->setMethods(array('getSecret', 'getDigits', 'getDigest', 'getIssuer', 'getLabel', 'isIssuerIncludedAsParameter', 'getCounter', 'updateCounter'))
+            ->getMock();
+
+        $otp->expects($this->any())
+            ->method('getLabel')
+            ->will($this->returnValue('alice@foo.bar'));
+
+        $otp->expects($this->any())
+            ->method('getSecret')
+            ->will($this->returnValue('JDDK4U6G3BJLEZ7Y'));
+
+        $otp->expects($this->any())
+            ->method('getIssuer')
+            ->will($this->returnValue('My Project'));
+
+        $otp->expects($this->any())
+            ->method('getDigest')
+            ->will($this->returnValue('sha1'));
+
+        $otp->expects($this->any())
+            ->method('getDigits')
+            ->will($this->returnValue(8));
+
+        $otp->method('getCounter')
+            ->will($this->onConsecutiveCalls(1000, 1100, 1100));
+
+        $otp->expects($this->once())
+            ->method('updateCounter')
+            ->with(1101);
+
+        $otp->verify(98449994, 1100);
+        $this->assertFalse($otp->verify(111, 1099));
+    }
+
+    public function testVerifyValidInWindow()
+    {
+        $otp = $this->getMockBuilder('OTPHP\HOTP')
+            ->setMethods(array('getSecret', 'getDigits', 'getDigest', 'getIssuer', 'getLabel', 'isIssuerIncludedAsParameter', 'getCounter', 'updateCounter'))
+            ->getMock();
+
+        $otp->expects($this->any())
+            ->method('getLabel')
+            ->will($this->returnValue('alice@foo.bar'));
+
+        $otp->expects($this->any())
+            ->method('getSecret')
+            ->will($this->returnValue('JDDK4U6G3BJLEZ7Y'));
+
+        $otp->expects($this->any())
+            ->method('getIssuer')
+            ->will($this->returnValue('My Project'));
+
+        $otp->expects($this->any())
+            ->method('getDigest')
+            ->will($this->returnValue('sha1'));
+
+        $otp->expects($this->any())
+            ->method('getDigits')
+            ->will($this->returnValue(8));
+
+        $this->assertTrue($otp->verify(59647237, 1000, 50));
+        $this->assertFalse($otp->verify(51642065, 1000, 50));
+        $this->assertTrue($otp->verify(51642065, 1000, 100));
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/tests/OTPTest.php Added

@@ -0,0 +1,92 @@
+<?php
+
+class OTPTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGenerateOtpAt()
+    {
+        $otp = $this->getMockBuilder('OTPHP\OTP')
+            ->setMethods(array('verify', 'getSecret', 'getDigits', 'getDigest', 'getIssuer', 'getLabel', 'isIssuerIncludedAsParameter', 'getProvisioningUri'))
+            ->getMock();
+
+        $otp->expects($this->any())
+            ->method('getSecret')
+            ->will($this->returnValue('JDDK4U6G3BJLEZ7Y'));
+
+        $otp->expects($this->any())
+            ->method('getDigits')
+            ->will($this->returnValue(6));
+
+        $otp->expects($this->any())
+            ->method('getDigest')
+            ->will($this->returnValue('sha1'));
+
+        $this->assertEquals(855783, $otp->at(0));
+        $this->assertEquals(549607, $otp->at(500));
+        $this->assertEquals(654666, $otp->at(1500));
+    }
+
+    /**
+     * @expectedException Exception
+     */
+    public function testGenerateUriWithoutLabel()
+    {
+        $otp = $this->getMockBuilder('OTPHP\OTP')
+            ->getMock();
+
+        $method = self::getMethod('generateURI');
+
+        $method->invokeArgs($otp, array('test', array(), true));
+    }
+
+    public function testGenerateUriWithValidLabel()
+    {
+        $otp = $this->getMockBuilder('OTPHP\OTP')
+            ->setMethods(array('verify', 'getSecret', 'getDigits', 'getDigest', 'getIssuer', 'getLabel', 'isIssuerIncludedAsParameter', 'getProvisioningUri'))
+            ->getMock();
+
+        $otp->expects($this->any())
+            ->method('getLabel')
+            ->will($this->returnValue('alice@foo.bar'));
+
+        $otp->expects($this->any())
+            ->method('getSecret')
+            ->will($this->returnValue('JDDK4U6G3BJLEZ7Y'));
+
+        $method = self::getMethod('generateURI');
+
+        $this->assertEquals('otpauth://test/alice%40foo.bar?secret=JDDK4U6G3BJLEZ7Y', $method->invokeArgs($otp, array('test', array(), true)));
+        $this->assertEquals('otpauth://test/alice%40foo.bar?option1=baz&secret=JDDK4U6G3BJLEZ7Y', $method->invokeArgs($otp, array('test', array('option1' => 'baz'), true)));
+
+        $otp->expects($this->any())
+            ->method('getIssuer')
+            ->will($this->returnValue('My Project'));
+
+        $otp->expects($this->any())
+            ->method('getDigest')
+            ->will($this->returnValue('sha1'));
+
+        $otp->expects($this->any())
+            ->method('getDigits')
+            ->will($this->returnValue(8));
+
+        $this->assertEquals('otpauth://test/My%20Project%3Aalice%40foo.bar?digits=8&secret=JDDK4U6G3BJLEZ7Y', $method->invokeArgs($otp, array('test', array(), true)));
+
+        $otp->expects($this->any())
+            ->method('isIssuerIncludedAsParameter')
+            ->will($this->returnValue(true));
+
+        $this->assertEquals('otpauth://test/My%20Project%3Aalice%40foo.bar?digits=8&issuer=My%20Project&secret=JDDK4U6G3BJLEZ7Y', $method->invokeArgs($otp, array('test', array(), true)));
+    }
+
+    /**
+     * @param string $name
+     */
+    protected static function getMethod($name)
+    {
+        $class = new \ReflectionClass('OTPHP\OTP');
+        $method = $class->getMethod($name);
+        $method->setAccessible(true);
+
+        return $method;
+    }
+}

kolab-hkccp-0.7.18.1.tar.gz/lib/ext/otphp/tests/TOTPTest.php Added

@@ -0,0 +1,151 @@
+<?php
+
+use Base32\Base32;
+
+class TOTPTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetProvisioningUri()
+    {
+        $otp = $this->creatTOTP(6, 'sha1', 30);
+
+        $this->assertEquals('otpauth://totp/My%20Project%3Aalice%40foo.bar?secret=JDDK4U6G3BJLEZ7Y', $otp->getProvisioningUri());
+    }
+
+    public function testGenerateOtpAt()
+    {
+        $otp = $this->creatTOTP(6, 'sha1', 30);
+
+        $this->assertEquals(855783, $otp->at(0));
+        $this->assertEquals(762124, $otp->at(319690800));
+        $this->assertEquals(139664, $otp->at(1301012137));
+    }
+
+    public function testGenerateOtpNow()
+    {
+        $otp = $this->creatTOTP(6, 'sha1', 30);
+
+        $this->assertEquals($otp->now(), $otp->at(time()));
+    }
+
+    public function testVerifyOtpNow()
+    {
+        $otp = $this->creatTOTP(6, 'sha1', 30);
+
+        $totp = $otp->at(time());
+        $this->assertTrue($otp->verify($totp));
+    }
+
+    public function testVerifyOtp()
+    {
+        $otp = $this->creatTOTP(6, 'sha1', 30);
+
+        $this->assertTrue($otp->verify(855783, 0));
+        $this->assertTrue($otp->verify(762124, 319690800));
+        $this->assertTrue($otp->verify(139664, 1301012137));
+
+        $this->assertFalse($otp->verify(139664, 1301012107));
+        $this->assertFalse($otp->verify(139664, 1301012167));
+        $this->assertFalse($otp->verify(139664, 1301012197));
+    }
+
+    public function testNotCompatibleWithGoogleAuthenticator()
+    {
+        $otp = $this->creatTOTP(9, 'sha512', 10);
+
+        $this->assertEquals('otpauth://totp/My%20Project%3Aalice%40foo.bar?algorithm=sha512&digits=9&period=10&secret=JDDK4U6G3BJLEZ7Y', $otp->getProvisioningUri());
+    }
+
+    /**
+     * @dataProvider testVectorsData
+     */
+    public function testVectors($totp, $timestamp, $expected_value)
+    {
+        $this->assertEquals($expected_value, $totp->at($timestamp));
+        $this->assertTrue($totp->verify($expected_value, $timestamp));
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc6238#appendix-B
+     * @see http://www.rfc-editor.org/errata_search.php?rfc=6238
+     */
+    public function testVectorsData()
+    {
+        $totp_sha1   = $this->creatTOTP(8, 'sha1',   30, Base32::encode('12345678901234567890'));
+        $totp_sha256 = $this->creatTOTP(8, 'sha256', 30, Base32::encode('12345678901234567890123456789012'));
+        $totp_sha512 = $this->creatTOTP(8, 'sha512', 30, Base32::encode('1234567890123456789012345678901234567890123456789012345678901234'));
+
+        return array(
+            array($totp_sha1,   59, 94287082),
+            array($totp_sha256, 59, 46119246),
+            array($totp_sha512, 59, 90693936),
+            array($totp_sha1,   1111111109,  7081804),
+            array($totp_sha256, 1111111109, 68084774),
+            array($totp_sha512, 1111111109, 25091201),
+            array($totp_sha1,   1111111111, 14050471),
+            array($totp_sha256, 1111111111, 67062674),
+            array($totp_sha512, 1111111111, 99943326),
+            array($totp_sha1,   1234567890, 89005924),
+            array($totp_sha256, 1234567890, 91819424),
+            array($totp_sha512, 1234567890, 93441116),
+            array($totp_sha1,   2000000000, 69279037),
+            array($totp_sha256, 2000000000, 90698825),
+            array($totp_sha512, 2000000000, 38618901),
+            array($totp_sha1,   20000000000, 65353130),
+            array($totp_sha256, 20000000000, 77737706),
+            array($totp_sha512, 20000000000, 47863826),
+        );
+    }
+
+    public function testWithoutGoogleAuthenticatorCompatibility()
+    {
+        $otp = $this->creatTOTP(6, 'sha1', 30);
+
+        $this->assertEquals('otpauth://totp/My%20Project%3Aalice%40foo.bar?algorithm=sha1&digits=6&period=30&secret=JDDK4U6G3BJLEZ7Y', $otp->getProvisioningUri(false));
+    }
+
+    public function testVerifyOtpInWindow()
+    {
+        $otp = $this->creatTOTP(6, 'sha1', 30);
+
+        $this->assertFalse($otp->verify(54409, 319690800, 10)); // -11 intervals
+        $this->assertTrue($otp->verify(808167, 319690800, 10)); // -10 intervals
+        $this->assertTrue($otp->verify(364393, 319690800, 10)); // -9 intervals
+        $this->assertTrue($otp->verify(762124, 319690800, 10)); // 0 intervals
+        $this->assertTrue($otp->verify(988451, 319690800, 10)); // +9 intervals
+        $this->assertTrue($otp->verify(789387, 319690800, 10)); // +10 intervals
+        $this->assertFalse($otp->verify(465009, 319690800, 10)); // +11 intervals
+    }
+
+    private function creatTOTP($digits, $digest, $interval, $secret = 'JDDK4U6G3BJLEZ7Y', $label = 'alice@foo.bar', $issuer = 'My Project')
+    {
+        $otp = $this->getMockBuilder('OTPHP\TOTP')
+            ->setMethods(array('getSecret', 'getDigits', 'getDigest', 'getIssuer', 'getLabel', 'isIssuerIncludedAsParameter', 'getInterval'))
+            ->getMock();
+
+        $otp->expects($this->any())
+            ->method('getLabel')
+            ->will($this->returnValue($label));
+
+        $otp->expects($this->any())
+            ->method('getSecret')
+            ->will($this->returnValue($secret));
+
+        $otp->expects($this->any())
+            ->method('getIssuer')
+            ->will($this->returnValue($issuer));
+
+        $otp->expects($this->any())
+            ->method('getDigest')
+            ->will($this->returnValue($digest));
+
+        $otp->expects($this->any())
+            ->method('getDigits')
+            ->will($this->returnValue($digits));
+
+        $otp->expects($this->any())
+            ->method('getInterval')
+            ->will($this->returnValue($interval));
+
+        return $otp;
+    }
+}

kolab-hkccp-0.7.18.tar.gz/localization/en.php -> kolab-hkccp-0.7.18.1.tar.gz/localization/en.php Changed

@@ -69,6 +69,13 @@
 $texts['login.reset.retype'] = 'Retype the password.';
 $texts['login.reset.success'] = 'You have successfully reset your password. Now log-in with the new one.';
 
+$texts['login.2fauth'] = '2-Factor Authentication';
+$texts['login.totp'] = 'Mobile app (TOTP)';
+$texts['login.yubikey'] = 'Yubikey';
+$texts['login.2fsubmit'] = 'Submit';
+$texts['login.or'] = 'OR';
+$texts['login.invalid2facode'] = 'Invalid code of 2-factor authentication';
+
 $texts['form.add'] = 'Add';
 $texts['form.delete'] = 'Delete';
 $texts['form.submit'] = 'Submit';
@@ -163,6 +170,8 @@
 $texts['signup.activesync.description'] = 'Enables synchronization with mobile devices using ActiveSync';
 $texts['signup.lite'] = 'Lite (mail only)';
 $texts['signup.lite.description'] = 'Enabling this option will disable all groupware functionality, such as calendaring, tasks, files and the ability to synchronize such data to your mobile phone via CalDAV/CardDAV. It is mutually exclusive with the additional functionality, such as ActiveSync.';
+$texts['signup.2factor-auth'] = '2-Factor Authentication';
+$texts['signup.2factor-auth.description'] = 'With this option you can use 2-factor authentication for webmail and administration panel. This will disable access to your account on any other channel i.e. ActiveSync, *DAV and IMAP.';
 $texts['signup.domainaccount'] = 'Manage your own domains';
 $texts['signup.summary'] = 'Summary';
 $texts['signup.price'] = 'Package price';

kolab-hkccp-0.7.18.tar.gz/public_html/skins/default/js/hostedadmin.js -> kolab-hkccp-0.7.18.1.tar.gz/public_html/skins/default/js/hostedadmin.js Changed

kolab-hkccp-0.7.18.tar.gz/public_html/skins/default/templates/include/forms.twig -> kolab-hkccp-0.7.18.1.tar.gz/public_html/skins/default/templates/include/forms.twig Changed

@@ -93,3 +93,39 @@
 <span class="helpicon glyphicon glyphicon-question-sign" data-toggle="tooltip" title="{{ T(label) }}"></span>
 {% endif %}
 {%- endmacro -%}
+
+{% macro login_form(env) %}
+<form action="{{ url(env.form_url|default('/login')) }}" method="post" id="login-form">
+{% if env.factors %}
+    {{ _self.hidden('username', env.username) }}
+    {% for factor in env.factors %}
+        {% if loop.index > 1 %}
+            <p style="text-align: center">{{ T('login.or') }}</p>
+        {% endif %}
+    <div class="form-group">
+        <label for="{{ factor.name }}">{{ factor.label }}</label>
+        <div class="controls">
+            {{ _self.input(factor.name, '', 'text', 'lg form-control', factor.required) }}
+        </div>
+    </div>
+    {% endfor %}
+{% else %}
+    <div class="form-group">
+        <label for="ffusername">{{ T('login.username') }}</label>
+        <div class="controls">
+            {{ _self.input('username', http.post.username, 'text', 'lg form-control', true) }}
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="ffpassword">{{ T('login.password') }}</label>
+        <div class="controls">
+            {{ _self.input('password', '', 'password', 'lg form-control', true) }}
+        </div>
+    </div>
+{% endif %}
+<div class="form-actions">
+    <p><input type="submit" value="{{ env.submit|default(T('login.submit')) }}" class="btn btn-lg btn-primary" /></p>
+    <p><a href="{{ url('/login/forgot') }}">{{ T('login.forgotpassword') }}</a></p>
+</div>
+</form>
+{% endmacro %}

kolab-hkccp-0.7.18.tar.gz/public_html/skins/default/templates/login.html -> kolab-hkccp-0.7.18.1.tar.gz/public_html/skins/default/templates/login.html Changed

@@ -1,32 +1,14 @@
 {% extends 'layout.html' %}
 {% import 'include/forms.twig' as forms %}
 
-{% set title = T('login.title') %}
+{% set title = title|default(T('login.title')) %}
 {% block content %}
 <div class="row">
 <div class="col-sm-6 col-sm-offset-3">
 
 <h1 class="pagetitle">{{ title }}</h1>
 
-<form action="{{ url('/login') }}" method="post" id="login-form">
-<div class="form-group">
-    <label for="ffusername">{{ T('login.username') }}</label>
-    <div class="controls">
-        {{ forms.input('username', http.post.username, 'text', 'form-control', true) }}
-    </div>
-</div>
-<div class="form-group">
-    <label for="ffpassword">{{ T('login.password') }}</label>
-    <div class="controls">
-        {{ forms.input('password', '', 'password', 'form-control', true) }}
-    </div>
-</div>
-
-<div class="form-actions">
-    <p><input type="submit" value="{{ T('login.submit') }}" class="btn btn-primary" /></p>
-    <p><a href="{{ url('/login/forgot') }}">{{ T('login.forgotpassword') }}</a></p>
-</div>
-</form>
+{{ forms.login_form(_context) }}
 
 </div>
 </div>

kolab-hkccp-0.7.18.tar.gz/public_html/skins/ilovefs/templates/login.html -> kolab-hkccp-0.7.18.1.tar.gz/public_html/skins/ilovefs/templates/login.html Changed

@@ -2,29 +2,11 @@
 {% set bodyclass = 'page-login' %}
 {% import 'include/forms.twig' as forms %}
 
-{% set title = T('login.title') %}
+{% set title = title|default(T('login.title')) %}
 {% block content %}
 <h1 class="pagetitle">{{ title }}</h1>
 
-<form action="{{ url('/login') }}" method="post" id="login-form">
-<div class="form-group">
-    <label for="ffusername">{{ T('login.username') }}</label>
-    <div class="controls">
-        {{ forms.input('username', http.post.username, 'text', 'lg form-control', true) }}
-    </div>
-</div>
-<div class="form-group">
-    <label for="ffpassword">{{ T('login.password') }}</label>
-    <div class="controls">
-        {{ forms.input('password', '', 'password', 'lg form-control', true) }}
-    </div>
-</div>
-
-<div class="form-actions">
-    <p><input type="submit" value="{{ T('login.submit') }}" class="btn btn-lg btn-primary" /></p>
-    <p><a href="{{ url('/login/forgot') }}">{{ T('login.forgotpassword') }}</a></p>
-</div>
-</form>
+{{ forms.login_form(_context) }}
 
 <p class="hint login-hint">{{ T('login.footer', { webmail_login:webmail_url })|raw }}</p>

kolab-hkccp-0.7.18.tar.gz/public_html/skins/kolabnow/templates/login.html -> kolab-hkccp-0.7.18.1.tar.gz/public_html/skins/kolabnow/templates/login.html Changed

@@ -2,30 +2,12 @@
 {% set bodyclass = 'page-login' %}
 {% import 'include/forms.twig' as forms %}
 
-{% set title = T('login.title') %}
+{% set title = title|default(T('login.title')) %}
 {% block content %}
 <h1 class="pagetitle">{{ title }}</h1>
 
-<form action="{{ url('/login') }}" method="post" id="login-form">
-<div class="form-group">
-    <label for="ffusername">{{ T('login.username') }}</label>
-    <div class="controls">
-        {{ forms.input('username', http.post.username, 'text', 'lg form-control', true) }}
-    </div>
-</div>
-<div class="form-group">
-    <label for="ffpassword">{{ T('login.password') }}</label>
-    <div class="controls">
-        {{ forms.input('password', '', 'password', 'lg form-control', true) }}
-    </div>
-</div>
-
-<div class="form-actions">
-    <p><input type="submit" value="{{ T('login.submit') }}" class="btn btn-lg btn-primary" /></p>
-    <p><a href="{{ url('/login/forgot') }}">{{ T('login.forgotpassword') }}</a></p>
-</div>
-</form>
+{{ forms.login_form(_context) }}
 
 <p class="hint login-hint">{{ T('login.footer', { webmail_login:webmail_url })|raw }}</p>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}

kolab-hkccp-0.7.18.tar.gz/public_html/skins/mykolab/templates/login.html -> kolab-hkccp-0.7.18.1.tar.gz/public_html/skins/mykolab/templates/login.html Changed

@@ -1,32 +1,14 @@
 {% extends 'layout.html' %}
 {% import 'include/forms.twig' as forms %}
 
-{% set title = T('login.title') %}
+{% set title = title|default(T('login.title')) %}
 {% block content %}
 <div class="row">
 <div class="col-sm-6 col-sm-offset-3">
 
 <h1 class="pagetitle">{{ title }}</h1>
 
-<form action="{{ url('/login') }}" method="post" id="login-form">
-<div class="form-group">
-    <label for="ffusername">{{ T('login.username') }}</label>
-    <div class="controls">
-        {{ forms.input('username', http.post.username, 'text', 'form-control', true) }}
-    </div>
-</div>
-<div class="form-group">
-    <label for="ffpassword">{{ T('login.password') }}</label>
-    <div class="controls">
-        {{ forms.input('password', '', 'password', 'form-control', true) }}
-    </div>
-</div>
-
-<div class="form-actions">
-    <p><input type="submit" value="{{ T('login.submit') }}" class="btn btn-primary" /></p>
-    <p><a href="{{ url('/login/forgot') }}">{{ T('login.forgotpassword') }}</a></p>
-</div>
-</form>
+{{ forms.login_form(_context) }}
 
 <p class="hint">{{ T('login.footer', { webmail_login:webmail_url })|raw }}</p>

kolab-hkccp-0.7.18.tar.gz/public_html/skins/ssd/templates/login.html -> kolab-hkccp-0.7.18.1.tar.gz/public_html/skins/ssd/templates/login.html Changed

@@ -2,29 +2,11 @@
 {% set bodyclass = 'page-login' %}
 {% import 'include/forms.twig' as forms %}
 
-{% set title = T('login.title') %}
+{% set title = title|default(T('login.title')) %}
 {% block content %}
 <h1 class="pagetitle">{{ title }}</h1>
 
-<form action="{{ url('/login') }}" method="post" id="login-form">
-<div class="form-group">
-    <label for="ffusername">{{ T('login.username') }}</label>
-    <div class="controls">
-        {{ forms.input('username', http.post.username, 'text', 'lg form-control', true) }}
-    </div>
-</div>
-<div class="form-group">
-    <label for="ffpassword">{{ T('login.password') }}</label>
-    <div class="controls">
-        {{ forms.input('password', '', 'password', 'lg form-control', true) }}
-    </div>
-</div>
-
-<div class="form-actions">
-    <p><input type="submit" value="{{ T('login.submit') }}" class="btn btn-lg btn-primary" /></p>
-    <p><a href="{{ url('/login/forgot') }}">{{ T('login.forgotpassword') }}</a></p>
-</div>
-</form>
+{{ forms.login_form(_context) }}
 
 <p class="hint login-hint">{{ T('login.footer', { webmail_login:webmail_url })|raw }}</p>

Changes of Revision 4