From b717eee2f4b751ea767610c1492be5b50c421b6a Mon Sep 17 00:00:00 2001
From: Cory Francis Myers <cory@freedom.press>
Date: Thu, 27 Jan 2022 15:25:50 -0800
Subject: [PATCH 1/2] adds ARIA-{INVALID,DESCRIBEDBY} annotations for WTForms
 validation errors

---
 .../journalist_templates/admin_add_user.html  | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/securedrop/journalist_templates/admin_add_user.html b/securedrop/journalist_templates/admin_add_user.html
index 930578b44b..47cce415ec 100644
--- a/securedrop/journalist_templates/admin_add_user.html
+++ b/securedrop/journalist_templates/admin_add_user.html
@@ -11,10 +11,16 @@ <h1 id="add-user-heading">Add User</h1>
     <div class="container flex-end">
       <div>
         <label for="username">{{ gettext('Username') }}</label>
-        {{ form.username() }}
+        {% set aria_attributes = {} %}
+        {% if form.username.errors %}
+        {% set _dummy = aria_attributes.update({'aria-describedby': 'username-errors', 'aria-invalid': 'true'}) %}
+        {% endif %}
+        {{ form.username(**aria_attributes) }}
+        <span id="username-errors">
         {% for error in form.username.errors %}
         <span class="form-validation-error" role="alert">{{ error }}</span>
         {% endfor %}
+        </span>
       </div>
       <div>
         <ul id="username-notes" class="journalist-username__notes">
@@ -26,17 +32,29 @@ <h1 id="add-user-heading">Add User</h1>
     <div class="container flex-end">
       <div>
         <label for="first_name">{{ gettext('First name') }}</label>
-        {{ form.first_name() }}
+        {% set aria_attributes = {} %}
+        {% if form.first_name.errors %}
+        {% set _dummy = aria_attributes.update({'aria-describedby': 'first-name-errors', 'aria-invalid': 'true'}) %}
+        {% endif %}
+        {{ form.first_name(**aria_attributes) }}
+        <span id="first-name-errors">
         {% for error in form.first_name.errors %}
         <span class="form-validation-error" role="alert">{{ error }}</span>
         {% endfor %}
+        </span>
       </div>
       <div>
         <label for="last_name">{{ gettext('Last name') }}</label>
-        {{ form.last_name() }}
+        {% set aria_attributes = {} %}
+        {% if form.last_name.errors %}
+        {% set _dummy = aria_attributes.update({'aria-describedby': 'last-name-errors', 'aria-invalid': 'true'}) %}
+        {% endif %}
+        {{ form.last_name(**aria_attributes) }}
+        <span id="last-name-errors">
         {% for error in form.last_name.errors %}
         <span class="form-validation-error" role="alert">{{ error }}</span>
         {% endfor %}
+        </span>
       </div>
       <div>
         <ul id="name-notes" class="journalist-username__notes">
@@ -46,20 +64,32 @@ <h1 id="add-user-heading">Add User</h1>
     </div>
     <p>{{ gettext("The user's password will be:") }} <mark class="password" id="password">{{ password }}</mark></p>
     <div>
-      {{ form.is_admin(id="is-admin") }}
+      {% set aria_attributes = {} %}
+      {% if form.is_admin.errors %}
+      {% set _dummy = aria_attributes.update({'aria-describedby': 'is-admin-errors', 'aria-invalid': 'true'}) %}
+      {% endif %}
+      {{ form.is_admin(id="is-admin", **aria_attributes) }}
       <label for="is-admin">{{ gettext('Is Admin') }}</label>
+      <span id="is-admin-errors">
       {% for error in form.is_admin.errors %}
       <span class="form-validation-error" role="alert">{{ error }}</span>
       {% endfor %}
+      </span>
     </div>
     <div>
