Merge branch 'main' into 2171-clean-up-titles

2026-08-02 20:59:39 -04:00 · 2025-02-19 09:05:16 -08:00
parent 2d896daa0e 5b46a4e1d7
commit ad1f83e80e
29 changed files with 587 additions and 371 deletions
--- a/.ds.baseline
+++ b/.ds.baseline
@@ -684,5 +684,5 @@
      }
    ]
  },
-  "generated_at": "2025-01-16T16:38:48Z"
+  "generated_at": "2025-02-03T17:01:06Z"
 }
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -38,10 +38,10 @@ jobs:
          output: report-markdown
          annotations: failed-tests
          prnumber: ${{ steps.findPr.outputs.number }}
-      - name: Run style checks
-        run: poetry run flake8 .
      - name: Check imports alphabetized
        run: poetry run isort --check-only ./app ./tests
+      - name: Run style checks
+        run: poetry run flake8 .
      - name: Check dead code
        run: make dead-code
      - name: Run js tests
@@ -165,8 +165,9 @@ jobs:
        run: make run-flask &
        env:
          NOTIFY_ENVIRONMENT: scanning
+          FEATURE_ABOUT_PAGE_ENABLED: true
      - name: Run OWASP Baseline Scan
-        uses: zaproxy/action-baseline@v0.9.0
+        uses: zaproxy/action-baseline@v0.14.0
        with:
          docker_name: "ghcr.io/zaproxy/zaproxy:weekly"
          target: "http://localhost:6012"
--- a/.github/workflows/daily_checks.yml
+++ b/.github/workflows/daily_checks.yml
@@ -50,7 +50,7 @@ jobs:
        env:
          NOTIFY_ENVIRONMENT: scanning
      - name: Run OWASP Full Scan
-        uses: zaproxy/action-full-scan@v0.7.0
+        uses: zaproxy/action-full-scan@v0.12.0
        with:
          docker_name: 'ghcr.io/zaproxy/zaproxy:weekly'
          target: 'http://localhost:6012'
--- a/7
+++ b/7
@@ -62,6 +62,13 @@ py-lint: ## Run python linting scanners and black
 	poetry run flake8 .
 	poetry run isort --check-only ./app ./tests

+.PHONY: tada
+tada: ## Run python linting scanners and black
+	poetry run isort ./app ./tests
+	poetry run black .
+	poetry run flake8 .
+
+
 .PHONY: avg-complexity
 avg-complexity:
 	echo "*** Shows average complexity in radon of all code ***"
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -1024,3 +1024,7 @@ nav.nav {
  font-size: units(3);
  font-weight: bold;
 }
+
+.form-control-error {
+  border: 4px solid #b10e1e
+}
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -401,7 +401,9 @@ def get_job_partials(job):
    )

    if request.referrer is not None:
-        session["arrived_from_preview_page"] = ("check" in request.referrer) or ("help=0" in request.referrer)
+        session["arrived_from_preview_page"] = ("check" in request.referrer) or (
+            "help=0" in request.referrer
+        )
    else:
        session["arrived_from_preview_page"] = False

--- a/app/main/views/platform_admin.py
+++ b/app/main/views/platform_admin.py
@@ -116,6 +116,70 @@ def download_all_users():
    return response


