From 1fcd8a7c1a694a134707ce667122834bcf03203e Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 13 Mar 2026 16:53:38 -0400 Subject: [PATCH] API errors will no longer redirect --- salt/manager/tools/sbin/soup | 2 +- salt/nginx/etc/nginx.conf | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 693c48505..a836a8e4b 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -88,7 +88,7 @@ check_err() { echo 'No route to host' ;; 160) - echo 'Incompatiable Elasticsearch upgrade' + echo 'Incompatible Elasticsearch upgrade' ;; 161) echo 'Required intermediate Elasticsearch upgrade not complete' diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index 0c0e4b463..f3b769104 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -387,15 +387,13 @@ http { error_page 429 = @error429; location @error401 { - if ($request_uri ~* (^/connect/.*|^/oauth2/.*)) { + if ($request_uri ~* (^/api/.*|^/connect/.*|^/oauth2/.*)) { return 401; } - if ($request_uri ~* ^/(?!(^/api/.*))) { - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains"; - } + add_header Strict-Transport-Security "max-age=31536000; includeSubDomains"; - if ($request_uri ~* ^/(?!(api/|login|auth|oauth2|$))) { + if ($request_uri ~* ^/(?!(login|auth|oauth2|$))) { add_header Set-Cookie "AUTH_REDIRECT=$request_uri;Path=/;Max-Age=14400"; } return 302 /auth/self-service/login/browser;