Merge remote-tracking branch 'origin/dev-3.9' into dev-3.10

2 files changed, 3 insertions, 1 deletions

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 ca3bc8a..11ecce8 100644
--- a/src/main/java/net/geedge/confagent/controller/PrometheusController.java
+++ b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
@@ -129,6 +129,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);