+@main.route("/platform-admin/get-redis-report")
+@user_is_platform_admin
+def get_redis_report():
+
+    memory_info = redis_client.info("memory")
+    memory_used = memory_info.get("used_memory_human", "N/A")
+    max_memory = memory_info.get("maxmemory_human", "N/A")
+    if max_memory == "0B":
+        max_memory = "No set limit"
+    mem_fragmentation = memory_info.get("mem_fragmentation_ratio", "N/A")
+    frag_quality = "Swapping (bad)"
+    if mem_fragmentation >= 1.0:
+        frag_quality = "Healthy"
+    if mem_fragmentation > 1.5:
+        frag_quality = "Problematic"
+    if mem_fragmentation > 2.0:
+        frag_quality = "Severe fragmentation"
+
+    frag_note = ""
+    if mem_fragmentation > 2.0:
+        frag_note = "Use MEMORY PURGE.\nReplace multiple small keys with hashes.\nAvoid long keys.\nSet max_memory."
+    elif mem_fragmentation < 1.0:
+        frag_note = "Allocate more RAM.\nSet max_memory."
+
+    keys = redis_client.keys("*")
+    key_details = []
+
+    for key in keys:
+        key_type = redis_client.type(key).decode("utf-8")
+        ttl = redis_client.ttl(key)
+        ttl_str = "No Expiry" if ttl == -1 else f"{ttl} seconds"
+        key_details.append(
+            {"Key": key.decode("utf-8"), "Type": key_type, "TTL": ttl_str}
+        )
+    output = StringIO()
+    writer = csv.writer(
+        output,
+    )
+    writer.writerow(["Redis Report"])
+    writer.writerow([])
+
+    writer.writerow(["Memory"])
+    writer.writerow(["", "Memory Used", memory_used])
+    writer.writerow(["", "Max Memory", max_memory])
+    writer.writerow(["", "Memory Fragmentation Ratio", mem_fragmentation])
+    writer.writerow(["", "Memory Fragmentation Quality", frag_quality, frag_note])
+    writer.writerow([])
+
+    writer.writerow(["Keys Overview"])
+    writer.writerow(["", "TTL", "Type", "Key"])
+    for key_detail in key_details:
+        writer.writerow(
+            ["", key_detail["TTL"], key_detail["Type"], key_detail["Key"][0:50]]
+        )
+
+    csv_data = output.getvalue()
+
+    # Create a direct download response with the CSV data and appropriate headers
+    response = Response(csv_data, content_type="text/csv; charset=utf-8")
+    response.headers["Content-Disposition"] = "attachment; filename=redis.csv"
+
+    return response
+
+
 def is_over_threshold(number, total, threshold):
    percentage = number / total * 100 if total else 0
    return percentage > threshold
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -68,11 +68,12 @@ def _get_access_token(code):  # pragma: no cover
    id_token = get_id_token(response_json)
    nonce = id_token["nonce"]
    nonce_key = f"login-nonce-{unquote(nonce)}"
-    stored_nonce = redis_client.get(nonce_key).decode("utf8")
+    if not os.getenv("NOTIFY_ENVIRONMENT") == "development":
+        stored_nonce = redis_client.get(nonce_key).decode("utf8")

-    if nonce != stored_nonce:
-        current_app.logger.error(f"Nonce Error: {nonce} != {stored_nonce}")
-        abort(403)
+        if nonce != stored_nonce:
+            current_app.logger.error(f"Nonce Error: {nonce} != {stored_nonce}")
+            abort(403)

    try:
        access_token = response_json["access_token"]
@@ -112,7 +113,7 @@ def _do_login_dot_gov():  # $ pragma: no cover
        verify_key = f"login-verify_email-{unquote(state)}"
        verify_path = bool(redis_client.get(verify_key))

-        if not verify_path:
+        if not verify_path and not os.getenv("NOTIFY_ENVIRONMENT") == "development":
            state_key = f"login-state-{unquote(state)}"
            stored_state = unquote(redis_client.get(state_key).decode("utf8"))
            if state != stored_state:
--- a/app/notify_client/billing_api_client.py
+++ b/app/notify_client/billing_api_client.py
@@ -6,17 +6,36 @@ from app.notify_client import NotifyAdminAPIClient

 class BillingAPIClient(NotifyAdminAPIClient):
    def get_monthly_usage_for_service(self, service_id, year):