-      {{ form.is_hotp(id="is-hotp") }}
+      {% set aria_attributes = {} %}
+      {% if form.is_hotp.errors or form.otp_secret.errors %}
+      {% set _dummy = aria_attributes.update({'aria-describedby': 'otp-errors', 'aria-invalid': 'true'}) %}
+      {% endif %}
+      {{ form.is_hotp(id="is-hotp", **aria_attributes) }}
       <label for="is-hotp">{{ gettext("Is using a YubiKey [HOTP]") }} </label>
       <label for="otp_secret" class="visually-hidden">{{ gettext('HOTP Secret') }}</label>
-      {{ form.otp_secret(placeholder=gettext('HOTP Secret'), size="60") }}
+      {{ form.otp_secret(placeholder=gettext('HOTP Secret'), size="60", **aria_attributes) }}
+      <span id="otp-errors">
       {% for error in form.is_hotp.errors + form.otp_secret.errors %}
-      <span class="form-validation-error" role="alert">{{ error }}</span><br>
+      <span class="form-validation-error" role="alert">{{ error }}</span>
       {% endfor %}
+      </span>
     </div>
     <button type="submit" class="icon icon-plus" aria-label="{{ gettext('Add User') }}">
       {{ gettext('ADD USER') }}

From d72e0dc724f8d85e099215f34ac8f1f2d4afe94c Mon Sep 17 00:00:00 2001
From: Cory Francis Myers <cory@freedom.press>
Date: Wed, 2 Mar 2022 11:05:46 -0800
Subject: [PATCH 2/2] refactors "set _dummy" expressions with jina2.ext.do

thread: https://github.com/freedomofpress/securedrop/pull/6240#discussion_r810320511
---
 securedrop/journalist_app/__init__.py               |  1 +
 securedrop/journalist_templates/admin_add_user.html | 10 +++++-----
 securedrop/source_app/__init__.py                   |  1 +
 securedrop/source_templates/login.html              |  4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/securedrop/journalist_app/__init__.py b/securedrop/journalist_app/__init__.py
