Compare commits

..

2 Commits

Author SHA1 Message Date
Alex Janousek
77d8266a85 Test commit (signing) 2026-03-02 11:15:20 -05:00
Alex Janousek
231aa70890 Test commit (no signing) 2026-03-02 11:08:40 -05:00
18 changed files with 499 additions and 529 deletions

View File

@@ -133,7 +133,7 @@
"filename": ".github/workflows/checks.yml",
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_verified": false,
"line_number": 29,
"line_number": 28,
"is_secret": false
},
{
@@ -141,7 +141,7 @@
"filename": ".github/workflows/checks.yml",
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_verified": false,
"line_number": 46,
"line_number": 45,
"is_secret": false
}
],
@@ -151,7 +151,7 @@
"filename": ".github/workflows/daily_checks.yml",
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_verified": false,
"line_number": 66,
"line_number": 63,
"is_secret": false
},
{
@@ -159,7 +159,7 @@
"filename": ".github/workflows/daily_checks.yml",
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_verified": false,
"line_number": 82,
"line_number": 79,
"is_secret": false
}
],
@@ -374,5 +374,5 @@
}
]
},
"generated_at": "2026-06-02T14:59:28Z"
"generated_at": "2025-09-11T16:22:46Z"
}

View File

@@ -10,12 +10,12 @@ runs:
&& sudo apt-get install -y --no-install-recommends \
libcurl4-openssl-dev
- name: Set up Python 3.13.2
uses: actions/setup-python@v6
uses: actions/setup-python@v4
with:
python-version: "3.13.2"
- name: Install poetry
shell: bash
run: pip install poetry==2.3.4
run: pip install poetry==2.1.3
- name: Install poetry export
shell: bash
run: poetry self add poetry-plugin-export

View File

@@ -3,19 +3,16 @@
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# Note: Setting open-pull-requests-limit to 0 disables automatic version update PRs.
# Security updates are still active and managed separately in repository settings under
# "Security & analysis" > "Dependabot security updates"
version: 2
updates:
- package-ecosystem: "pip" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
open-pull-requests-limit: 0 # Disable version update PRs; security updates still active
labels:
- "dependabot" # Custom label to identify Dependabot PRs
assignees:
- "alexjanousekGSA"
ignore:
# gevent 25.8+ breaks Celery/Kombu compatibility (potentially)
- dependency-name: "gevent"

View File

@@ -19,7 +19,7 @@ jobs:
run: exit 0
- name: checkout main branch
uses: actions/checkout@v6
uses: actions/checkout@v4
with:
ref: main
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}

View File

@@ -14,7 +14,6 @@ env:
WERKZEUG_DEBUG_PIN: off
REDIS_ENABLED: 0
AWS_US_TOLL_FREE_NUMBER: "+18556438890"
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
jobs:
@@ -38,7 +37,7 @@ jobs:
- 5432:5432
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Install application dependencies
run: make bootstrap
@@ -71,7 +70,7 @@ jobs:
runs-on: ubuntu-latest
environment: staging
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Install poetry packages
run: poetry install
@@ -85,7 +84,7 @@ jobs:
pip-audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Create requirements.txt
run: poetry export --output requirements.txt
@@ -94,12 +93,11 @@ jobs:
inputs: requirements.txt
ignore-vulns: |
PYSEC-2023-312
CVE-2026-4539
static-scan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Install bandit
run: pip install bandit
@@ -124,7 +122,7 @@ jobs:
# Maps tcp port 5432 on service container to the host
- 5432:5432
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Install application dependencies
run: make bootstrap

View File

@@ -56,7 +56,7 @@ jobs:
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v6
uses: actions/checkout@v4
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL

View File

@@ -19,13 +19,11 @@ env:
REDIS_ENABLED: 0
AWS_US_TOLL_FREE_NUMBER: "+18556438890"
jobs:
pip-audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Create requirements.txt
run: poetry export --output requirements.txt
@@ -34,9 +32,8 @@ jobs:
inputs: requirements.txt
ignore-vulns: |
PYSEC-2023-312
CVE-2026-4539
- name: Upload pip-audit artifact
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v4
with:
name: pip-audit-report
path: /tmp/pip-audit-output.txt
@@ -44,14 +41,14 @@ jobs:
static-scan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Install bandit
run: pip install bandit
- name: Run scan
run: bandit -r app/ -f txt -o /tmp/bandit-output.txt --confidence-level medium
- name: Upload bandit artifact
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v4
with:
name: bandit-report
path: /tmp/bandit-output.txt
@@ -74,7 +71,7 @@ jobs:
# Maps tcp port 5432 on service container to the host
- 5432:5432
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
- name: Install application dependencies
run: make bootstrap

View File

@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
environment: demo
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
with:
fetch-depth: 2

View File

@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
environment: production
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
with:
fetch-depth: 2

View File

@@ -18,7 +18,7 @@ jobs:
environment: staging
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
with:
fetch-depth: 2
@@ -113,6 +113,6 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'failure' }}
steps:
- uses: actions/github-script@v9
- uses: actions/github-script@v6
with:
script: core.setFailed('Checks failed, not deploying')

View File

@@ -13,7 +13,7 @@ jobs:
environment: staging
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v4
# Looks like we need to install Terraform ourselves now!
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -50,7 +50,7 @@ jobs:
# environment: demo
# steps:
# - name: Checkout
# uses: actions/checkout@v6
# uses: actions/checkout@v4
# with:
# ref: 'production'
@@ -89,7 +89,7 @@ jobs:
environment: production
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v4
with:
ref: 'production'

View File