-        return self.get(
+        monthly_usage = redis_client.get(f"monthly-usage-summary-{service_id}-{year}")
+        if monthly_usage is not None:
+            return json.loads(monthly_usage.decode("utf-8"))
+        result = self.get(
            "/service/{0}/billing/monthly-usage".format(service_id),
            params=dict(year=year),
        )
+        redis_client.set(
+            f"monthly-usage-summary-{service_id}-{year}",
+            json.dumps(result),
+            ex=30,
+        )
+        return result

    def get_annual_usage_for_service(self, service_id, year=None):
-        return self.get(
+        annual_usage = redis_client.get(f"yearly-usage-summary-{service_id}-{year}")
+        if annual_usage is not None:
+            return json.loads(annual_usage.decode("utf-8"))
+        result = self.get(
            "/service/{0}/billing/yearly-usage-summary".format(service_id),
            params=dict(year=year),
        )

+        redis_client.set(
+            f"yearly-usage-summary-{service_id}-{year}",
+            json.dumps(result),
+            ex=30,
+        )
+        return result
+
    def get_free_sms_fragment_limit_for_year(self, service_id, year=None):
        frag_limit = redis_client.get(f"free-sms-fragment-limit-{service_id}-{year}")
        if frag_limit is not None:
@@ -48,13 +67,28 @@ class BillingAPIClient(NotifyAdminAPIClient):
        )

    def get_data_for_billing_report(self, start_date, end_date):
-        return self.get(
+        x_start_date = str(start_date)
+        x_start_date = x_start_date.replace(" ", "_")
+        x_end_date = str(end_date)
+        x_end_date = x_end_date.replace(" ", "_")
+        billing_data = redis_client.get(
+            f"get-data-for-billing-report-{x_start_date}-{x_end_date}"
+        )
+        if billing_data is not None:
+            return json.loads(billing_data.decode("utf-8"))
+        result = self.get(
            url="/platform-stats/data-for-billing-report",
            params={
                "start_date": str(start_date),
                "end_date": str(end_date),
            },
        )
+        redis_client.set(
+            f"get-data-for-billing-report-{x_start_date}-{x_end_date}",
+            json.dumps(result),
+            ex=30,
+        )
+        return result

    def get_data_for_volumes_by_service_report(self, start_date, end_date):
        return self.get(
--- a/app/notify_client/notification_api_client.py
+++ b/app/notify_client/notification_api_client.py
@@ -1,3 +1,6 @@
+import json
+
+from app.extensions import redis_client
 from app.notify_client import NotifyAdminAPIClient, _attach_current_user


@@ -41,7 +44,7 @@ class NotificationApiClient(NotifyAdminAPIClient):
        if job_id:
            return method(
                url="/service/{}/job/{}/notifications".format(service_id, job_id),
-                **kwargs
+                **kwargs,
            )
        else:
            if limit_days is not None:
@@ -96,9 +99,20 @@ class NotificationApiClient(NotifyAdminAPIClient):
        )

    def get_notification_count_for_job_id(self, *, service_id, job_id):
-        return self.get(
+        counts = redis_client.get(
+            f"notification-count-for-job-id-{service_id}-{job_id}"
+        )
+        if counts is not None:
+            return json.loads(counts.decode("utf-8"))
+        result = self.get(
            url="/service/{}/job/{}/notification_count".format(service_id, job_id)
-        )["count"]
+        )
+        redis_client.set(
+            f"notification-count-for-job-id-{service_id}-{job_id}",
+            json.dumps(result["count"]),
+            ex=30,
+        )
+        return result["count"]


 notification_api_client = NotificationApiClient()
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -14,10 +14,8 @@
    <script nonce="{{ csp_nonce() }}">document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
    {% block bodyStart %}
      {% block extra_javascripts_before_body %}
-      <!-- Google Tag Manager (noscript) -->
      <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WX5NGWF"
      height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-      <!-- End Google Tag Manager (noscript) -->
      {% endblock %}
    {% endblock %}

@@ -145,10 +143,8 @@
    {% block bodyEnd %}
      {% block extra_javascripts %}
      {% endblock %}
-      <!--[if gt IE 8]><!-->
      <script type="text/javascript" src="{{ asset_url('javascripts/all.js') }}"></script>
      <script type="text/javascript" src="{{ asset_url('js/uswds.min.js') }}"></script>
-      <!--<![endif]-->
    {% endblock %}
  </body>
 </html>
--- a/app/templates/components/components/input/template.njk
+++ b/app/templates/components/components/input/template.njk
@@ -34,7 +34,7 @@
    attributes: params.errorMessage.attributes,
    html: params.errorMessage.html,
    text: params.errorMessage.text,
-    visuallyHiddenText: params.errorMessage.visuallyHiddenText
+    visuallyHiddenText: params.errorMessage.visuallyHiddenText,
  }) | indent(2) | trim }}
 {% endif %}
  <input class="usa-input {%- if params.classes %} {{ params.classes }}{% endif %} {%- if params.errorMessage %} usa-input--error{% endif %}" id="{{ params.id }}" name="{{ params.name }}" type="{{ params.type | default('text') }}"
@@ -42,5 +42,7 @@
  {%- if describedBy %} aria-describedby="{{ describedBy }}"{% endif %}
  {%- if params.autocomplete %} autocomplete="{{ params.autocomplete}}"{% endif %}
  {%- if params.pattern %} pattern="{{ params.pattern }}"{% endif %}
-  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}>
+  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}
+  {%- if params.required %} required{% endif %}
+  />
 </div>
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -16,19 +16,9 @@
  placeholder=''
 ) %}
  <div
-    class="form-group{% if field.errors %} form-group-error{% endif %} {{ extra_form_group_classes }}"
+    class="usa-form-group{% if field.errors %} usa-form-group--error{% endif %} {{ extra_form_group_classes }}"
    data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}"
  >
