Consolidation of Template Tags: Make a single use case reusable, and use in report disclaimers (#14098)

Maffooch · web-flow · commit 0ccb6ae02f01 · 2026-01-16T20:28:38.000-06:00
diff --git a/dojo/templates/base.html b/dojo/templates/base.html
@@ -656,14 +656,13 @@
             <!-- Page Content -->
             <div id="page-wrapper">
                 {% if request.user.is_authenticated and announcement %}
-                    {% load announcement_banner_tags %}
                     <div role="alert" class="announcement-banner alert alert-{{ announcement.style }} {% if announcement.dismissable %}alert-dismissible{% endif %} show">
                     {% if announcement.dismissable %}
                         <a href="{% url 'dismiss_announcement' %}" class="close" aria-label="Close">
                             <span aria-hidden="true">×</span>
                         </a>
                     {% endif %}
-                    {{ announcement.message|bleach_announcement_message }}
+                    {{ announcement.message|bleach_with_a_tags }}
                     </div>
                 {% endif %}
                 <div class="container-fluid">
diff --git a/dojo/templates/dojo/custom_html_report.html b/dojo/templates/dojo/custom_html_report.html
@@ -1,12 +1,13 @@
 {% extends "report_base.html" %}
+{% load display_tags %}
 
 {% block content %}
     {{ block.super }}
     <div class="container" id="html_report">
         {% if include_disclaimer %}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
 		{% endif %}
         {% for widget in widgets %}
diff --git a/dojo/templates/dojo/endpoint_pdf_report.html b/dojo/templates/dojo/endpoint_pdf_report.html
@@ -81,7 +81,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/engagement_pdf_report.html b/dojo/templates/dojo/engagement_pdf_report.html
@@ -160,7 +160,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/finding_pdf_report.html b/dojo/templates/dojo/finding_pdf_report.html
@@ -57,7 +57,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/product_endpoint_pdf_report.html b/dojo/templates/dojo/product_endpoint_pdf_report.html
@@ -119,7 +119,7 @@ <h5>Finding Age</h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
         {% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/product_pdf_report.html b/dojo/templates/dojo/product_pdf_report.html
@@ -142,7 +142,7 @@ <h5>Finding Age</h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/product_type_pdf_report.html b/dojo/templates/dojo/product_type_pdf_report.html
@@ -114,7 +114,7 @@ <h4>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/test_pdf_report.html b/dojo/templates/dojo/test_pdf_report.html
@@ -146,7 +146,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
-                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | bleach_with_a_tags }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templatetags/announcement_banner_tags.py b/dojo/templatetags/announcement_banner_tags.py
diff --git a/dojo/templatetags/display_tags.py b/dojo/templatetags/display_tags.py
@@ -12,6 +12,7 @@
 import dateutil.relativedelta
 import git
 import markdown
+from bleach.css_sanitizer import CSSSanitizer
 from django import template
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -95,6 +96,16 @@ def markdown_render(value):
     return None
 
 
+@register.filter
+def bleach_with_a_tags(message):
+    allowed_attributes = bleach.ALLOWED_ATTRIBUTES
+    allowed_attributes["a"] += ["style", "target"]
+    return mark_safe(bleach.clean(
+        message,
+        attributes=allowed_attributes,
+        css_sanitizer=CSSSanitizer(allowed_css_properties=["color", "font-weight"])))
+
+
 def text_shortener(value, length):
     return_value = str(value)
     if len(return_value) > length:
