From 0a31f4d1f3ef4396b7fcd7ef518298ddc7ee88f1 Mon Sep 17 00:00:00 2001
From: kkmanos <koukoularisman@gmail.com>
Date: Tue, 14 Dec 2021 17:08:46 +0200
Subject: [PATCH] final testing

---
 powerdnsadmin/routes/index.py                            | 6 +++---
 .../templates/admin_setting_authentication.html          | 8 +++-----
 powerdnsadmin/templates/password_policy_macro.html       | 9 ++++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py
index bf98703..07d2625 100644
--- a/powerdnsadmin/routes/index.py
+++ b/powerdnsadmin/routes/index.py
@@ -7,7 +7,7 @@ import ipaddress
 from distutils.util import strtobool
 from yaml import Loader, load
 from onelogin.saml2.utils import OneLogin_Saml2_Utils
-from flask import Blueprint, render_template, make_response, url_for, current_app, g, session, request, redirect, abort, jsonify
+from flask import Blueprint, render_template, render_template, make_response, url_for, current_app, g, session, request, redirect, abort, jsonify
 from flask_login import login_user, logout_user, login_required, current_user
 from zxcvbn import zxcvbn
 
@@ -708,8 +708,8 @@ def rate_password():
             }), 200)
 
     result = zxcvbn(password, user_inputs=inputs)
-    defined_guesses_log = 11
-    # attrubutes to return as json
+    defined_guesses_log = int(Setting().get('zxcvbn_guesses_log'))
+    # attributes to return as json
     feedback = []
     rate = result['guesses_log10']/defined_guesses_log
     if rate < 0.5:
diff --git a/powerdnsadmin/templates/admin_setting_authentication.html b/powerdnsadmin/templates/admin_setting_authentication.html
index 4a2b492..578cf27 100644
--- a/powerdnsadmin/templates/admin_setting_authentication.html
+++ b/powerdnsadmin/templates/admin_setting_authentication.html
@@ -106,10 +106,8 @@
                                                 {% if SETTING.get('zxcvbn_enabled')== true %}disabled{% endif %}>
                                             </div>
                                             <div class="form-group">
-                                                <label>
-                                                    <label for="zxcvbn">Use zxcvbn python package</label>
+                                                    <label for="zxcvbn">Use zxcvbn python package (If turned on, then the above password specifications will be disabled</label>
                                                     <input type="checkbox" class="checkbox" name="zxcvbn" id="zxcvbn" {% if SETTING.get('zxcvbn_enabled')== true %}checked{% endif %}>
-                                                </label>
                                             </div>
                                             <div class="form-group">
                                                 <button type="submit" class="btn btn-flat btn-primary">Save</button>
@@ -759,11 +757,11 @@
 
 <script>
 
-    $('input').on('ifChecked', function(event){
+    $('#zxcvbn').on('ifChecked', function(event){
         // alert(event.type + ' callback');
         $(".form-control.char_specified").prop("disabled", true)
     });
-    $('input').on('ifUnchecked', function(event){
+    $('#zxcvbn').on('ifUnchecked', function(event){
         // alert(event.type + ' callback');
         $(".form-control.char_specified").prop("disabled", false)
     });
diff --git a/powerdnsadmin/templates/password_policy_macro.html b/powerdnsadmin/templates/password_policy_macro.html
index 3aa3ddf..f238983 100644
--- a/powerdnsadmin/templates/password_policy_macro.html
+++ b/powerdnsadmin/templates/password_policy_macro.html
@@ -89,9 +89,6 @@ function send_pass() {
       type: "post",
       data : { 'logged_in' : {{is_logged_in}} ,'fname': fname, 'lname': lname, 'email' : email, 'username' : username, 'password': password},
       success: function(response) {
-        console.log('Submission was successful.');
-        console.log("Resp = " , response)
-        console.log('sccess')
         var x = document.getElementById('policy-err');
         // x.innerHTML = response['feedback'];
         x.innerHTML = "<ul>";
@@ -149,6 +146,12 @@ $(':input').on('keyup', function() {
     {% endif %}
     document.getElementById('pwd-submit').disabled = true;
   }
+  else {
+    {% if is_logged_in == 1 %}
+
+    document.getElementById('retype-err').innerHTML = '';
+    {% endif %}
+  }
 
   var seconds = 1;
   if (timer == null) {  // if user typed sth and timer is not running, then start one