2.1.27

Fix for #2513
nilsteampassnet · Jan 10, 2019 · fb8b55e · fb8b55e
1 parent d147d92
commit fb8b55e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,7 @@
 2.1.27
+32/
+ #2513 Error for login with DUOSecurity
+
 31/
  #2511 LDAP Password change: old PW still valid
  #2507 On user password change (from Users management page), email is not sent

diff --git a/duo.load.php b/duo.load.php
@@ -45,7 +45,7 @@
         "sources/identify.php",
         {
             type : "identify_duo_user",
-            login: sanitizeString($("#login").val())
+            login: sanitizeString($("#login").val()),
         },
         function(data) {
             var ret = data[0].sig_request.split('|');

diff --git a/includes/config/include.php b/includes/config/include.php
@@ -12,7 +12,7 @@
 global $SETTINGS, $languagesList, $SETTINGS_EXT;
 
 $SETTINGS_EXT['version'] = "2.1.27";
-$SETTINGS_EXT['version_full'] = $SETTINGS_EXT['version'].".31";
+$SETTINGS_EXT['version_full'] = $SETTINGS_EXT['version'].".32";
 $SETTINGS_EXT['tool_name'] = "TeamPass";
 $SETTINGS_EXT['one_day_seconds'] = 86400;
 $SETTINGS_EXT['one_week_seconds'] = 604800;

diff --git a/index.php b/index.php
@@ -986,7 +986,7 @@ function updateLogonButton(timeToGo){
     <form method="post" id="duo_form" action="">
         <input type="hidden" id="duo_login" name="duo_login" value="', null !== $post_duo_login ? $post_duo_login : '', '" />
         <input type="hidden" id="duo_pwd" name="duo_pwd" value="', null !== $post_duo_pwd ? $post_duo_pwd : '', '" />
-        <input type="hidden" id="duo_data" name="duo_data" value="', null !== $post_duo_data ? htmlentities(base64_decode($post_duo_data)) : '', '" />
+        <input type="hidden" id="duo_data" name="duo_data" value="', null !== $post_duo_data ? $post_duo_data : '', '" />
     </form>
 </div>';
 

diff --git a/load.php b/load.php
@@ -262,7 +262,7 @@ function(fa_methods) {
                     identifyUser(redirect, psk, data, randomstring);
                 } else {
                     // Handle if DUOSecurity is enabled
-                    $("#duo_data").val(window.btoa(data));
+                    $("#duo_data").val(window.btoa(JSON.stringify(data)));
                     loadDuoDialog();
                 }
             },
@@ -913,12 +913,12 @@ function(data) {
                     } else {
                         // finally launch identification process inside Teampass.
                         loadDuoDialogWait();
-
+                        
                         $.post(
                             "sources/identify.php",
                             {
                                 type :     "identify_user",
-                                data :     prepareExchangedData($("#duo_data").val(), "encode", "'.$_SESSION['key'].'")
+                                data :     prepareExchangedData(window.atob($("#duo_data").val()), "encode", "'.$_SESSION['key'].'")
                             },
                             function(data) {
                                 $("#connection_error").hide();
@@ -938,7 +938,6 @@ function(){
                                         1
                                     );
                                 }
-
                             },
                             "json"
                         );