From 2a1f231caf6eaff27f2c293bcbadbd2564160cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?= <p.mueller@pcsg.de>
Date: Tue, 31 Jan 2017 17:42:58 +0100
Subject: [PATCH] fix: korrekte auth-key abfrage
---
bin/controls/Settings.js | 8 ++++++++
src/QUI/Auth/Google2Fa/Auth.php | 4 +++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/bin/controls/Settings.js b/bin/controls/Settings.js
index 49b2cb7..647361c 100644
--- a/bin/controls/Settings.js
+++ b/bin/controls/Settings.js
@@ -50,6 +50,10 @@ define('package/quiqqer/authgoogle2fa/bin/controls/Settings', [
'$deleteKeys'
],
+ options: {
+ uid: false
+ },
+
initialize: function (options) {
this.setAttribute('title', QUILocale.get(lg, 'passwords.panel.title'));
@@ -152,6 +156,10 @@ define('package/quiqqer/authgoogle2fa/bin/controls/Settings', [
* Event: onInject
*/
$onInject: function () {
+
+ console.log(this.getAttribute('uid'));
+ console.log(this.getElm().get('data-qui-options-uid'));
+
this.resize();
this.refresh();
},
diff --git a/src/QUI/Auth/Google2Fa/Auth.php b/src/QUI/Auth/Google2Fa/Auth.php
index 21818e1..87da03a 100644
--- a/src/QUI/Auth/Google2Fa/Auth.php
+++ b/src/QUI/Auth/Google2Fa/Auth.php
@@ -85,7 +85,9 @@ public function auth($authData)
}
foreach ($authSecrets as $k => $secretData) {
- if ($this->Google2FA->verifyKey(trim($secretData['key']), $authCode)) {
+ $key = trim(Security::decrypt($secretData['key']));
+
+ if ($this->Google2FA->verifyKey($key, $authCode)) {
return;
}
--
GitLab