diff --git a/volumes/conf.d/code.zinomedia.de.conf b/volumes/conf.d/code.zinomedia.de.conf index c000a4b..a156d39 100644 --- a/volumes/conf.d/code.zinomedia.de.conf +++ b/volumes/conf.d/code.zinomedia.de.conf @@ -23,26 +23,27 @@ server { #include "snippets/enable-vouch-no-subdomain.conf"; #include "snippets/enable-vouch.conf"; + # send all requests to the `/validate` endpoint for authorization + auth_request /validate; + location = /validate { internal; proxy_pass https://validate.vouch.armos.zinomedia.de; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $http_host; + # be sure to pass the original host header + proxy_set_header Host $http_host; - # # be sure to pass the original host header - # proxy_set_header Host $http_host; + # Vouch Proxy only acts on the request headers + proxy_pass_request_body off; + proxy_set_header Content-Length ""; - # # Vouch Proxy only acts on the request headers - # proxy_pass_request_body off; - # proxy_set_header Content-Length ""; - # # optionally add X-Vouch-User as returned by Vouch Proxy along with the request - # auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; - # # these return values are used by the @error401 call - # auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt; - # auth_request_set $auth_resp_err $upstream_http_x_vouch_err; - # auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount; + # optionally add X-Vouch-User as returned by Vouch Proxy along with the request + auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; + + # these return values are used by the @error401 call + auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt; + auth_request_set $auth_resp_err $upstream_http_x_vouch_err; + auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount; } # if validate returns `401 not authorized` then forward the request to the error401block @@ -76,9 +77,6 @@ server { # return 302 https://vouch.armos.zinomedia.de/login?url=$scheme://$http_host$request_uri&vouch-failcount=$auth_resp_failcount&X-Vouch-Token=$auth_resp_jwt&error=$auth_resp_err; # } location / { - # send all requests to the `/validate` endpoint for authorization - auth_request /validate; - resolver 127.0.0.11; set $upstream "http://code-server:8443"; diff --git a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf index 4f16ea1..2ea1e57 100644 --- a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf +++ b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf @@ -23,24 +23,24 @@ server { proxy_pass http://vouch:9090/validate; # be sure to pass the original host header - proxy_set_header Host $http_host; + # proxy_set_header Host $http_host; - # Vouch Proxy only acts on the request headers - proxy_pass_request_body off; - proxy_set_header Content-Length ""; + # # Vouch Proxy only acts on the request headers + # proxy_pass_request_body off; + # proxy_set_header Content-Length ""; - # optionally add X-Vouch-User as returned by Vouch Proxy along with the request - auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; + # # optionally add X-Vouch-User as returned by Vouch Proxy along with the request + # auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; - # these return values are used by the @error401 call - auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt; - auth_request_set $auth_resp_err $upstream_http_x_vouch_err; - auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount; + # # these return values are used by the @error401 call + # auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt; + # auth_request_set $auth_resp_err $upstream_http_x_vouch_err; + # auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $http_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-Proto $scheme; + # proxy_set_header X-Forwarded-Host $http_host; } # location / {