index ed13499673..173851b998 100644
--- a/securedrop/journalist_app/__init__.py
+++ b/securedrop/journalist_app/__init__.py
@@ -105,6 +105,7 @@ def _handle_http_exception(
     app.jinja_env.filters['filesizeformat'] = template_filters.filesizeformat
     app.jinja_env.filters['html_datetime_format'] = \
         template_filters.html_datetime_format
+    app.jinja_env.add_extension('jinja2.ext.do')
 
     @app.before_first_request
     def expire_blacklisted_tokens() -> None:
diff --git a/securedrop/journalist_templates/admin_add_user.html b/securedrop/journalist_templates/admin_add_user.html
index 47cce415ec..4e3e14113c 100644
--- a/securedrop/journalist_templates/admin_add_user.html
+++ b/securedrop/journalist_templates/admin_add_user.html
@@ -13,7 +13,7 @@ <h1 id="add-user-heading">Add User</h1>
         <label for="username">{{ gettext('Username') }}</label>
         {% set aria_attributes = {} %}
         {% if form.username.errors %}
-        {% set _dummy = aria_attributes.update({'aria-describedby': 'username-errors', 'aria-invalid': 'true'}) %}
+        {% do aria_attributes.update({'aria-describedby': 'username-errors', 'aria-invalid': 'true'}) %}
         {% endif %}
         {{ form.username(**aria_attributes) }}
         <span id="username-errors">
@@ -34,7 +34,7 @@ <h1 id="add-user-heading">Add User</h1>
         <label for="first_name">{{ gettext('First name') }}</label>
         {% set aria_attributes = {} %}
         {% if form.first_name.errors %}
-        {% set _dummy = aria_attributes.update({'aria-describedby': 'first-name-errors', 'aria-invalid': 'true'}) %}
+        {% do aria_attributes.update({'aria-describedby': 'first-name-errors', 'aria-invalid': 'true'}) %}
         {% endif %}
         {{ form.first_name(**aria_attributes) }}
         <span id="first-name-errors">
@@ -47,7 +47,7 @@ <h1 id="add-user-heading">Add User</h1>
         <label for="last_name">{{ gettext('Last name') }}</label>
         {% set aria_attributes = {} %}
         {% if form.last_name.errors %}
-        {% set _dummy = aria_attributes.update({'aria-describedby': 'last-name-errors', 'aria-invalid': 'true'}) %}
+        {% do aria_attributes.update({'aria-describedby': 'last-name-errors', 'aria-invalid': 'true'}) %}
         {% endif %}
         {{ form.last_name(**aria_attributes) }}
         <span id="last-name-errors">
@@ -66,7 +66,7 @@ <h1 id="add-user-heading">Add User</h1>
     <div>
       {% set aria_attributes = {} %}
       {% if form.is_admin.errors %}
-      {% set _dummy = aria_attributes.update({'aria-describedby': 'is-admin-errors', 'aria-invalid': 'true'}) %}
+      {% do aria_attributes.update({'aria-describedby': 'is-admin-errors', 'aria-invalid': 'true'}) %}
       {% endif %}
       {{ form.is_admin(id="is-admin", **aria_attributes) }}
       <label for="is-admin">{{ gettext('Is Admin') }}</label>
@@ -79,7 +79,7 @@ <h1 id="add-user-heading">Add User</h1>
     <div>
       {% set aria_attributes = {} %}
       {% if form.is_hotp.errors or form.otp_secret.errors %}
-      {% set _dummy = aria_attributes.update({'aria-describedby': 'otp-errors', 'aria-invalid': 'true'}) %}
+      {% do aria_attributes.update({'aria-describedby': 'otp-errors', 'aria-invalid': 'true'}) %}
       {% endif %}
       {{ form.is_hotp(id="is-hotp", **aria_attributes) }}
       <label for="is-hotp">{{ gettext("Is using a YubiKey [HOTP]") }} </label>
diff --git a/securedrop/source_app/__init__.py b/securedrop/source_app/__init__.py
index 2ee4af0f19..a9bac011f1 100644
--- a/securedrop/source_app/__init__.py
+++ b/securedrop/source_app/__init__.py
@@ -85,6 +85,7 @@ def handle_csrf_error(e: CSRFError) -> werkzeug.Response:
     app.jinja_env.filters['filesizeformat'] = template_filters.filesizeformat
     app.jinja_env.filters['html_datetime_format'] = \
         template_filters.html_datetime_format
+    app.jinja_env.add_extension('jinja2.ext.do')
 
     for module in [main, info, api]:
         app.register_blueprint(module.make_blueprint(config))  # type: ignore
diff --git a/securedrop/source_templates/login.html b/securedrop/source_templates/login.html
index 2fd636f60f..cbc313301c 100644
--- a/securedrop/source_templates/login.html
+++ b/securedrop/source_templates/login.html
@@ -11,7 +11,7 @@ <h1>{{ gettext('Enter Codename') }}</h1>
   <div class="center">
     {% set aria_attributes = {'aria-label': gettext('Enter your codename'), 'aria-required': 'true'} %}
     {% if form.codename.errors %}
-    {% set _dummy = aria_attributes.update({'aria-describedby': 'flashed login-with-existing-code-name-errors', 'aria-invalid': 'true'}) %}
+    {% do aria_attributes.update({'aria-describedby': 'flashed login-with-existing-code-name-errors', 'aria-invalid': 'true'}) %}
     {% endif %}
     {{ form.codename(id='login-with-existing-codename', class='codename-box', autocomplete='off', placeholder=gettext('Enter your codename'), autofocus=True, **aria_attributes) }}
     {% if form.codename.errors %}
@@ -32,4 +32,4 @@ <h1>{{ gettext('Enter Codename') }}</h1>
   </div>
 
 </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}