From 8a0ad1ebe313a4f4fca6e9068c06ee400d15b8a4 Mon Sep 17 00:00:00 2001
From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Date: Wed, 16 Apr 2025 15:44:00 -0300
Subject: Refs #35959 -- Added render_password_as_hash auth template tag for
 password rendering.

---
 django/contrib/auth/forms.py                       | 21 +-----------------
 .../auth/widgets/read_only_password_hash.html      |  7 ++----
 django/contrib/auth/templatetags/__init__.py       |  0
 django/contrib/auth/templatetags/auth.py           | 25 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 django/contrib/auth/templatetags/__init__.py
 create mode 100644 django/contrib/auth/templatetags/auth.py

(limited to 'django')

diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index cd02887027..7b0b3833b8 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -3,7 +3,7 @@ import unicodedata
 
 from django import forms
 from django.contrib.auth import authenticate, get_user_model, password_validation
-from django.contrib.auth.hashers import UNUSABLE_PASSWORD_PREFIX, identify_hasher
+from django.contrib.auth.hashers import UNUSABLE_PASSWORD_PREFIX
 from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.shortcuts import get_current_site
@@ -13,7 +13,6 @@ from django.template import loader
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
 from django.utils.text import capfirst
-from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.debug import sensitive_variables
 
@@ -40,24 +39,6 @@ class ReadOnlyPasswordHashWidget(forms.Widget):
     def get_context(self, name, value, attrs):
         context = super().get_context(name, value, attrs)
         usable_password = value and not value.startswith(UNUSABLE_PASSWORD_PREFIX)
-        summary = []
-        if usable_password:
-            try:
-                hasher = identify_hasher(value)
-            except ValueError:
-                summary.append(
-                    {
-                        "label": gettext(
-                            "Invalid password format or unknown hashing algorithm."
-                        )
-                    }
-                )
-            else:
-                for key, value_ in hasher.safe_summary(value).items():
-                    summary.append({"label": gettext(key), "value": value_})
-        else:
-            summary.append({"label": gettext("No password set.")})
-        context["summary"] = summary
         context["button_label"] = (
             _("Reset password") if usable_password else _("Set password")
         )
diff --git a/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html b/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html
index b48204b7eb..102ceb30eb 100644
--- a/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html
+++ b/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html
@@ -1,8 +1,5 @@
+{% load auth %}
 <div{% include 'django/forms/widgets/attrs.html' %}>
-  <p>
-    {% for entry in summary %}
-    <strong>{{ entry.label }}</strong>{% if entry.value %}: <bdi>{{ entry.value }}</bdi>{% endif %}
-    {% endfor %}
-  </p>
+  {% render_password_as_hash widget.value %}
   <p><a role="button" class="button" href="{{ password_url|default:"../password/" }}">{{ button_label }}</a></p>
 </div>
diff --git a/django/contrib/auth/templatetags/__init__.py b/django/contrib/auth/templatetags/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/contrib/auth/templatetags/auth.py b/django/contrib/auth/templatetags/auth.py
new file mode 100644
index 0000000000..7cdbad8595
--- /dev/null
+++ b/django/contrib/auth/templatetags/auth.py
@@ -0,0 +1,25 @@
+from django.contrib.auth.hashers import UNUSABLE_PASSWORD_PREFIX, identify_hasher
+from django.template import Library
+from django.utils.html import format_html, format_html_join
+from django.utils.translation import gettext
+
+register = Library()
+
+
+@register.simple_tag
+def render_password_as_hash(value):
+    if not value or value.startswith(UNUSABLE_PASSWORD_PREFIX):
+        return format_html("<p><strong>{}</strong></p>", gettext("No password set."))
+    try:
+        hasher = identify_hasher(value)
+        hashed_summary = hasher.safe_summary(value)
+    except ValueError:
+        return format_html(
+            "<p><strong>{}</strong></p>",
+            gettext("Invalid password format or unknown hashing algorithm."),
+        )
+    items = [(gettext(key), val) for key, val in hashed_summary.items()]
+    return format_html(
+        "<p>{}</p>",
+        format_html_join(" ", "<strong>{}</strong>: <bdi>{}</bdi>", items),
+    )
-- 
cgit v1.3