From 05da050b5f9aec6d8e2f4fb146090dbe92713285 Mon Sep 17 00:00:00 2001 From: Stavros Date: Sun, 19 Jul 2026 00:48:02 +0300 Subject: [PATCH 1/2] refactor: use x-tinyauth-location header in tinyauth auth request --- README.md | 1 + .../nginx/tinyauth-location.conf.sample | 8 +++++--- .../nginx/tinyauth-server.conf.sample | 20 +------------------ 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index d039eb69..8d282aad 100644 --- a/README.md +++ b/README.md @@ -436,6 +436,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.07.26:** - Use new X-Tinyauth-Location header in Tinyauth locations. * **10.07.26:** - Add support for Let's Encrypt cert profiles. Run certbot twice daily with a random delay. * **19.06.26:** - Add support for mijn.host dns validation. * **01.06.26:** - Remove obsolete old cert check logic. diff --git a/root/defaults/nginx/tinyauth-location.conf.sample b/root/defaults/nginx/tinyauth-location.conf.sample index f829c6d0..0bf7e99a 100644 --- a/root/defaults/nginx/tinyauth-location.conf.sample +++ b/root/defaults/nginx/tinyauth-location.conf.sample @@ -1,11 +1,13 @@ -## Version 2025/12/17 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/tinyauth-location.conf.sample +## Version 2026/07/19 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/tinyauth-location.conf.sample # Make sure that your tinyauth container is in the same user defined bridge network and is named tinyauth # Rename /config/nginx/proxy-confs/tinyauth.subdomain.conf.sample to /config/nginx/proxy-confs/tinyauth.subdomain.conf ## Send a subrequest to tinyauth to verify if the user is authenticated and has permission to access the resource auth_request /tinyauth; - -## If the subreqest returns 200 pass to the backend, if the subrequest returns 401 redirect to the portal +auth_request_set $redirection_url $upstream_http_x_tinyauth_location; +error_page 401 403 =302 $redirection_url; + +## If the subreqest returns 200 pass to the backend, if the subrequest returns 401 redirect to the URL tinyauth returns in the X-Tinyauth-Location header error_page 401 = @tinyauth_login; ## Translate the user information response headers from the auth subrequest into variables diff --git a/root/defaults/nginx/tinyauth-server.conf.sample b/root/defaults/nginx/tinyauth-server.conf.sample index a4256c82..fc1a746b 100644 --- a/root/defaults/nginx/tinyauth-server.conf.sample +++ b/root/defaults/nginx/tinyauth-server.conf.sample @@ -1,4 +1,4 @@ -## Version 2025/06/08 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/tinyauth-server.conf.sample +## Version 2026/07/19 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/tinyauth-server.conf.sample # Make sure that your tinyauth container is in the same user defined bridge network and is named tinyauth # Rename /config/nginx/proxy-confs/tinyauth.subdomain.conf.sample to /config/nginx/proxy-confs/tinyauth.subdomain.conf @@ -15,21 +15,3 @@ location /tinyauth { proxy_set_header x-forwarded-host $http_host; proxy_set_header x-forwarded-uri $request_uri; } - -# virtual location for tinyauth 401 redirects -location @tinyauth_login { - internal; - - ## Set the $target_url variable based on the original request - set_escape_uri $target_url $scheme://$http_host$request_uri; - - ## Set the $signin_url variable - set $domain $host; - if ($host ~* "^[^.]+\.([^.]+\..+)$") { - set $domain $1; - } - set $signin_url https://tinyauth.$domain/login?redirect_uri=$target_url; - - ## Redirect to login - return 302 $signin_url; -} From 84915dcfcf6e80414bf7fb33cb3dc2fd124ff40a Mon Sep 17 00:00:00 2001 From: Stavros Date: Sun, 19 Jul 2026 00:50:45 +0300 Subject: [PATCH 2/2] fix: update readme vars instead of main readme --- README.md | 1 - readme-vars.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d282aad..d039eb69 100644 --- a/README.md +++ b/README.md @@ -436,7 +436,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **19.07.26:** - Use new X-Tinyauth-Location header in Tinyauth locations. * **10.07.26:** - Add support for Let's Encrypt cert profiles. Run certbot twice daily with a random delay. * **19.06.26:** - Add support for mijn.host dns validation. * **01.06.26:** - Remove obsolete old cert check logic. diff --git a/readme-vars.yml b/readme-vars.yml index 5c3a9635..c7379b91 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -220,6 +220,7 @@ init_diagram: | "swag:latest" <- Base Images # changelog changelogs: + - {date: "19.07.26:", desc: "Use new X-Tinyauth-Location header in Tinyauth locations."} - {date: "10.07.26:", desc: "Add support for Let's Encrypt cert profiles. Run certbot twice daily with a random delay."} - {date: "19.06.26:", desc: "Add support for mijn.host dns validation."} - {date: "01.06.26:", desc: "Remove obsolete old cert check logic."}