From 2786f8e221cd613d5659aa29df41f8929d8ede35 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Fri, 2 Feb 2024 15:27:04 +0800 Subject: fix: NEZ-3403 TokenInterceptor 不拦截 springboot /error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. TokenInterceptor 不拦截 springboot /error 2. Prometheus authorization token 带有 “Bearer ” 前缀，校验时去除 --- src/main/java/net/geedge/confagent/config/ConfagentConfiguration.java | 2 +- src/main/java/net/geedge/confagent/controller/PrometheusController.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/geedge/confagent/config/ConfagentConfiguration.java b/src/main/java/net/geedge/confagent/config/ConfagentConfiguration.java index 4406529..1165051 100644 --- a/src/main/java/net/geedge/confagent/config/ConfagentConfiguration.java +++ b/src/main/java/net/geedge/confagent/config/ConfagentConfiguration.java @@ -34,6 +34,6 @@ public class ConfagentConfiguration implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(tokenInterceptor).addPathPatterns("/**"); + registry.addInterceptor(tokenInterceptor).addPathPatterns("/**").excludePathPatterns("/error"); } } diff --git a/src/main/java/net/geedge/confagent/controller/PrometheusController.java b/src/main/java/net/geedge/confagent/controller/PrometheusController.java index 0521638..fea04df 100644 --- a/src/main/java/net/geedge/confagent/controller/PrometheusController.java +++ b/src/main/java/net/geedge/confagent/controller/PrometheusController.java @@ -140,6 +140,8 @@ public class PrometheusController extends BaseController{ public void proxy(HttpServletRequest request, HttpServletResponse response){ String promPath = request.getServletPath().replace("/prometheus/proxy",""); String token = request.getHeader("Authorization"); + // prometheus authorization token 带有 “Bearer ” 前缀 + token = token.replaceFirst("^Bearer\\s", ""); R r = confagentUtil.checkToken(token); -- cgit v1.2.3