From 66b45dd3e82cfb11e8a90eb4c34b9a8e92c88294 Mon Sep 17 00:00:00 2001
From: Tadhg O'Higgins <2626258+tadhg-ohiggins@users.noreply.github.com>
Date: Tue, 27 Jun 2023 10:50:00 -0700
Subject: [PATCH 1/5] Turns out this file is redundant; its function is covered
 by report_submission/storages.py. (#1346)

---
 backend/audit/storages.py | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 backend/audit/storages.py

diff --git a/backend/audit/storages.py b/backend/audit/storages.py
deleted file mode 100644
index b81616cdf4..0000000000
--- a/backend/audit/storages.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from django.conf import settings
-from storages.backends.s3boto3 import S3Boto3Storage
-
-
-class PrivateS3Storage(S3Boto3Storage):
-    """
-    Our S3 settings as a storage class.
-    """
-
-    bucket_name = settings.AWS_PRIVATE_STORAGE_BUCKET_NAME
-    access_key = settings.AWS_PRIVATE_ACCESS_KEY_ID
-    secret_key = settings.AWS_PRIVATE_SECRET_ACCESS_KEY
-    location = ""

From cf8ac25922901e9fccba70bb36bee6bc8e020c65 Mon Sep 17 00:00:00 2001
From: Tadhg O'Higgins <2626258+tadhg-ohiggins@users.noreply.github.com>
Date: Tue, 27 Jun 2023 12:26:51 -0700
Subject: [PATCH 2/5] Use correct Django static affordance so xlink doesn't
 break in non-local environments. (#1344)

---
 .../audit/templates/audit/my_submissions.html |  4 +-
 .../templates/audit/submission-progress.html  | 52 +++++++++----------
 .../templates/cancel-button.html              |  3 +-
 .../templates/report_submission/step-2.html   |  4 +-
 .../templates/report_submission/step-3.html   |  4 +-
 backend/templates/includes/nav_primary.html   |  2 +-
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/backend/audit/templates/audit/my_submissions.html b/backend/audit/templates/audit/my_submissions.html
index f764330df3..2dba4aed83 100644
--- a/backend/audit/templates/audit/my_submissions.html
+++ b/backend/audit/templates/audit/my_submissions.html
@@ -94,7 +94,7 @@ <h2 class="usa-modal__heading" id="modal-uei-info-heading">What is a Unique Enti
                         aria-label="Close this window"
                         data-close-modal>
                     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                        <use xlink:href="/static/img/sprite.svg#close"></use>
+                        <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
                     </svg>
                 </button>
             </div>
@@ -150,7 +150,7 @@ <h2 class="usa-modal__heading" id="modal-terms-conditions-heading">
                         aria-label="Close this window"
                         data-close-modal>
                     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                        <use xlink:href="/static/img/sprite.svg#close"></use>
+                        <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
                     </svg>
                 </button>
             </div>
diff --git a/backend/audit/templates/audit/submission-progress.html b/backend/audit/templates/audit/submission-progress.html
index a2ea92db9e..aa1918693b 100644
--- a/backend/audit/templates/audit/submission-progress.html
+++ b/backend/audit/templates/audit/submission-progress.html
@@ -58,7 +58,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							aria-hidden="true"
 							focusable="false"
 							role="img">
-						<use xlink:href="/static/img/sprite.svg#person_add"></use>
+						<use xlink:href="{% static 'img/sprite.svg#person_add' %}"></use>
 					</svg>
 					<span class="padding-top-05">Manage report access</span>
 				</button>
@@ -69,7 +69,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 			<li class="usa-icon-list__item padding-bottom-2">
 				<div class="usa-icon-list__icon text-green">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-						<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+						<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 					</svg>
 				</div>
 				<div class="usa-icon-list__content {% if single_audit_checklist.created is True %}text-green{% endif %}">
@@ -99,13 +99,13 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				{% if federal_awards_workbook.completed == True %}
 					<div class="usa-icon-list__icon text-green">
 						<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						</svg>
 					</div>
 				{% else %}
 					<div class="usa-icon-list__icon text-base">
 						<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						</svg>
 					</div>
 				{% endif %}
@@ -121,7 +121,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 			<li class="usa-icon-list__item padding-bottom-2">
 				<div class="usa-icon-list__icon text-base">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-						<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+						<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 					</svg>
 				</div>
 				<div class="usa-icon-list__content {% if single_audit_checklist.completed is True %} text-green {% else %} text-base-dark {% endif %}">
@@ -134,9 +134,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if audit_findings_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if audit_findings_workbook.completed == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -151,9 +151,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if findings_text_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if findings_text_workbook.completed == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -168,9 +168,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if CAP_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if CAP_workbook.completed == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -185,9 +185,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if additional_UEIs_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if additional_UEIs_workbook.completed == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -202,9 +202,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if secondary_auditors_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if secondary_auditors_workbook.completed == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -227,9 +227,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if audit_report.completed == True %} text-green {% else %} text-base {% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if audit_report.completed == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -245,9 +245,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if certification.auditor_certified == True %} text-green {% else %} text-base {% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if certification.auditor_certified == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -257,7 +257,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							href="{% url 'audit:AuditorCertification' report_id=report_id %}">Auditor Certification</a>
 					{% else %}
 						<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
-							<use xlink:href="/static/img/sprite.svg#lock_outline"></use>
+							<use xlink:href="{% static 'img/sprite.svg#lock_outline' %}"></use>
 						</svg>
 						<span class="text-base">Auditor Certification</span>
 					{% endif %}
@@ -271,9 +271,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if certification.auditee_certified == True %} text-green {% else %} text-base {% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if certification.auditee_certified == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -283,7 +283,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							href="{% url 'audit:AuditeeCertification' report_id=report_id %}">Auditee Certification</a>
 					{% else %}
 						<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
-							<use xlink:href="/static/img/sprite.svg#lock_outline"></use>
+							<use xlink:href="{% static 'img/sprite.svg#lock_outline' %}"></use>
 						</svg>
 						<span class="text-base">Auditee Certification</span>
 					{% endif %}
@@ -297,9 +297,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if submission.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if submission.completed == True %}
-							<use xlink:href="/static/img/sprite.svg#check_circle"></use>
+							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
 						{% else %}
-							<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
+							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -309,7 +309,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							href="{% url 'audit:Submission' report_id=report_id %}">Submit to FAC for processing</a>
 					{% else %}
 						<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
-							<use xlink:href="/static/img/sprite.svg#lock_outline"></use>
+							<use xlink:href="{% static 'img/sprite.svg#lock_outline' %}"></use>
 						</svg>
 						<span class="text-base">Submit to FAC for processing</span>
 					{% endif %}
diff --git a/backend/report_submission/templates/cancel-button.html b/backend/report_submission/templates/cancel-button.html
index 0a52eb41e9..b4a7b69cb7 100644
--- a/backend/report_submission/templates/cancel-button.html
+++ b/backend/report_submission/templates/cancel-button.html
@@ -1,4 +1,5 @@
 <!-- Cancel submission button. Opens a confirmation modal which when accepted, moves the user to the home page. -->
+{% load static %}
 <a class="usa-button usa-button--outline"
    aria-controls="modal-cancel"
    data-open-modal>Cancel</a>
@@ -31,7 +32,7 @@ <h2 class="usa-modal__heading" id="modal-cancel-heading">Cancel audit submission
                 aria-label="Close this window"
                 data-close-modal>
             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                <use xlink:href="/static/img/sprite.svg#close"></use>
+                <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
             </svg>
         </button>
     </div>
diff --git a/backend/report_submission/templates/report_submission/step-2.html b/backend/report_submission/templates/report_submission/step-2.html
index b4136ea0be..106c7cd58a 100644
--- a/backend/report_submission/templates/report_submission/step-2.html
+++ b/backend/report_submission/templates/report_submission/step-2.html
@@ -18,7 +18,7 @@
                     <div id="no-uei-warning" hidden>
                         <h2>
                             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                                <use xlink:href="/static/img/sprite.svg#error_outline"></use>
+                                <use xlink:href="{% static 'img/sprite.svg#error_outline' %}"></use>
                             </svg>
                             Your UEI was not confirmed
                         </h2>
@@ -184,7 +184,7 @@ <h2 class="usa-modal__heading" id="uei-search-result-heading"></h2>
                 aria-label="Close this window"
                 data-close-modal>
             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                <use xlink:href="/static/img/sprite.svg#close"></use>
+                <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
             </svg>
         </button>
     </div>
diff --git a/backend/report_submission/templates/report_submission/step-3.html b/backend/report_submission/templates/report_submission/step-3.html
index 715fa3b2f9..2a2f6eb6c1 100644
--- a/backend/report_submission/templates/report_submission/step-3.html
+++ b/backend/report_submission/templates/report_submission/step-3.html
@@ -244,7 +244,7 @@
                                             aria-label="Delete contact"
                                             title="Delete contact">
                                         <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                                            <use xlink:href="/static/img/sprite.svg#cancel"></use>
+                                            <use xlink:href="{% static 'img/sprite.svg#cancel' %}"></use>
                                         </svg>
                                     </button>
                                 </template>
@@ -349,7 +349,7 @@
                                                 aria-label="Delete contact"
                                                 title="Delete contact">
                                             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                                                <use xlink:href="/static/img/sprite.svg#cancel"></use>
+                                                <use xlink:href="{% static 'img/sprite.svg#cancel' %}"></use>
                                             </svg>
                                         </button>
                                     </template>
diff --git a/backend/templates/includes/nav_primary.html b/backend/templates/includes/nav_primary.html
index ce8cc8e204..1196f8d845 100644
--- a/backend/templates/includes/nav_primary.html
+++ b/backend/templates/includes/nav_primary.html
@@ -47,7 +47,7 @@
             <form action="/openid/logout" class="sign-out">
                 <button class="usa-button usa-button--unstyled">
                     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                        <use xlink:href="/static/img/sprite.svg#logout"></use>
+                        <use xlink:href="{% static 'img/sprite.svg#logout' %}"></use>
                     </svg>
                     <span>Sign out</span>
                     {% if request.user.first_name == '' %}

From 6a2bea6bb8dbf326130ec1730c354aa9697928a2 Mon Sep 17 00:00:00 2001
From: Tadhg O'Higgins <2626258+tadhg-ohiggins@users.noreply.github.com>
Date: Tue, 27 Jun 2023 13:38:10 -0700
Subject: [PATCH 3/5] Add quotation marks for self for fonts for CSP. (#1347)

---
 backend/config/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/config/settings.py b/backend/config/settings.py
index 9ea8ff465c..3150eb57f9 100644
--- a/backend/config/settings.py
+++ b/backend/config/settings.py
@@ -302,7 +302,7 @@
     CSP_IMG_SRC = allowed_sources
     CSP_MEDIA_SRC = allowed_sources
     CSP_FRAME_SRC = allowed_sources
-    CSP_FONT_SRC = ("self", bucket)
+    CSP_FONT_SRC = ("'self'", bucket)
     CSP_WORKER_SRC = allowed_sources
     CSP_FRAME_ANCESTORS = allowed_sources
     CSP_STYLE_SRC = allowed_sources

From ba4301283aa9b2941e0ff52e01b55ecd304fea7e Mon Sep 17 00:00:00 2001
From: Tadhg O'Higgins <2626258+tadhg-ohiggins@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:49:56 -0700
Subject: [PATCH 4/5] Put the hash symbol outside the Django call so it doesn't
 get escaped. (#1353)

---
 .../audit/templates/audit/my_submissions.html |  4 +-
 .../templates/audit/submission-progress.html  | 52 +++++++++----------
 .../templates/cancel-button.html              |  2 +-
 .../templates/report_submission/step-2.html   |  4 +-
 .../templates/report_submission/step-3.html   |  4 +-
 backend/templates/includes/nav_primary.html   |  4 +-
 6 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/backend/audit/templates/audit/my_submissions.html b/backend/audit/templates/audit/my_submissions.html
index 2dba4aed83..99423ce15a 100644
--- a/backend/audit/templates/audit/my_submissions.html
+++ b/backend/audit/templates/audit/my_submissions.html
@@ -94,7 +94,7 @@ <h2 class="usa-modal__heading" id="modal-uei-info-heading">What is a Unique Enti
                         aria-label="Close this window"
                         data-close-modal>
                     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                        <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
+                        <use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
                     </svg>
                 </button>
             </div>
@@ -150,7 +150,7 @@ <h2 class="usa-modal__heading" id="modal-terms-conditions-heading">
                         aria-label="Close this window"
                         data-close-modal>
                     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                        <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
+                        <use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
                     </svg>
                 </button>
             </div>
diff --git a/backend/audit/templates/audit/submission-progress.html b/backend/audit/templates/audit/submission-progress.html
index aa1918693b..2e5f529a34 100644
--- a/backend/audit/templates/audit/submission-progress.html
+++ b/backend/audit/templates/audit/submission-progress.html
@@ -58,7 +58,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							aria-hidden="true"
 							focusable="false"
 							role="img">
-						<use xlink:href="{% static 'img/sprite.svg#person_add' %}"></use>
+						<use xlink:href="{% static 'img/sprite.svg'%}#person_add"></use>
 					</svg>
 					<span class="padding-top-05">Manage report access</span>
 				</button>
@@ -69,7 +69,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 			<li class="usa-icon-list__item padding-bottom-2">
 				<div class="usa-icon-list__icon text-green">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-						<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+						<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 					</svg>
 				</div>
 				<div class="usa-icon-list__content {% if single_audit_checklist.created is True %}text-green{% endif %}">
@@ -99,13 +99,13 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				{% if federal_awards_workbook.completed == True %}
 					<div class="usa-icon-list__icon text-green">
 						<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						</svg>
 					</div>
 				{% else %}
 					<div class="usa-icon-list__icon text-base">
 						<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						</svg>
 					</div>
 				{% endif %}
@@ -121,7 +121,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 			<li class="usa-icon-list__item padding-bottom-2">
 				<div class="usa-icon-list__icon text-base">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
-						<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+						<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 					</svg>
 				</div>
 				<div class="usa-icon-list__content {% if single_audit_checklist.completed is True %} text-green {% else %} text-base-dark {% endif %}">
@@ -134,9 +134,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if audit_findings_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if audit_findings_workbook.completed == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -151,9 +151,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if findings_text_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if findings_text_workbook.completed == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -168,9 +168,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if CAP_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if CAP_workbook.completed == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -185,9 +185,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if additional_UEIs_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if additional_UEIs_workbook.completed == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -202,9 +202,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if secondary_auditors_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if secondary_auditors_workbook.completed == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -227,9 +227,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if audit_report.completed == True %} text-green {% else %} text-base {% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if audit_report.completed == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -245,9 +245,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if certification.auditor_certified == True %} text-green {% else %} text-base {% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if certification.auditor_certified == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -257,7 +257,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							href="{% url 'audit:AuditorCertification' report_id=report_id %}">Auditor Certification</a>
 					{% else %}
 						<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
-							<use xlink:href="{% static 'img/sprite.svg#lock_outline' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#lock_outline"></use>
 						</svg>
 						<span class="text-base">Auditor Certification</span>
 					{% endif %}
@@ -271,9 +271,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if certification.auditee_certified == True %} text-green {% else %} text-base {% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if certification.auditee_certified == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -283,7 +283,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							href="{% url 'audit:AuditeeCertification' report_id=report_id %}">Auditee Certification</a>
 					{% else %}
 						<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
-							<use xlink:href="{% static 'img/sprite.svg#lock_outline' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#lock_outline"></use>
 						</svg>
 						<span class="text-base">Auditee Certification</span>
 					{% endif %}
@@ -297,9 +297,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 				<div class="usa-icon-list__icon {% if submission.completed == True %}text-green{% else %}text-base{% endif %}">
 					<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
 						{% if submission.completed == True %}
-							<use xlink:href="{% static 'img/sprite.svg#check_circle' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
 						{% else %}
-							<use xlink:href="{% static 'img/sprite.svg#radio_button_unchecked' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
 						{% endif %}
 					</svg>
 				</div>
@@ -309,7 +309,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
 							href="{% url 'audit:Submission' report_id=report_id %}">Submit to FAC for processing</a>
 					{% else %}
 						<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
-							<use xlink:href="{% static 'img/sprite.svg#lock_outline' %}"></use>
+							<use xlink:href="{% static 'img/sprite.svg'%}#lock_outline"></use>
 						</svg>
 						<span class="text-base">Submit to FAC for processing</span>
 					{% endif %}
diff --git a/backend/report_submission/templates/cancel-button.html b/backend/report_submission/templates/cancel-button.html
index b4a7b69cb7..9864e7ecbf 100644
--- a/backend/report_submission/templates/cancel-button.html
+++ b/backend/report_submission/templates/cancel-button.html
@@ -32,7 +32,7 @@ <h2 class="usa-modal__heading" id="modal-cancel-heading">Cancel audit submission
                 aria-label="Close this window"
                 data-close-modal>
             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
+                <use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
             </svg>
         </button>
     </div>
diff --git a/backend/report_submission/templates/report_submission/step-2.html b/backend/report_submission/templates/report_submission/step-2.html
index 106c7cd58a..33db2af464 100644
--- a/backend/report_submission/templates/report_submission/step-2.html
+++ b/backend/report_submission/templates/report_submission/step-2.html
@@ -18,7 +18,7 @@
                     <div id="no-uei-warning" hidden>
                         <h2>
                             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                                <use xlink:href="{% static 'img/sprite.svg#error_outline' %}"></use>
+                                <use xlink:href="{% static 'img/sprite.svg'%}#error_outline"></use>
                             </svg>
                             Your UEI was not confirmed
                         </h2>
@@ -184,7 +184,7 @@ <h2 class="usa-modal__heading" id="uei-search-result-heading"></h2>
                 aria-label="Close this window"
                 data-close-modal>
             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
+                <use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
             </svg>
         </button>
     </div>
diff --git a/backend/report_submission/templates/report_submission/step-3.html b/backend/report_submission/templates/report_submission/step-3.html
index 2a2f6eb6c1..05ac751bbe 100644
--- a/backend/report_submission/templates/report_submission/step-3.html
+++ b/backend/report_submission/templates/report_submission/step-3.html
@@ -244,7 +244,7 @@
                                             aria-label="Delete contact"
                                             title="Delete contact">
                                         <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                                            <use xlink:href="{% static 'img/sprite.svg#cancel' %}"></use>
+                                            <use xlink:href="{% static 'img/sprite.svg'%}#cancel"></use>
                                         </svg>
                                     </button>
                                 </template>
@@ -349,7 +349,7 @@
                                                 aria-label="Delete contact"
                                                 title="Delete contact">
                                             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                                                <use xlink:href="{% static 'img/sprite.svg#cancel' %}"></use>
+                                                <use xlink:href="{% static 'img/sprite.svg'%}#cancel"></use>
                                             </svg>
                                         </button>
                                     </template>
diff --git a/backend/templates/includes/nav_primary.html b/backend/templates/includes/nav_primary.html
index 1196f8d845..69740ef5a7 100644
--- a/backend/templates/includes/nav_primary.html
+++ b/backend/templates/includes/nav_primary.html
@@ -47,7 +47,7 @@
             <form action="/openid/logout" class="sign-out">
                 <button class="usa-button usa-button--unstyled">
                     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                        <use xlink:href="{% static 'img/sprite.svg#logout' %}"></use>
+                        <use xlink:href="{% static 'img/sprite.svg'%}#logout"></use>
                     </svg>
                     <span>Sign out</span>
                     {% if request.user.first_name == '' %}
@@ -105,7 +105,7 @@ <h2 class="usa-modal__heading" id="login-modal-heading">You must log in to conti
                                     aria-label="Close this window"
                                     data-close-modal>
                                 <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                                    <use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
+                                    <use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
                                 </svg>
                             </button>
                         </div>

From 8ffb3283bb0f5d26d479317dd915ca2d75415360 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Tue, 27 Jun 2023 12:49:48 -1000
Subject: [PATCH 5/5] Add territories to state validation

---
 .../output/sections/GeneralInformation.schema.json     |  9 +++++++++
 backend/schemas/source/base/Base.libsonnet             | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/backend/schemas/output/sections/GeneralInformation.schema.json b/backend/schemas/output/sections/GeneralInformation.schema.json
index f8b2e75f1f..e6b4001e2f 100644
--- a/backend/schemas/output/sections/GeneralInformation.schema.json
+++ b/backend/schemas/output/sections/GeneralInformation.schema.json
@@ -25,14 +25,18 @@
          "enum": [
             "AL",
             "AK",
+            "AS",
             "AZ",
             "AR",
             "CA",
             "CO",
             "CT",
             "DE",
+            "DC",
+            "FM",
             "FL",
             "GA",
+            "GU",
             "HI",
             "ID",
             "IL",
@@ -42,6 +46,7 @@
             "KY",
             "LA",
             "ME",
+            "MH",
             "MD",
             "MA",
             "MI",
@@ -57,10 +62,13 @@
             "NY",
             "NC",
             "ND",
+            "MP",
             "OH",
             "OK",
             "OR",
+            "PW",
             "PA",
+            "PR",
             "RI",
             "SC",
             "SD",
@@ -68,6 +76,7 @@
             "TX",
             "UT",
             "VT",
+            "VI",
             "VA",
             "WA",
             "WV",
diff --git a/backend/schemas/source/base/Base.libsonnet b/backend/schemas/source/base/Base.libsonnet
index efb306624d..46ef59b3fd 100644
--- a/backend/schemas/source/base/Base.libsonnet
+++ b/backend/schemas/source/base/Base.libsonnet
@@ -126,18 +126,23 @@ local Enum = {
     ],
     title: 'EmptyString_EmptyArray_Null',
   },
+  // Source: https://pe.usps.com/text/pub28/28apb.htm
   UnitedStatesStateAbbr: Types.string {
     enum: [
       'AL',
       'AK',
+      'AS',
       'AZ',
       'AR',
       'CA',
       'CO',
       'CT',
       'DE',
+      'DC',
+      'FM',
       'FL',
       'GA',
+      'GU',
       'HI',
       'ID',
       'IL',
@@ -147,6 +152,7 @@ local Enum = {
       'KY',
       'LA',
       'ME',
+      'MH',
       'MD',
       'MA',
       'MI',
@@ -162,10 +168,13 @@ local Enum = {
       'NY',
       'NC',
       'ND',
+      'MP',
       'OH',
       'OK',
       'OR',
+      'PW',
       'PA',
+      'PR',
       'RI',
       'SC',
       'SD',
@@ -173,6 +182,7 @@ local Enum = {
       'TX',
       'UT',
       'VT',
+      'VI',
       'VA',
       'WA',
       'WV',