Skip to content

Commit

Permalink
Update the JWT secret and change the port on fixtures service (#270)
Browse files Browse the repository at this point in the history
  • Loading branch information
ndasmoj authored Oct 22, 2024
1 parent d1d0a7b commit 5791938
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pact-provider-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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}'
Expand All @@ -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)")
Expand Down Expand Up @@ -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)" \
Expand Down
4 changes: 2 additions & 2 deletions api-test/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion internal/shared/jwt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
)

var secretKey = []byte("secret")
var secretKey = []byte("mysupersecrettestkeythatis128bits")

var verifier = JWTVerifier{
secretKey: secretKey,
Expand Down
2 changes: 1 addition & 1 deletion localstack/init/localstack_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 5791938

Please sign in to comment.