This commit is contained in:
zino
2023-12-06 00:22:59 +01:00
parent 232a197661
commit f5b1477205
2 changed files with 11 additions and 70 deletions

View File

@@ -21,63 +21,8 @@ server {
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:;" always; add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:;" always;
#include "snippets/enable-vouch-no-subdomain.conf"; #include "snippets/enable-vouch-no-subdomain.conf";
#include "snippets/enable-vouch.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/validate";
# be sure to pass the original host header
#proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-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;
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 = /validate {
# # forward the /validate request to Vouch Proxy
# proxy_pass https://validate.vouch.armos.zinomedia.de;
# # 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;
# 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 / { location / {
resolver 127.0.0.11; resolver 127.0.0.11;
set $upstream "http://code-server:8443"; set $upstream "http://code-server:8443";
@@ -92,8 +37,6 @@ server {
proxy_read_timeout 3600; proxy_read_timeout 3600;
proxy_pass $upstream; proxy_pass $upstream;
} }
} }
server { server {

View File

@@ -2,12 +2,10 @@
auth_request /validate; auth_request /validate;
location = /validate { location = /validate {
# forward the /validate request to Vouch Proxy internal;
proxy_pass https://validate.vouch.armos.zinomedia.de:443; proxy_pass "https://validate.vouch.armos.zinomedia.de/validate";
# be sure to pass the original host header
proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-Host $http_host;
# Vouch Proxy only acts on the request headers # Vouch Proxy only acts on the request headers
proxy_pass_request_body off; proxy_pass_request_body off;
proxy_set_header Content-Length ""; proxy_set_header Content-Length "";
@@ -22,9 +20,9 @@ location = /validate {
} }
# if validate returns `401 not authorized` then forward the request to the error401block # if validate returns `401 not authorized` then forward the request to the error401block
# error_page 401 = @error401; error_page 401 = @error401;
# location @error401 { location @error401 {
# # redirect to Vouch Proxy for login # 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; 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;
# } }