Kolab Groupware OBS

kolab-hkccp.spec Changed

0001-Fix-missing-Hosting-tab-after-2FA-logon-of-group-acc.patch Added

@@ -0,0 +1,48 @@
+From 34fa825d630b7c10f78f24bb4069c2fdcaaa48c1 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Fri, 17 Nov 2017 20:23:32 +0100
+Subject: [PATCH] Fix missing Hosting tab after 2FA logon of group account
+ admin (Bifrost#T59208)
+
+---
+ lib/Kolab/Hosted/Controller/Auth2F.php | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Kolab/Hosted/Controller/Auth2F.php b/lib/Kolab/Hosted/Controller/Auth2F.php
+index 5738841..55294c8 100644
+--- a/lib/Kolab/Hosted/Controller/Auth2F.php
++++ b/lib/Kolab/Hosted/Controller/Auth2F.php
+@@ -25,6 +25,7 @@
+ 
+ namespace Kolab\Hosted\Controller;
+ 
++use Kolab\API;
+ use Kolab\Log;
+ use Kolab\Utils;
+ use Kolab\Hosted\Config;
+@@ -82,6 +83,7 @@ class Auth2F
+         $_SESSION['2fa_factors']  = $factors;
+         $_SESSION['2fa_username'] = $this->username;
+         $_SESSION['2fa_account']  = $user;
++        $_SESSION['2fa_apitoken'] = API\Client::get_user_instance()->get_session_token();
+ 
+         // define login form
+         $nonce   = $_SESSION['2fa_nonce'];
+@@ -151,11 +153,13 @@ class Auth2F
+             return;
+         }
+ 
++        // setup user session
+         $user = $_SESSION['2fa_account'];
++        API\Client::get_user_instance()->set_session_token($_SESSION['2fa_apitoken']);
+ 
+         // clean up
+         unset($_SESSION['2fa_time'], $_SESSION['2fa_nonce'], $_SESSION['2fa_factors'],
+-            $_SESSION['2fa_username'], $_SESSION['2fa_account']);
++            $_SESSION['2fa_username'], $_SESSION['2fa_account'], $_SESSION['2fa_apitoken']);
+ 
+         return $user;
+     }
+-- 
+2.14.3
+

kolab-hkccp-0.7.19.tar.gz Deleted

Changes of Revision 10