diff --git a/Taskfile.yml b/Taskfile.yml index c6a3271b8..2387a47f4 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -179,6 +179,25 @@ tasks: desc: Run development services and Vite at http://localhost:5173 deps: [dev:daemon, dev:gateway, dev:messaging, dev:state-store, dev:dashboard, dev:ui] + dev:tls: + desc: Issue the development CA and service certificates deployments/dev.toml names + status: + - test -f tmp/dev-tls/archie-ui.pem + cmds: + - | + # Task containers reach the State Store over the Docker bridge, which + # services may only do over TLS. + set -eu + d=tmp/dev-tls + mkdir -p "$d" + openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 -nodes -days 3650 \ + -subj /CN=archie-dev-ca -keyout "$d/ca-key.pem" -out "$d/ca.pem" 2>/dev/null + for s in archied archie-gateway archie-messaging archie-state-store archie-ui; do + openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 -nodes -days 3650 \ + -subj "/CN=$s" -addext "subjectAltName=DNS:$s" -addext extendedKeyUsage=serverAuth,clientAuth \ + -CA "$d/ca.pem" -CAkey "$d/ca-key.pem" -keyout "$d/$s-key.pem" -out "$d/$s.pem" 2>/dev/null + done + dev:postgres: desc: Start PostgreSQL and wait for readiness cmds: @@ -215,7 +234,7 @@ tasks: dev:state-store: desc: Run the State Store with development PostgreSQL - deps: [dev:postgres] + deps: [dev:postgres, dev:tls] cmds: - go run ./cmd/archie-state-store -config-overlay deployments/dev.toml diff --git a/deployments/dev.toml b/deployments/dev.toml index 89148b84e..baaf84d2f 100644 --- a/deployments/dev.toml +++ b/deployments/dev.toml @@ -25,9 +25,16 @@ listen = "127.0.0.1:8484" # when a port is already taken on the host -- before the # listen key existed the collision could only be worked around by hand-writing # a matching target and passing -listen, and it read as a code fault. +# +# Task containers dial the target over the Docker bridge gateway, so the store +# listens on every interface and [tls] (issued by `task dev:tls`) is required. [services.state] -target = "127.0.0.1:9091" -listen = "127.0.0.1:9091" +target = "172.17.0.1:9091" +listen = "0.0.0.0:9091" + +[tls] +ca_file = "tmp/dev-tls/ca.pem" +cert_dir = "tmp/dev-tls" # `task dev` runs archie-gateway via dev:gateway, which also passes no -listen: # the listen below is what it binds. Stated explicitly so the value archie-ui diff --git a/e2e/stack.sh b/e2e/stack.sh index 484326358..533879bed 100755 --- a/e2e/stack.sh +++ b/e2e/stack.sh @@ -78,6 +78,7 @@ prepare() { version=$(git -C "$repo" describe --tags --exact-match --match 'v[0-9]*' 2>/dev/null || true) version=${version#v} [ -n "$version" ] || version="dev+$(git -C "$repo" rev-parse --short=12 HEAD)" + task --dir "$repo" dev:tls task --dir "$repo" --force build BIN_DIR="$dir/bin" GATEWAY_VERSION="$version" RUNTIME_VERSION="$version" }