This commit is contained in:
zino
2023-12-05 18:53:10 +01:00
parent 94efeecb48
commit fb022a345e
5 changed files with 16 additions and 31 deletions

View File

@@ -13,6 +13,7 @@ services:
- 443:443
volumes:
- ./volumes/conf.d:/etc/nginx/conf.d
- ./volumes/snippets:/etc/nginx/snippets
- ./volumes/html:/usr/share/nginx/html
- ./volumes/nginx.conf:/etc/nginx/nginx.conf
- ./volumes/logs:/var/log/nginx

View File

@@ -22,36 +22,11 @@ server {
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" 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;
# Vouch
# send all requests to the `/validate` endpoint for authorization
auth_request /validate;
location = /validate {
proxy_pass https://validate.vouch.armos.zinomedia.de;
# forward the /validate request to Vouch Proxy
#proxy_pass http://127.0.0.1:9090/validate;
# forward the /validate request to Vouch Proxy
#proxy_pass http://vouch:9090/validate;
#resolver 127.0.0.11;
#set $upstream "http://vouch:9090";
#proxy_pass $upstream;
# 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
@@ -62,7 +37,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 / {
resolver 127.0.0.11;
set $upstream "code-server:8443";

View File

@@ -17,11 +17,6 @@ server {
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
location = /validate {
# forward the /validate request to Vouch Proxy
#proxy_pass http://vouch:9090;
# be sure to pass the original host header
proxy_set_header Host $http_host;
@@ -37,6 +32,7 @@ server {
auth_request_set $auth_resp_err $upstream_http_x_vouch_err;
auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount;
# forward the /validate request to Vouch Proxy
resolver 127.0.0.11;
set $upstream "http://vouch:9090";
proxy_pass $upstream;

View File

View File

@@ -0,0 +1,14 @@
# send all requests to the `/validate` endpoint for authorization
auth_request /validate;
location = /validate {
proxy_pass https://validate.vouch.armos.zinomedia.de;
}
# 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;
}