From 86c55b89f5847d7f077512696ab7c85e0ecf807b Mon Sep 17 00:00:00 2001
From: Niladri Das <niladri.das@digital.justice.gov.uk>
Date: Tue, 22 Oct 2024 14:11:39 +0100
Subject: [PATCH] Update the JWT secret and change the port on fixtures service

---
 .github/workflows/pact-provider-verification.yml | 2 +-
 Makefile                                         | 6 +++---
 api-test/main.go                                 | 4 ++--
 docker-compose.yml                               | 4 ++--
 internal/shared/jwt_test.go                      | 2 +-
 localstack/init/localstack_init.sh               | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pact-provider-verification.yml b/.github/workflows/pact-provider-verification.yml
index a81d9e3e..e247c3c1 100644
--- a/.github/workflows/pact-provider-verification.yml
+++ b/.github/workflows/pact-provider-verification.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           go-version: 'stable'
       - run: go build -o ./api-test/tester ./api-test && chmod +x ./api-test/tester
-      - run: echo "JWT=$(JWT_SECRET_KEY=secret ./api-test/tester JWT)" >> "$GITHUB_ENV"
+      - run: echo "JWT=$(JWT_SECRET_KEY=mysupersecrettestkeythatis128bits ./api-test/tester JWT)" >> "$GITHUB_ENV"
       - name: Verify specified Pact
         if: ${{ github.event_name == 'repository_dispatch' }}
         run: |
diff --git a/Makefile b/Makefile
index 4dfdaab6..98179152 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SHELL = '/bin/bash'
-export JWT_SECRET_KEY ?= secret
+export JWT_SECRET_KEY ?= mysupersecrettestkeythatis128bits
 
 help:
 	@grep --no-filename -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -17,7 +17,7 @@ test: ## Unit tests
 	go test ./... -race -covermode=atomic -coverprofile=coverage.out
 
 test-api: URL ?= http://localhost:9000
-# test-api: export JWT_SECRET_KEY ?= secret
+# test-api: export JWT_SECRET_KEY ?= mysupersecrettestkeythatis128bits
 test-api:
 	$(shell go build -o ./api-test/tester ./api-test && chmod +x ./api-test/tester)
 	$(eval LPA_UID := "$(shell ./api-test/tester UID)")
@@ -77,7 +77,7 @@ test-api:
 .PHONY: test-api
 
 test-pact:
-	$(eval JWT := "$(shell JWT_SECRET_KEY=secret ./api-test/tester JWT)")
+	$(eval JWT := "$(shell JWT_SECRET_KEY=mysupersecrettestkeythatis128bits ./api-test/tester JWT)")
 
 	docker compose run --rm pact-verifier \
       --header="X-Jwt-Authorization=Bearer $(JWT)" \
diff --git a/api-test/main.go b/api-test/main.go
index de658874..9408cc9d 100644
--- a/api-test/main.go
+++ b/api-test/main.go
@@ -22,9 +22,9 @@ import (
 
 // ./api-test/tester UID -> generate a UID
 // ./api-test/tester JWT -> generate a JWT
-// JWT_SECRET_KEY=secret ./api-test/tester -expectedStatus=200 REQUEST <METHOD> <URL> <REQUEST BODY>
+// JWT_SECRET_KEY=mysupersecrettestkeythatis128bits ./api-test/tester -expectedStatus=200 REQUEST <METHOD> <URL> <REQUEST BODY>
 //
-//	-> make a test request with a JWT generated using secret "secret" and expected status 200
+//	-> make a test request with a JWT generated using secret "mysupersecrettestkeythatis128bits" and expected status 200
 //
 // note that the jwtSecret sends a boilerplate JWT for now with valid iat, exp, iss and sub fields
 func main() {
diff --git a/docker-compose.yml b/docker-compose.yml
index 32b9bd53..b1817931 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -146,11 +146,11 @@ services:
       context: .
       dockerfile: ./fixtures/Dockerfile
     ports:
-      - "5000:80"
+      - "5000:8080"
     environment:
       - SKIP_AUTH=1
       - BASE_URL=http://apigw:8080
-      - JWT_SECRET_KEY=secret
+      - JWT_SECRET_KEY=mysupersecrettestkeythatis128bits
     volumes:
       - ./fixtures/static/js:/app/static/js
       - ./docs/schemas:/app/static/schemas
diff --git a/internal/shared/jwt_test.go b/internal/shared/jwt_test.go
index 3e046d2e..0067be10 100644
--- a/internal/shared/jwt_test.go
+++ b/internal/shared/jwt_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-var secretKey = []byte("secret")
+var secretKey = []byte("mysupersecrettestkeythatis128bits")
 
 var verifier = JWTVerifier{
 	secretKey: secretKey,
diff --git a/localstack/init/localstack_init.sh b/localstack/init/localstack_init.sh
index 91679435..ed083f55 100755
--- a/localstack/init/localstack_init.sh
+++ b/localstack/init/localstack_init.sh
@@ -48,4 +48,4 @@ awslocal dynamodb create-table \
 # Secrets Manager
 awslocal secretsmanager create-secret --name local/jwt-key \
     --description "JWT secret for service authentication" \
-    --secret-string "secret"
+    --secret-string "mysupersecrettestkeythatis128bits"