diff --git a/inventories/chaosknoten/host_vars/keycloak.yaml b/inventories/chaosknoten/host_vars/keycloak.yaml index 68f37ba..944ea80 100644 --- a/inventories/chaosknoten/host_vars/keycloak.yaml +++ b/inventories/chaosknoten/host_vars/keycloak.yaml @@ -6,6 +6,7 @@ certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz certbot__certificate_domains: - "id.hamburg.ccc.de" - "keycloak-admin.hamburg.ccc.de" + - "invite.hamburg.ccc.de" certbot__new_cert_commands: - "systemctl reload nginx.service" @@ -15,3 +16,5 @@ nginx__configurations: content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/keycloak/nginx/id.hamburg.ccc.de.conf') }}" - name: keycloak-admin.hamburg.ccc.de content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf') }}" + - name: invite.hamburg.ccc.de + content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf') }}" diff --git a/playbooks/files/chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf b/playbooks/files/chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf new file mode 100644 index 0000000..4a9cfe6 --- /dev/null +++ b/playbooks/files/chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf @@ -0,0 +1,54 @@ +# partly generated 2022-01-08, Mozilla Guideline v5.6, nginx 1.17.7, OpenSSL 1.1.1k, intermediate configuration +# https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6 +# Also see: https://www.keycloak.org/server/reverseproxy +server { + # Listen on a custom port for the proxy protocol. + listen 8443 ssl http2 proxy_protocol; + # Make use of the ngx_http_realip_module to set the $remote_addr and + # $remote_port to the client address and client port, when using proxy + # protocol. + # First set our proxy protocol proxy as trusted. + set_real_ip_from 172.31.17.140; + # Then tell the realip_module to get the addreses from the proxy protocol + # header. + real_ip_header proxy_protocol; + + server_name invite.hamburg.ccc.de; + + ssl_certificate /etc/letsencrypt/live/invite.hamburg.ccc.de/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/invite.hamburg.ccc.de/privkey.pem; + # verify chain of trust of OCSP response using Root CA and Intermediate certs + ssl_trusted_certificate /etc/letsencrypt/live/invite.hamburg.ccc.de/chain.pem; + + # HSTS (ngx_http_headers_module is required) (63072000 seconds) + add_header Strict-Transport-Security "max-age=63072000" always; + + # To not have 502s sometimes when logging through PVE use bigger buffer_sizes. + # The error seemed to occur after logging in and out and in. Maybe related + # to Keycloak logout settings, but probably not. + # See: + # https://stackoverflow.com/questions/56126864/why-do-i-get-502-when-trying-to-authenticate + # https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size + proxy_buffer_size 128k; + proxy_buffers 8 128k; + + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Port 443; + # This is https in any case. + proxy_set_header X-Forwarded-Proto https; + # Hide the X-Forwarded header. + proxy_hide_header X-Forwarded; + # Assume we are the only Reverse Proxy (well using Proxy Protocol, but that + # is transparent). + # Also provide "_hidden" for by, since it's not relevant. + proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden"; + + # Redirect a user opening any not set location on invite.hamburg.ccc.de to the account management page. + + location / { + proxy_pass http://127.0.0.1:3000/; + } +} diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf index aabab4a..0c2aeb4 100644 --- a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf +++ b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf @@ -11,6 +11,7 @@ map $host $upstream_acme_challenge_host { hackertours.hamburg.ccc.de 172.31.17.148:31820; hamburg.ccc.de 172.31.17.151:31820; id.hamburg.ccc.de 172.31.17.144:31820; + invite.hamburg.ccc.de 172.31.17.144:31820; keycloak-admin.hamburg.ccc.de 172.31.17.144:31820; matrix.hamburg.ccc.de 172.31.17.150:31820; netbox.hamburg.ccc.de 172.31.17.149:31820; diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf index 77c6b14..a49e896 100644 --- a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf +++ b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf @@ -23,6 +23,7 @@ stream { cloud.hamburg.ccc.de cloud-intern.hamburg.ccc.de:8443; pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:8443; id.hamburg.ccc.de 172.31.17.144:8443; + invite.hamburg.ccc.de 172.31.17.144:8443; keycloak-admin.hamburg.ccc.de 172.31.17.144:8444; grafana.hamburg.ccc.de 172.31.17.145:8443; wiki.ccchh.net 172.31.17.146:8443; diff --git a/playbooks/templates/chaosknoten/configs/keycloak/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/keycloak/compose.yaml.j2 index 78eb438..ae197de 100644 --- a/playbooks/templates/chaosknoten/configs/keycloak/compose.yaml.j2 +++ b/playbooks/templates/chaosknoten/configs/keycloak/compose.yaml.j2 @@ -71,6 +71,59 @@ services: POSTGRES_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/keycloak/POSTGRES_PASSWORD", create=false, missing="error") }} POSTGRES_DB: keycloak + id-invite-web: + image: git.hamburg.ccc.de/ccchh/id-invite/id-invite:latest + command: web + restart: always + networks: + - web + - email + - keycloak + ports: + - 3000:3000 + environment: + - "APP_EMAIL_BASE_URI=http://id-invite-email:3000" + - "APP_KEYCLOAK_BASE_URI=http://id-invite-keycloak:3000" + - "IDINVITE_URL=https://invite.hamburg.ccc.de" + - "IDINVITE_KEYCLOAK_NAME=CCCHH ID" + - "IDINVITE_VALID_HOURS=50" + - "IDINVITE_SECRET={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/keycloak/IDINVITE_TOKEN_SECRET", create=false, missing="error") }}" + - "IDINVITE_DISCOVERY_URL=https://id.hamburg.ccc.de/realms/ccchh/.well-known/openid-configuration" + - "IDINVITE_CLIENT_ID=id-invite" + - "IDINVITE_CLIENT_SECRET={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/keycloak/IDINVITE_CLIENT_SECRET", create=false, missing="error") }}" + - "MAIL_FROM=no-reply@hamburg.ccc.de" + - "BOTTLE_HOST=0.0.0.0" + + id-invite-email: + image: git.hamburg.ccc.de/ccchh/id-invite/id-invite:latest + command: email + restart: always + networks: + - email + - web + environment: + - "IDINVITE_KEYCLOAK_NAME=CCCHH ID" + - "SMTP_HOSTNAME=cow.hamburg.ccc.de" + - "SMTP_USERNAME=no-reply@id.hamburg.ccc.de" + - "SMTP_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/keycloak/NO_REPLY_SMTP", create=false, missing="error") }}" + + id-invite-keycloak: + image: git.hamburg.ccc.de/ccchh/id-invite/id-invite:latest + command: keycloak + restart: always + networks: + - keycloak + environment: + - "KEYCLOAK_API_URL=http://keycloak:8080" + - "KEYCLOAK_API_USERNAME=id-invite" + - "KEYCLOAK_API_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/keycloak/IDINVITE_ADMIN_PASSWORD", create=false, missing="error") }}" + - "KEYCLOAK_API_REALM=ccchh" + + + networks: keycloak: external: false + web: + email: + external: false