From 44df9cb92abe66cf12e887ef19e60a01461b3558 Mon Sep 17 00:00:00 2001
From: Jeroen Wijenbergh <jeroenwijenbergh@protonmail.com>
Date: Mon, 25 Apr 2022 16:27:25 +0200
Subject: Tests: Ability to add a custom server and share certificate

We also now do not have to skip verification in the test files
---
 ci/docker/createcert.sh        | 14 ++++++++++++++
 ci/docker/eduvpn-server.docker | 13 +++----------
 ci/docker/go-test.docker       |  4 ++++
 ci/docker/replaceexpiry.sh     |  0
 ci/docker/starteduvpn.sh       |  0
 5 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100755 ci/docker/createcert.sh
 mode change 100644 => 100755 ci/docker/replaceexpiry.sh
 mode change 100644 => 100755 ci/docker/starteduvpn.sh

(limited to 'ci/docker')

diff --git a/ci/docker/createcert.sh b/ci/docker/createcert.sh
new file mode 100755
index 0000000..22b0ced
--- /dev/null
+++ b/ci/docker/createcert.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+WEB_FQDN="eduvpnserver"
+
+# Create self signed cert and key
+openssl req \
+	-nodes \
+	-subj "/CN=${WEB_FQDN}" \
+	-x509 \
+	-sha256 \
+	-newkey rsa:2048 \
+	-keyout "./selfsigned/${WEB_FQDN}.key" \
+	-out "./selfsigned/${WEB_FQDN}.crt" \
+	-days 90
diff --git a/ci/docker/eduvpn-server.docker b/ci/docker/eduvpn-server.docker
index ed33691..c570ae3 100644
--- a/ci/docker/eduvpn-server.docker
+++ b/ci/docker/eduvpn-server.docker
@@ -53,16 +53,9 @@ RUN sed -i "s|fd43::|$(ipcalc -6 -r 64 -n --no-decorate)|" "/etc/vpn-user-portal
 # Update secrets
 RUN cp /etc/vpn-user-portal/keys/node.0.key /etc/vpn-server-node/keys/node.key
 
-# Create self signed cert and key
-RUN openssl req \
-    -nodes \
-    -subj "/CN=${WEB_FQDN}" \
-    -x509 \
-    -sha256 \
-    -newkey rsa:2048 \
-    -keyout "/etc/pki/tls/private/${WEB_FQDN}.key" \
-    -out "/etc/pki/tls/certs/${WEB_FQDN}.crt" \
-    -days 90
+# Copy self signed cert and key
+COPY ./ci/docker/selfsigned/${WEB_FQDN}.key /etc/pki/tls/private/${WEB_FQDN}.key
+COPY ./ci/docker/selfsigned/${WEB_FQDN}.crt /etc/pki/tls/certs/${WEB_FQDN}.crt
 
 # Add the start script and expiry script
 WORKDIR /eduvpn/server
diff --git a/ci/docker/go-test.docker b/ci/docker/go-test.docker
index 2e6bcd5..04b6a99 100644
--- a/ci/docker/go-test.docker
+++ b/ci/docker/go-test.docker
@@ -34,5 +34,9 @@ COPY ./internal ./internal
 # Copy selenium scripts
 COPY ./selenium_eduvpn.py ./selenium_eduvpn.py
 
+# Update certificates
+COPY ./ci/docker/selfsigned/eduvpnserver.crt /usr/local/share/ca-certificates/eduvpnserver.crt
+RUN update-ca-certificates
+
 # Run the tests
 CMD ["go", "test", "-mod=readonly", "./...", "-v"]
diff --git a/ci/docker/replaceexpiry.sh b/ci/docker/replaceexpiry.sh
old mode 100644
new mode 100755
diff --git a/ci/docker/starteduvpn.sh b/ci/docker/starteduvpn.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3