@@ -16,7 +16,7 @@ jobs:
environment: demo
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v4
# Looks like we need to install Terraform ourselves now!
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -59,7 +59,7 @@ jobs:
# inspiration: https://learn.hashicorp.com/tutorials/terraform/github-actions#review-actions-workflow
- name: Update PR
uses: actions/github-script@v9
uses: actions/github-script@v7
# we would like to update the PR even when a prior step failed
if: ${{ always() }}
with:

View File

@@ -16,7 +16,7 @@ jobs:
environment: production
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v4
# Looks like we need to install Terraform ourselves now!
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -59,7 +59,7 @@ jobs:
# inspiration: https://learn.hashicorp.com/tutorials/terraform/github-actions#review-actions-workflow
- name: Update PR
uses: actions/github-script@v9
uses: actions/github-script@v7
# we would like to update the PR even when a prior step failed
if: ${{ always() }}
with:

View File

@@ -16,7 +16,7 @@ jobs:
environment: staging
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v4
# Looks like we need to install Terraform ourselves now!
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -60,7 +60,7 @@ jobs:
# inspiration: https://learn.hashicorp.com/tutorials/terraform/github-actions#review-actions-workflow
- name: Update PR
uses: actions/github-script@v9
uses: actions/github-script@v7
# we would like to update the PR even when a prior step failed
if: ${{ always() }}
with:

View File

@@ -6,7 +6,7 @@ This project is the core of [Notify.gov](https://notify-demo.app.cloud.gov).
It's cloned from the brilliant work of the team at
[GOV.UK Notify](https://github.com/alphagov/notifications-api), cheers!
This repo contains:
This repo contains :
- A public-facing REST API for Notify.gov, which teams can integrate with using
[API clients built by UK](https://www.notifications.service.gov.uk/documentation).

907
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -24,7 +24,6 @@ click-didyoumean = "==0.3.1"
click-plugins = "==1.1.1.2"
click-repl = "==0.3.0"
deprecated = "==1.3.1"
dulwich = "^1.2.5"
gevent = "==25.5.1"
expiringdict = "==1.2.2"
flask = "~=3.1"
@@ -35,15 +34,15 @@ flask-sqlalchemy = "^3.1.1"
gunicorn = {version = "==25.1.0", extras = ["gevent"]}
iso8601 = "==2.1.0"
jsonschema = {version = "==4.26.0", extras = ["format"]}
lxml = "==6.1.0"
lxml = "==6.0.2"
marshmallow = "^4.2.2"
marshmallow-sqlalchemy = "^1.4.2"
newrelic = "^11.5.0"
packaging = "==26.0"
poetry-dotenv-plugin = "==0.2.0"
psycopg2-binary = "==2.9.11"
pyjwt = "==2.13.0"
python-dotenv = "==1.2.2"
pyjwt = "==2.10.1"
python-dotenv = "==1.2.1"
sqlalchemy = "==2.0.47"
werkzeug = "^3.1.5"
faker = "^40.5.1"
@@ -57,39 +56,38 @@ python-json-logger = "^4.0.0"
regex = "^2026.2.19"
shapely = "^2.1.2"
smartypants = "^2.0.1"
mistune = "^3.2.1"
mistune = "^3.2.0"
blinker = "^1.9.0"
cryptography = "^46.0.7"
idna = "^3.15"
cryptography = "^46.0.5"
idna = "^3.11"
jmespath = "^1.1.0"
markupsafe = "^3.0.3"
mako = "^1.3.12"
pycparser = "^3.0"
python-dateutil = "^2.9.0.post0"
pyyaml = "^6.0.3"
s3transfer = "^0.16.0"
s3transfer = "^0.13.1"
six = "^1.16.0"
urllib3 = "^2.6.3"
webencodings = "^0.5.1"
itsdangerous = "^2.2.0"
jinja2 = "^3.1.6"
redis = "^6.4.0"
requests = "^2.33.0"
virtualenv = "^21.1.0"
requests = "^2.32.5"
virtualenv = "^21.0.0"
marshmallow-enum = "^1.5.1"
awscli = "^1.44.38"
awscli = "^1.40.36"
typing-extensions = "^4.15.0"
aiohttp = "^3.13.4"
aiohttp = "^3.13.3"
pytest = "^9.0.2"
filelock = ">=3.20.3"
pyasn1 = ">=0.6.3"
pyasn1 = ">=0.6.2"
jaraco-context = ">=6.1.0"
wheel = ">=0.46.2"
[tool.poetry.group.dev.dependencies]
bandit = "*"
black = "^26.3.1"
black = "^26.1.0"
cyclonedx-python-lib = "^11.6.0"
cloudfoundry-client = "*"
exceptiongroup = "==1.3.1"

View File

@@ -238,11 +238,12 @@ def test_decode_jwt_token_returns_error_with_no_secrets(client):
assert exc.value.short_message == "Invalid token: API key not found"
@pytest.mark.parametrize("service_id", ["not-a-valid-id", 1234])
def test_requires_auth_should_not_allow_service_id_with_the_wrong_data_type(
client, service_jwt_secret
client, service_jwt_secret, service_id
):
token = create_jwt_token(
client_id="not-a-valid-id",
client_id=service_id,
secret=service_jwt_secret,
)
@@ -255,16 +256,6 @@ def test_requires_auth_should_not_allow_service_id_with_the_wrong_data_type(
)
def test_requires_auth_should_not_allow_service_id_with_a_non_string(
client, service_jwt_secret
):
with pytest.raises(TypeError):
create_jwt_token(
client_id=1234,
secret=service_jwt_secret,
)
def test_requires_auth_returns_error_when_service_doesnt_exist(client, sample_api_key):
# get service ID and secret the wrong way around
token = create_jwt_token(