-    {% if field.errors %}
-      <div class="usa-alert usa-alert--error edit-textbox-error-mt" role="alert">
-        <div class="usa-alert__body">
-          <h4 class="usa-alert__heading">Error message</h4>
-          <p class="usa-alert__text" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
-            {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
-          </p>
-        </div>
-      </div>
-    {% endif %}
    <label class="usa-label" for="{{ field.name }}">
      {% if label %}
        {{ label }}
@@ -41,6 +31,12 @@
        {{ hint }}
      </div>
    {% endif %}
+    {% if field.errors %}
+      <span id="{{ field.name}}-error" class="usa-error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}" tabindex="-1" aria-live="assertive" role="alert">
+        <span class="usa-sr-only">Error:</span>
+        {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
+      </span>
+    {% endif %}
    {%
      if highlight_placeholders or autosize
    %}
@@ -59,6 +55,8 @@
      data_highlight_placeholders='true' if highlight_placeholders else 'false',
      rows=rows|string,
      placeholder=placeholder,
+      aria_describedby=field.name+"-error",
+      required='required' if required else None,
      **kwargs
    ) }}
    {% if suffix %}
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -32,6 +32,8 @@
        <div class="tablet:grid-col-9 mobile-lg:grid-col-12">
          {{ form.name(param_extensions={
            "extra_form_group_classes": "margin-bottom-2",
+            "id": "name",
+            "required": True,
            "hint": {"text": "Your recipients will not see this"}
          }) }}
          {{ textbox(
@@ -41,7 +43,8 @@
            hint=content_hint,
            rows=5,
            extra_form_group_classes='margin-bottom-1',
-            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!'
+            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!',
+            required=True
          ) }}
          {% if current_user.platform_admin %}
            {{ form.process_type }}
--- a/app/templates/views/platform-admin/reports.html
+++ b/app/templates/views/platform-admin/reports.html
@@ -34,5 +34,8 @@
 <p>
  <a class="usa-link" href="{{ url_for('main.download_all_users') }}">Download All Users</a>
 </p>
+<p>
+  <a class="usa-link" href="{{ url_for('main.get_redis_report') }}">Get Redis Report</a>
+</p>

 {% endblock %}
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -37,8 +37,8 @@
    data_kwargs={'force-focus': True}
  ) %}
    <div class="grid-row">
-      <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}" aria-live="polite" role="alert">
-        {{ form.placeholder_value(param_extensions={"classes": ""}) }}
+      <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
+        {{ form.placeholder_value(param_extensions={"classes": "", "id": "phone-number"}) }}
      </div>
      {% if skip_link or link_to_upload %}
        <div class="grid-col-12 margin-top-1">
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -90,8 +90,4 @@
    {% endif %}
  </div>

-  <!--<div class="">
-    {{ copy_to_clipboard(template.id, name="Template ID", thing='template ID') }}
-  </div>-->
-
 {% endblock %}
--- a/application.py
+++ b/application.py
@@ -1,7 +1,10 @@
 from flask import Flask
+from werkzeug.serving import WSGIRequestHandler

 from app import create_app

+WSGIRequestHandler.version_string = lambda self: "SecureServer"
+
 application = Flask("app")

 create_app(application)
--- a/notifications_utils/clients/redis/redis_client.py
+++ b/notifications_utils/clients/redis/redis_client.py
@@ -149,6 +149,22 @@ class RedisClient:
            except Exception as e:
                self.__handle_exception(e, raise_exception, "incr", key)

+    def info(self, key):
+        if self.active:
+            return self.redis_store.info(key)
+
+    def keys(self, pattern):
+        if self.active:
+            return self.redis_store.keys(pattern)
+
+    def type(self, key):
+        if self.active:
+            return self.redis_store.type(key)
+
+    def ttl(self, key):
+        if self.active:
+            return self.redis_store.ttl(key)
+
    def get(self, key, raise_exception=False):
        key = prepare_value(key)
        if self.active:
--- a/notifications_utils/request_helper.py
+++ b/notifications_utils/request_helper.py
@@ -75,6 +75,24 @@ class ResponseHeaderMiddleware(object):
            if SPAN_ID_HEADER.lower() not in lower_existing_header_names:
                headers.append((SPAN_ID_HEADER, str(req.span_id)))

+            # Some dynamic scan findings
+            headers.append(("Cross-Origin-Opener-Policy", "same-origin"))
+            headers.append(("Cross-Origin-Embedder-Policy", "require-corp"))
+            headers.append(("Cross-Origin-Resource-Policy", "same-origin"))
+            headers.append(("Cross-Origin-Opener-Policy", "same-origin"))
+
+            # svg content type should not contain charset
+            found_svg = False
+            for _, v in headers:
+                if "svg+xml" in v:
+                    found_svg = True
+            if found_svg:
+                new_headers = [
+                    (k, v) for k, v in headers if k.lower() != "content-type"
+                ]
+                new_headers.append(("Content-Type", "image/svg+xml"))
+                return start_response(status, new_headers, exc_info)
+
            return start_response(status, headers, exc_info)

        return self._app(environ, rewrite_response_headers)
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -37,18 +37,18 @@
    "hogan": "1.0.2",
    "jquery": "3.7.1",
    "morphdom": "^2.7.4",
