Skip to content

Commit bc70312

Browse files
committed
test: Fix certificate being not trusted on MacOS
1 parent 629df56 commit bc70312

File tree

8 files changed

+14
-117
lines changed

8 files changed

+14
-117
lines changed

Diff for: .config/starte2e.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ export PATH="${PATH}:/usr/bin"
1010
touch tests/environment/zitadel/service-user.json
1111
chmod a+rw tests/environment/zitadel/service-user.json
1212

13+
# Generate certificates
14+
tests/environment/certs/generate-certs.sh
15+
1316
# Shut down any still running test-setup first
14-
docker compose --project-directory ./tests/environment down -v test-setup || true
17+
docker compose --project-directory ./tests/environment down -v || true
1518
docker compose --project-directory ./tests/environment up --wait

Diff for: .gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
/target
33
/tests/environment/zitadel/service-user.json
44
/tests/environment/config.yaml
5+
/tests/environment/certs/*.crt
6+
/tests/environment/certs/*.key
7+
.DS_Store

Diff for: tests/environment/certs/ca.crt

-20
This file was deleted.

Diff for: tests/environment/certs/client.crt

-19
This file was deleted.

Diff for: tests/environment/certs/client.key

-28
This file was deleted.

Diff for: tests/environment/certs/generate-certs.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
#!/bin/sh
22
set -eux
33

4+
pushd $(dirname $0)
5+
6+
# We need to set EKUs (extendedKeyUsage) otherwise MacOS won't trust
7+
# the certificate
48
openssl req -x509 -new -nodes -sha256 -newkey rsa:2048 \
59
-keyout server.key \
610
-out server.crt \
711
-subj "/C=DE/CN=example.org" \
8-
-addext "subjectAltName = DNS:zitadel, DNS:localhost"
12+
-addext "subjectAltName = DNS:zitadel, DNS:localhost" \
13+
-addext "extendedKeyUsage = serverAuth, clientAuth"
914

1015
# These keys are not actually secret, and when passed into the docker
1116
# container the server key needs to be readable by the container user
@@ -18,3 +23,4 @@ openssl req -x509 -nodes -days 3650 -sha256 -newkey rsa:2048 \
1823
-keyout client.key \
1924
-out client.crt \
2025
-subj "/CN=admin.example.org"
26+
popd

Diff for: tests/environment/certs/server.crt

-20
This file was deleted.

Diff for: tests/environment/certs/server.key

-28
This file was deleted.

0 commit comments

Comments
 (0)