From fcc95bd8953c0b1c00c7af1dfd2f3bb3b3c9dbd0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 10 Mar 2024 16:39:06 +0100
Subject: [PATCH] Improvements for password verify (addresses:
 https://github.com/iiab/calibre-web/pull/138)

---
 cps/helper.py             | 10 +++++-----
 cps/static/js/password.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 92aa081e..e6d56bf6 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -696,15 +696,15 @@ def valid_password(check_password):
         if config.config_password_min_length > 0:
             verify += r"^(?=.{" + str(config.config_password_min_length) + ",}$)"
         if config.config_password_number:
-            verify += "(?=.*?\d)"
+            verify += r"(?=.*?\d)"
         if config.config_password_lower:
-            verify += "(?=.*?[\p{Ll}])"
+            verify += r"(?=.*?[\p{Ll}])"
         if config.config_password_upper:
-            verify += "(?=.*?[\p{Lu}])"
+            verify += r"(?=.*?[\p{Lu}])"
         if config.config_password_character:
-            verify += "(?=.*?[\p{Letter}])"
+            verify += r"(?=.*?[\p{Letter}])"
         if config.config_password_special:
-            verify += "(?=.*?[^\p{Letter}\s0-9])"
+            verify += r"(?=.*?[^\p{Letter}\s0-9])"
         match = regex.match(verify, check_password)
         if not match:
             raise Exception(_("Password doesn't comply with password validation rules"))
diff --git a/cps/static/js/password.js b/cps/static/js/password.js
index 5d640d29..2a6f1cda 100644
--- a/cps/static/js/password.js
+++ b/cps/static/js/password.js
@@ -24,7 +24,7 @@ $(document).ready(function() {
           },
 
         }, function () {
-        if ($('#password').data("verify")) {
+        if ($('#password').data("verify") === "True") {
             // Initialized and ready to go
             var options = {};
             options.common = {