-    "playwright": "^1.50.0",
+    "playwright": "^1.50.1",
    "python": "^0.0.4",
    "query-command-supported": "1.0.0",
-    "sass-embedded": "^1.83.4",
+    "sass-embedded": "^1.85.0",
    "textarea-caret": "3.1.0",
    "timeago": "1.6.7",
    "vinyl-buffer": "^1.0.1",
    "vinyl-source-stream": "^2.0.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.26.7",
-    "@babel/preset-env": "^7.26.7",
+    "@babel/core": "^7.26.8",
+    "@babel/preset-env": "^7.26.9",
    "@uswds/compile": "^1.2.1",
    "backstopjs": "^6.3.25",
    "better-npm-audit": "^3.11.0",
@@ -66,7 +66,7 @@
    "jest-environment-jsdom": "^29.2.2",
    "jshint": "2.13.6",
    "jshint-stylish": "2.2.1",
-    "rollup": "^4.32.0",
+    "rollup": "^4.34.8",
    "rollup-plugin-commonjs": "10.1.0",
    "rollup-plugin-node-resolve": "5.2.0"
  }
--- a/poetry.lock
+++ b/poetry.lock
@@ -42,17 +42,17 @@ tests-mypy = ["mypy (>=1.11.1)", "pytest-mypy-plugins"]

 [[package]]
 name = "awscli"
-version = "1.35.17"
+version = "1.36.40"
 description = "Universal Command Line Environment for AWS."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "awscli-1.35.17-py3-none-any.whl", hash = "sha256:67906511b138bb6b241136c0ba6bee854f522b7b506887911e6ad34877a822c3"},
-    {file = "awscli-1.35.17.tar.gz", hash = "sha256:9469a1924c6987dd0553ad0d0fd2a37717d0f7b55104e99f5789d3678c9706c4"},
+    {file = "awscli-1.36.40-py3-none-any.whl", hash = "sha256:971c3b150c06068bc26867fe295753547780f63fcf8256d41cd38760e44d46ca"},
+    {file = "awscli-1.36.40.tar.gz", hash = "sha256:e2a88f88dc16d5c0f26379afd6f254097e53e8b34c82164e59f4165db6ee6dfa"},
 ]

 [package.dependencies]
-botocore = "1.35.51"
+botocore = "1.35.99"
 colorama = ">=0.2.5,<0.4.7"
 docutils = ">=0.10,<0.17"
 PyYAML = ">=3.10,<6.1"
@@ -219,13 +219,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]

 [[package]]
 name = "botocore"
-version = "1.35.51"
+version = "1.35.99"
 description = "Low-level, data-driven core of boto 3."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "botocore-1.35.51-py3-none-any.whl", hash = "sha256:4d65b00111bd12b98e9f920ecab602cf619cc6a6d0be6e5dd53f517e4b92901c"},
-    {file = "botocore-1.35.51.tar.gz", hash = "sha256:a9b3d1da76b3e896ad74605c01d88f596324a3337393d4bfbfa0d6c35822ca9c"},
+    {file = "botocore-1.35.99-py3-none-any.whl", hash = "sha256:b22d27b6b617fc2d7342090d6129000af2efd20174215948c0d7ae2da0fab445"},
+    {file = "botocore-1.35.99.tar.gz", hash = "sha256:1eab44e969c39c5f3d9a3104a0836c24715579a455f12b3979a31d7cde51b3c3"},
 ]

 [package.dependencies]
@@ -595,51 +595,55 @@ toml = ["tomli"]

 [[package]]
 name = "cryptography"
