diff --git a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf index ee9b36d..b53f0c9 100644 --- a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf +++ b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf @@ -22,20 +22,20 @@ server { # forward the /validate request to Vouch Proxy proxy_pass http://vouch:9090/validate; - # 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; + # # 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; } # location = /validate { @@ -59,12 +59,12 @@ server { # } # if validate returns `401 not authorized` then forward the request to the error401block - error_page 401 = @error401; + # error_page 401 = @error401; - location @error401 { - # redirect to Vouch Proxy for login - 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 @error401 { + # # redirect to Vouch Proxy for login + # 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; + # } } server { diff --git a/volumes/snippets/enable-vouch.conf b/volumes/snippets/enable-vouch.conf index 6b06057..e4161cf 100644 --- a/volumes/snippets/enable-vouch.conf +++ b/volumes/snippets/enable-vouch.conf @@ -1,29 +1,29 @@ # send all requests to the `/validate` endpoint for authorization auth_request /validate; -location = /validate { +location = /validate { + # 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 ""; + + # 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; + proxy_pass https://validate.vouch.armos.zinomedia.de:443; - - # # 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 ""; - - # # 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 -# error_page 401 = @error401; +if validate returns `401 not authorized` then forward the request to the error401block +error_page 401 = @error401; -# location @error401 { -# # redirect to Vouch Proxy for login -# 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; -# } \ No newline at end of file +location @error401 { + # redirect to Vouch Proxy for login + 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; +} \ No newline at end of file