From 954d46efb1f98b978d706ba295d2eed76f9ee41b Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Fri, 5 Jan 2024 11:58:42 +0100 Subject: [PATCH] Added test root certs and logic for beam to use test brokers --- bbmri/modules/eric-compose.yml | 2 +- bbmri/modules/eric-setup.sh | 7 +++++++ bbmri/modules/eric.test.root.crt.pem | 20 ++++++++++++++++++++ bbmri/modules/gbn-compose.yml | 2 +- bbmri/modules/gbn-setup.sh | 6 ++++++ bbmri/modules/gbn.test.root.crt.pem | 20 ++++++++++++++++++++ 6 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 bbmri/modules/eric.test.root.crt.pem create mode 100644 bbmri/modules/gbn.test.root.crt.pem diff --git a/bbmri/modules/eric-compose.yml b/bbmri/modules/eric-compose.yml index 2bf7dd6..3d31d84 100644 --- a/bbmri/modules/eric-compose.yml +++ b/bbmri/modules/eric-compose.yml @@ -32,5 +32,5 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/bbmri/modules/eric.root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/bbmri/modules/${ERIC_ROOT_CERT}.root.crt.pem:/conf/root.crt.pem:ro diff --git a/bbmri/modules/eric-setup.sh b/bbmri/modules/eric-setup.sh index 364281b..b45741e 100644 --- a/bbmri/modules/eric-setup.sh +++ b/bbmri/modules/eric-setup.sh @@ -6,6 +6,13 @@ if [ "${ENABLE_ERIC}" == "true" ]; then # Set required variables ERIC_BROKER_ID=broker.bbmri.samply.de + ERIC_ROOT_CERT=eric + + if [ "{$ENABLE_TEST}" == "true" ]; then + ERIC_BROKER_ID=broker-test.bbmri-test.samply.de + ERIC_ROOT_CERT=eric.test + fi + ERIC_BROKER_URL=https://${ERIC_BROKER_ID} ERIC_PROXY_ID=${SITE_ID}.${ERIC_BROKER_ID} ERIC_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" diff --git a/bbmri/modules/eric.test.root.crt.pem b/bbmri/modules/eric.test.root.crt.pem new file mode 100644 index 0000000..2c4f9f1 --- /dev/null +++ b/bbmri/modules/eric.test.root.crt.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDNTCCAh2gAwIBAgIUJ0g7k2vrdAwNTU38S1/mU8NO26MwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjMwNzEwMTIyMzQxWhcNMzMw +NzA3MTIyNDExWjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBALMvc/fApbsAl+/NXDszNgffNR5llAb9CfxzdnRn +ryoBqZdPevBYZZfKBARRKjFbXRDdPWbE7erDeo1LiCM6PObXCuT9wmGWJtvfkmqW +3Z/a75e4r360kceMEGVn4kWpi9dz8s7+oXVZURjW2r13h6pq6xQNZDNlXmpR8wHG +58TSrQC4n1vzdSwMWdptgOA8Sw8adR7ZJI1yNZpmynB2QolKKNESI7FcSKC/+b+H +LoPkseAwQG9yJo23qEw1GZS67B47iKIqX2wp9VLQobHw7ncrhKXQLSWq973k/Swp +7lBdfOsTouf72flLiF1HbdOLcFDmWgIbf5scj2HaQe8b/UcCAwEAAaN7MHkwDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHYxBJiJZieW +e6G1vwn6Q36/crgNMB8GA1UdIwQYMBaAFHYxBJiJZieWe6G1vwn6Q36/crgNMBYG +A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQCN6WVNYpWJ +6Z1Ee+otLZYMXhjyR6NUQ5s0aHiug97gB8mTiNlgXiiTgipCbofEmENgh1inYrPC +WfdXxqOaekSXCQW6nSO1KtBzEYtkN5LrN1cjKqt51P2DbkllinK37wwCS2Kfup1+ +yjhTRxrehSIfsMVK6bTUeSoc8etkgwErZpORhlpqZKWhmOwcMpgsYJJOLhUetqc1 +UNe/254bc0vqHEPT6VI/86c7qAmk1xR0RUfrnKAEqZtUeuoj2fe1L/6yOB16fxt5 +3V3oim7EO6eZCTjDo9fU5DaFiqSMe7WVdr03Na0cWet60XKRH/xaiC6gMWdHWcbh +vZdXnV1qjlM2 +-----END CERTIFICATE----- \ No newline at end of file diff --git a/bbmri/modules/gbn-compose.yml b/bbmri/modules/gbn-compose.yml index 47b1d36..921fd89 100644 --- a/bbmri/modules/gbn-compose.yml +++ b/bbmri/modules/gbn-compose.yml @@ -32,5 +32,5 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/bbmri/modules/gbn.root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/bbmri/modules/${GBN_ROOT_CERT}.root.crt.pem:/conf/root.crt.pem:ro diff --git a/bbmri/modules/gbn-setup.sh b/bbmri/modules/gbn-setup.sh index d3edd74..b375416 100644 --- a/bbmri/modules/gbn-setup.sh +++ b/bbmri/modules/gbn-setup.sh @@ -6,6 +6,12 @@ if [ "${ENABLE_GBN}" == "true" ]; then # Set required variables GBN_BROKER_ID=broker.bbmri.de + GBN_ROOT_CERT=gbn + if [ "{$ENABLE_TEST}" == "true" ]; then + GBN_BROKER_ID=broker-test.bbmri.de + GBN_ROOT_CERT=gbn.test + fi + GBN_BROKER_URL=https://${GBN_BROKER_ID} GBN_PROXY_ID=${SITE_ID}.${GBN_BROKER_ID} GBN_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" diff --git a/bbmri/modules/gbn.test.root.crt.pem b/bbmri/modules/gbn.test.root.crt.pem new file mode 100644 index 0000000..b83e03d --- /dev/null +++ b/bbmri/modules/gbn.test.root.crt.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDNTCCAh2gAwIBAgIUQJjusHYR89Xas+kRbg41aHZxfmcwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjMwODIxMDk1MDI1WhcNMzMw +ODE4MDk1MDU1WjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAMP0jt2tSk23Bu+QeogqlFwjbMnqwRcWGKAOF4ch +aOK2B5u/BnpqIZDZbhfSIJTv8DPe3+nA2VqRfSiW3HbV0auqxx1ii2ZmHYbvO2P/ +Jj6hyIiYYGqCMRVXk7iB+DfMysQEaSJO/7lJSprlVQCl0u7MAQ4q/szVNwcCm2Xi +iE00Wlota2xTYjnJHYjeaLZL4kQsjqW2aCWHG4q77Z4NXT+lXN9XXedgoXLhuwWl +UyHhXPjyCVu1iFzsXwSTodPAETGoInRYMqMA7PrbHZu1b2Jz0BwCQ+bark1td+Mf +l3uP0QduhZnH6zGO0KyUFRzeiesgabv5bgUeSSsIOVjnLJUCAwEAAaN7MHkwDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFME99nPh1Vuo +7eRaymL2Ps7qGxIdMB8GA1UdIwQYMBaAFME99nPh1Vuo7eRaymL2Ps7qGxIdMBYG +A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQB0WG0xT00R +5CA0tVHaNo8bQuAXytu566TspKc5vVd3r6mglj/MiSSQG2MVz+GUU6LnnApgln1P +pvZuyaldB0QdTTLeJVMr/eFtZonlxqcxkj+VW2Y7mRHT7Xx9GQvzKYvSK5m/+xzH +pAQl8AirgkoZ5b+ltlzM0pDAH204xj3/skmGqM/o0FKzRtpetHYkZPiquHCmO2Cp +nTMkv7c2qu5t2Dm5q0Tmb7ZRoA1yIYhDn/UfhTAVWQnoMfXK8oB9nkRRb7pAfOXo +W1K4A+oWqKrJwfIH/Ycnw7hu8hPuGOyIN/PLnLpJp9M2I67vywp5lIvFib4UukyJ +wJw6/iTienIA +-----END CERTIFICATE----- \ No newline at end of file