updates file names, variable names to be clearer.

canaille/app/forms.py

@@ -16,7 +16,7 @@ from canaille.app.i18n import gettext as _
 from canaille.app.i18n import locale_selector
 from canaille.app.i18n import timezone_selector
 from canaille.backends import Backend
-from canaille.core.mails import send_comprimised_password_check_failure_mail
+from canaille.core.mails import send_compromised_password_check_failure_mail
 
 from . import validate_uri
 from .flask import request_is_htmx
@@ -94,9 +94,12 @@ def compromised_password_validator(form, field):
         return None
 
     hashed_password = sha1(field.data.encode("utf-8")).hexdigest()
-    hashed_password_splited = (hashed_password[:5].upper(), hashed_password[5:].upper())
+    hashed_password_prefix, hashed_password_suffix = (
+        hashed_password[:5].upper(),
+        hashed_password[5:].upper(),
+    )
 
-    api_url = f"https://api.pwnedpasswords.com/range/{hashed_password_splited[0]}"
+    api_url = f"https://api.pwnedpasswords.com/range/{hashed_password_prefix}"
 
     try:
         response = requests.api.get(api_url, timeout=10)
@@ -111,8 +114,8 @@ def compromised_password_validator(form, field):
                 user_name = form["user_name"].data
                 user_email = form["emails"].data[0]
 
-            send_comprimised_password_check_failure_mail(
-                api_url, user_name, user_email, hashed_password
+            send_compromised_password_check_failure_mail(
+                api_url, user_name, user_email, hashed_password_suffix
             )
 
         return None
@@ -120,7 +123,7 @@ def compromised_password_validator(form, field):
     decoded_response = response.content.decode("utf8").split("\r\n")
 
     for each in decoded_response:
-        if hashed_password_splited[1] in each.split(":")[0]:
+        if hashed_password_suffix == each.split(":")[0]:
             raise wtforms.ValidationError(_("This password is compromised."))
 
 

canaille/core/mails.py

@@ -212,17 +212,17 @@ def send_registration_mail(email, registration_url):
     )
 
 
-def send_comprimised_password_check_failure_mail(
+def send_compromised_password_check_failure_mail(
     check_password_url, user_name, user_email, hashed_password
 ):
     base_url = url_for("core.account.index", _external=True)
     logo_cid, logo_filename, logo_raw = logo()
 
-    subject = _("Pwned password check incident on {website_name}").format(
+    subject = _("compromised password check failure on {website_name}").format(
         website_name=current_app.config["CANAILLE"]["NAME"]
     )
     text_body = render_template(
-        "mails/pwned-password-non-checked.txt",
+        "mails/compromised_password_check_failure.txt",
         site_name=current_app.config["CANAILLE"]["NAME"],
         site_url=base_url,
         check_password_url=check_password_url,
@@ -231,7 +231,7 @@ def send_comprimised_password_check_failure_mail(
         hashed_password=hashed_password,
     )
     html_body = render_template(
-        "mails/pwned-password-non-checked.html",
+        "mails/compromised_password_check_failure.html",
         site_name=current_app.config["CANAILLE"]["NAME"],
         site_url=base_url,
         check_password_url=check_password_url,

canaille/core/templates/mails/compromised_password_check_failure.html

@@ -16,7 +16,7 @@
                             <img src="{{ logo }}" alt="{{ site_name }}" style="font-size: 1.3rem; border-style: none; width: 50px; display: inline-block; margin-top: .14em; vertical-align: middle;">
                         {% endif %}
                         <div style="font-size: 1.3rem; display: inline-block; padding-left: .75rem; vertical-align: middle;">
-                            {% trans %}Verification failed if password is compromised.{% endtrans %}
+                            {% trans %}Compromised password check failure{% endtrans %}
                         </div>
                     </h3>
                 </td>

canaille/core/templates/mails/compromised_password_check_failure.txt

@@ -1,4 +1,4 @@
-# {% trans %}Verification failed if password is compromised.{% endtrans %}
+# {% trans %}Compromised password check failure{% endtrans %}
 
 {% trans %}Our services were unable to verify if the http://127.0.0.1:5000/profile/{{ user_name }}/settings's password is compromised.{% endtrans %}