-version = "43.0.3"
+version = "44.0.1"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
-python-versions = ">=3.7"
+python-versions = "!=3.9.0,!=3.9.1,>=3.7"
 files = [
-    {file = "cryptography-43.0.3-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e"},
-    {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e"},
-    {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e1ce50266f4f70bf41a2c6dc4358afadae90e2a1e5342d3c08883df1675374f"},
-    {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:443c4a81bb10daed9a8f334365fe52542771f25aedaf889fd323a853ce7377d6"},
-    {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:74f57f24754fe349223792466a709f8e0c093205ff0dca557af51072ff47ab18"},
-    {file = "cryptography-43.0.3-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:9762ea51a8fc2a88b70cf2995e5675b38d93bf36bd67d91721c309df184f49bd"},
-    {file = "cryptography-43.0.3-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:81ef806b1fef6b06dcebad789f988d3b37ccaee225695cf3e07648eee0fc6b73"},
-    {file = "cryptography-43.0.3-cp37-abi3-win32.whl", hash = "sha256:cbeb489927bd7af4aa98d4b261af9a5bc025bd87f0e3547e11584be9e9427be2"},
-    {file = "cryptography-43.0.3-cp37-abi3-win_amd64.whl", hash = "sha256:f46304d6f0c6ab8e52770addfa2fc41e6629495548862279641972b6215451cd"},
-    {file = "cryptography-43.0.3-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:8ac43ae87929a5982f5948ceda07001ee5e83227fd69cf55b109144938d96984"},
-    {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5"},
-    {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4"},
-    {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7"},
-    {file = "cryptography-43.0.3-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405"},
-    {file = "cryptography-43.0.3-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16"},
-    {file = "cryptography-43.0.3-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73"},
-    {file = "cryptography-43.0.3-cp39-abi3-win32.whl", hash = "sha256:d56e96520b1020449bbace2b78b603442e7e378a9b3bd68de65c782db1507995"},
-    {file = "cryptography-43.0.3-cp39-abi3-win_amd64.whl", hash = "sha256:0c580952eef9bf68c4747774cde7ec1d85a6e61de97281f2dba83c7d2c806362"},
-    {file = "cryptography-43.0.3-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d03b5621a135bffecad2c73e9f4deb1a0f977b9a8ffe6f8e002bf6c9d07b918c"},
-    {file = "cryptography-43.0.3-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:a2a431ee15799d6db9fe80c82b055bae5a752bef645bba795e8e52687c69efe3"},
-    {file = "cryptography-43.0.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:281c945d0e28c92ca5e5930664c1cefd85efe80e5c0d2bc58dd63383fda29f83"},
-    {file = "cryptography-43.0.3-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:f18c716be16bc1fea8e95def49edf46b82fccaa88587a45f8dc0ff6ab5d8e0a7"},
-    {file = "cryptography-43.0.3-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4a02ded6cd4f0a5562a8887df8b3bd14e822a90f97ac5e544c162899bc467664"},
-    {file = "cryptography-43.0.3-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:53a583b6637ab4c4e3591a15bc9db855b8d9dee9a669b550f311480acab6eb08"},
-    {file = "cryptography-43.0.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1ec0bcf7e17c0c5669d881b1cd38c4972fade441b27bda1051665faaa89bdcaa"},
-    {file = "cryptography-43.0.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:2ce6fae5bdad59577b44e4dfed356944fbf1d925269114c28be377692643b4ff"},
-    {file = "cryptography-43.0.3.tar.gz", hash = "sha256:315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805"},
+    {file = "cryptography-44.0.1-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:bf688f615c29bfe9dfc44312ca470989279f0e94bb9f631f85e3459af8efc009"},
+    {file = "cryptography-44.0.1-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd7c7e2d71d908dc0f8d2027e1604102140d84b155e658c20e8ad1304317691f"},
+    {file = "cryptography-44.0.1-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:887143b9ff6bad2b7570da75a7fe8bbf5f65276365ac259a5d2d5147a73775f2"},
+    {file = "cryptography-44.0.1-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:322eb03ecc62784536bc173f1483e76747aafeb69c8728df48537eb431cd1911"},
+    {file = "cryptography-44.0.1-cp37-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:21377472ca4ada2906bc313168c9dc7b1d7ca417b63c1c3011d0c74b7de9ae69"},
+    {file = "cryptography-44.0.1-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:df978682c1504fc93b3209de21aeabf2375cb1571d4e61907b3e7a2540e83026"},
+    {file = "cryptography-44.0.1-cp37-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:eb3889330f2a4a148abead555399ec9a32b13b7c8ba969b72d8e500eb7ef84cd"},
+    {file = "cryptography-44.0.1-cp37-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:8e6a85a93d0642bd774460a86513c5d9d80b5c002ca9693e63f6e540f1815ed0"},
+    {file = "cryptography-44.0.1-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:6f76fdd6fd048576a04c5210d53aa04ca34d2ed63336d4abd306d0cbe298fddf"},
+    {file = "cryptography-44.0.1-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:6c8acf6f3d1f47acb2248ec3ea261171a671f3d9428e34ad0357148d492c7864"},
+    {file = "cryptography-44.0.1-cp37-abi3-win32.whl", hash = "sha256:24979e9f2040c953a94bf3c6782e67795a4c260734e5264dceea65c8f4bae64a"},
+    {file = "cryptography-44.0.1-cp37-abi3-win_amd64.whl", hash = "sha256:fd0ee90072861e276b0ff08bd627abec29e32a53b2be44e41dbcdf87cbee2b00"},
+    {file = "cryptography-44.0.1-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:a2d8a7045e1ab9b9f803f0d9531ead85f90c5f2859e653b61497228b18452008"},
+    {file = "cryptography-44.0.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b8272f257cf1cbd3f2e120f14c68bff2b6bdfcc157fafdee84a1b795efd72862"},
+    {file = "cryptography-44.0.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e8d181e90a777b63f3f0caa836844a1182f1f265687fac2115fcf245f5fbec3"},
+    {file = "cryptography-44.0.1-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:436df4f203482f41aad60ed1813811ac4ab102765ecae7a2bbb1dbb66dcff5a7"},
+    {file = "cryptography-44.0.1-cp39-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:4f422e8c6a28cf8b7f883eb790695d6d45b0c385a2583073f3cec434cc705e1a"},
+    {file = "cryptography-44.0.1-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:72198e2b5925155497a5a3e8c216c7fb3e64c16ccee11f0e7da272fa93b35c4c"},
+    {file = "cryptography-44.0.1-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:2a46a89ad3e6176223b632056f321bc7de36b9f9b93b2cc1cccf935a3849dc62"},
+    {file = "cryptography-44.0.1-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:53f23339864b617a3dfc2b0ac8d5c432625c80014c25caac9082314e9de56f41"},
+    {file = "cryptography-44.0.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:888fcc3fce0c888785a4876ca55f9f43787f4c5c1cc1e2e0da71ad481ff82c5b"},
+    {file = "cryptography-44.0.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:00918d859aa4e57db8299607086f793fa7813ae2ff5a4637e318a25ef82730f7"},
+    {file = "cryptography-44.0.1-cp39-abi3-win32.whl", hash = "sha256:9b336599e2cb77b1008cb2ac264b290803ec5e8e89d618a5e978ff5eb6f715d9"},
+    {file = "cryptography-44.0.1-cp39-abi3-win_amd64.whl", hash = "sha256:e403f7f766ded778ecdb790da786b418a9f2394f36e8cc8b796cc056ab05f44f"},
+    {file = "cryptography-44.0.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1f9a92144fa0c877117e9748c74501bea842f93d21ee00b0cf922846d9d0b183"},
+    {file = "cryptography-44.0.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:610a83540765a8d8ce0f351ce42e26e53e1f774a6efb71eb1b41eb01d01c3d12"},
+    {file = "cryptography-44.0.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:5fed5cd6102bb4eb843e3315d2bf25fede494509bddadb81e03a859c1bc17b83"},
+    {file = "cryptography-44.0.1-pp310-pypy310_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:f4daefc971c2d1f82f03097dc6f216744a6cd2ac0f04c68fb935ea2ba2a0d420"},
+    {file = "cryptography-44.0.1-pp310-pypy310_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:94f99f2b943b354a5b6307d7e8d19f5c423a794462bde2bf310c770ba052b1c4"},
+    {file = "cryptography-44.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:d9c5b9f698a83c8bd71e0f4d3f9f839ef244798e5ffe96febfa9714717db7af7"},
+    {file = "cryptography-44.0.1.tar.gz", hash = "sha256:f51f5705ab27898afda1aaa430f34ad90dc117421057782022edf0600bec5f14"},
 ]

 [package.dependencies]
 cffi = {version = ">=1.12", markers = "platform_python_implementation != \"PyPy\""}

 [package.extras]
-docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"]
-docstest = ["pyenchant (>=1.6.11)", "readme-renderer", "sphinxcontrib-spelling (>=4.0.1)"]
-nox = ["nox"]
-pep8test = ["check-sdist", "click", "mypy", "ruff"]
-sdist = ["build"]
+docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=3.0.0)"]
+docstest = ["pyenchant (>=3)", "readme-renderer (>=30.0)", "sphinxcontrib-spelling (>=7.3.1)"]
+nox = ["nox (>=2024.4.15)", "nox[uv] (>=2024.3.2)"]
+pep8test = ["check-sdist", "click (>=8.0.1)", "mypy (>=1.4)", "ruff (>=0.3.6)"]
+sdist = ["build (>=1.0.0)"]
 ssh = ["bcrypt (>=3.1.5)"]
-test = ["certifi", "cryptography-vectors (==43.0.3)", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"]
+test = ["certifi (>=2024)", "cryptography-vectors (==44.0.1)", "pretend (>=0.7)", "pytest (>=7.4.0)", "pytest-benchmark (>=4.0)", "pytest-cov (>=2.10.1)", "pytest-xdist (>=3.5.0)"]
 test-randomorder = ["pytest-randomly"]

 [[package]]
@@ -3039,13 +3043,13 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess

 [[package]]
 name = "vulture"
-version = "2.13"
+version = "2.14"
 description = "Find dead code"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "vulture-2.13-py2.py3-none-any.whl", hash = "sha256:34793ba60488e7cccbecdef3a7fe151656372ef94fdac9fe004c52a4000a6d44"},
-    {file = "vulture-2.13.tar.gz", hash = "sha256:78248bf58f5eaffcc2ade306141ead73f437339950f80045dce7f8b078e5a1aa"},
+    {file = "vulture-2.14-py2.py3-none-any.whl", hash = "sha256:d9a90dba89607489548a49d557f8bac8112bd25d3cbc8aeef23e860811bd5ed9"},
+    {file = "vulture-2.14.tar.gz", hash = "sha256:cb8277902a1138deeab796ec5bef7076a6e0248ca3607a3f3dee0b6d9e9b8415"},
 ]

 [[package]]
@@ -3134,4 +3138,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12.2"
-content-hash = "3035525f7fc44291ea02b011d9fa6c0e84501d567417144e4d8fd6beebb11928"
+content-hash = "fb6610dec3b98fbed3e69137c83d8c445258899734d79a6e8878c59b6c422c7c"
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,10 +40,10 @@ markdown = "^3.5.2"
 async-timeout = "^4.0.3"
 bleach = "^6.1.0"
 boto3 = "^1.34.156"
-botocore = "^1.34.156"
+botocore = "^1.35.99"
 cachetools = "^5.4.0"
 cffi = "^1.16.0"
-cryptography = "^43.0.1"
+cryptography = "^44.0.1"
 flask-redis = "^0.4.0"
 geojson = "^3.1.0"
 jmespath = "^1.0.1"
@@ -94,7 +94,7 @@ pytest-playwright = "^0.5.1"
 pytest-xdist = "^3.5.0"
 radon = "^6.0.1"
 requests-mock = "^1.11.0"
-vulture = "^2.11"
+vulture = "^2.14"


 [build-system]
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -1521,7 +1521,7 @@ def test_link_to_upload_not_offered_when_entering_personalisation(

    # We’re entering personalization
    assert page.select_one("input[type=text]")["name"] == "placeholder_value"
-    assert page.select_one("label[for=placeholder_value]").text.strip() == "name"
+    assert page.select_one("label[for=phone-number]").text.strip() == "name"
    # No ‘Upload’ link shown
    assert len(page.select("main a")) == 0
    assert "Upload" not in page.select_one("main").text
--- a/tests/app/main/views/test_tour.py
+++ b/tests/app/main/views/test_tour.py
@@ -174,9 +174,8 @@ def test_should_show_empty_text_box(
    # data-module=autofocus is set on a containing element so it
    # shouldn’t also be set on the textbox itself
    assert "data-module" not in textbox
-    assert (
-        normalize_spaces(page.select_one("label[for=placeholder_value]").text) == "one"
-    )
+
+    assert normalize_spaces(page.select_one("label[for=phone-number]").text) == "one"


 def test_should_prefill_answers_for_get_tour_step(
--- a/tests/app/notify_client/test_notification_client.py
+++ b/tests/app/notify_client/test_notification_client.py
@@ -141,8 +141,15 @@ def test_get_notification(mocker):

 def test_get_notification_count_for_job_id(mocker):
    mock_get = mocker.patch(
-        "app.notify_client.notification_api_client.NotificationApiClient.get"
+        "app.notify_client.notification_api_client.NotificationApiClient.get",
+        return_value={"count": 0},
    )
+
+    mocker.patch(
+        "app.notify_client.notification_api_client.redis_client.get", return_value=None
+    )
+
+    mocker.patch("app.notify_client.billing_api_client.redis_client.set")
    NotificationApiClient().get_notification_count_for_job_id(
        service_id="foo", job_id="bar"
    )
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -107,6 +107,7 @@ EXCLUDED_ENDPOINTS = tuple(
            "get_volumes_by_service",
            "get_example_csv",
            "get_notifications_as_json",
+            "get_redis_report",
            "get_started",
            "get_started_old",
            "go_to_dashboard_after_tour",
--- a/zap.conf
+++ b/zap.conf
@@ -53,6 +53,7 @@
 10096	WARN	(Timestamp Disclosure - Passive/release)
 10097	WARN	(Hash Disclosure - Passive/beta)
 10098	WARN	(Cross-Domain Misconfiguration - Passive/release)
+10099	IGNORE	(Source Code Disclosure - Java)
 10104	WARN	(User Agent Fuzzer - Active/beta)
 10105	WARN	(Weak Authentication Method - Passive/release)
 10106	IGNORE	(HTTP Only Site - Active/beta)