Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:

mesh_sandbox:
build:
context: https://github.com/NHSDigital/mesh-sandbox.git#refs/tags/v1.0.27
context: https://github.com/NHSDigital/mesh-sandbox.git#refs/tags/v1.0.126
ports:
- "8701:443"
deploy:
Expand Down
2 changes: 1 addition & 1 deletion docker/squid/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim
FROM debian:bookworm-slim

RUN apt-get update \
&& apt-get install -yq --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions mesh_client/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import collections
import contextlib
import datetime
import datetime as dt
import functools
import hmac
import os.path
Expand Down Expand Up @@ -1068,7 +1068,7 @@ def __call__(self, r=None):
return token

def generate_token(self) -> str:
now = datetime.datetime.now(datetime.timezone.utc).strftime("%Y%m%d%H%M")
now = dt.datetime.now(dt.timezone.utc).strftime("%Y%m%d%H%M")
public_auth_data = f"{self._mailbox}:{self._nonce}:{self._nonce_count}:{now}"
private_auth_data = f"{self._mailbox}:{self._nonce}:{self._nonce_count}:{self._password}:{now}"
myhash = hmac.HMAC(self._key, private_auth_data.encode("ASCII"), sha256).hexdigest()
Expand Down
Loading
Loading