From fd2db7498f1374c75c9176e8819843000bb9b7ca Mon Sep 17 00:00:00 2001 From: Dmitriymush Date: Tue, 12 Jan 2021 11:55:51 +0200 Subject: [PATCH 1/2] Fixed: "/static/" included to acl path_beg --- docker/haproxy/config/haproxy.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/haproxy/config/haproxy.cfg b/docker/haproxy/config/haproxy.cfg index 63c566086e..663d19a59c 100644 --- a/docker/haproxy/config/haproxy.cfg +++ b/docker/haproxy/config/haproxy.cfg @@ -58,7 +58,7 @@ frontend http-in acl transport_http_acl path_beg /api/v1/ acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/ - acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ + acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/ redirect scheme https if !letsencrypt_http_acl !transport_http_acl { env(FORCE_HTTPS_REDIRECT) -m str true } @@ -76,7 +76,7 @@ frontend https_in reqadd X-Forwarded-Proto:\ https acl transport_http_acl path_beg /api/v1/ - acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ + acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/ use_backend tb-http-backend if transport_http_acl use_backend tb-api-backend if tb_api_acl From 20a4163cce171278978b4c37d4c834980a9cbbbe Mon Sep 17 00:00:00 2001 From: Dmitriymush Date: Wed, 13 Jan 2021 16:40:50 +0200 Subject: [PATCH 2/2] fix additions --- docker/haproxy/config/haproxy.cfg | 4 ++-- ui-ngx/proxy.conf.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/haproxy/config/haproxy.cfg b/docker/haproxy/config/haproxy.cfg index 663d19a59c..5ff76cfdcd 100644 --- a/docker/haproxy/config/haproxy.cfg +++ b/docker/haproxy/config/haproxy.cfg @@ -58,7 +58,7 @@ frontend http-in acl transport_http_acl path_beg /api/v1/ acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/ - acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/ + acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/ redirect scheme https if !letsencrypt_http_acl !transport_http_acl { env(FORCE_HTTPS_REDIRECT) -m str true } @@ -76,7 +76,7 @@ frontend https_in reqadd X-Forwarded-Proto:\ https acl transport_http_acl path_beg /api/v1/ - acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/ + acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/ use_backend tb-http-backend if transport_http_acl use_backend tb-api-backend if tb_api_acl diff --git a/ui-ngx/proxy.conf.js b/ui-ngx/proxy.conf.js index 5be6bde1d1..265b183225 100644 --- a/ui-ngx/proxy.conf.js +++ b/ui-ngx/proxy.conf.js @@ -27,15 +27,15 @@ const PROXY_CONFIG = { "target": ruleNodeUiforwardUrl, "secure": false, }, - "/oauth2": { + "/static/widgets": { "target": forwardUrl, "secure": false, }, - "/login/oauth2": { + "/oauth2": { "target": forwardUrl, "secure": false, }, - "/static": { + "/login/oauth2": { "target": forwardUrl, "secure": false, },