From a246dc65d373570521d233cdcc52a785f60d868c Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@foxmail.com>
Date: Wed, 25 Dec 2019 13:41:52 +0800
Subject: [PATCH] fix: admin redirect incorrectly

---
 .../java/run/halo/app/config/HaloConfiguration.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/run/halo/app/config/HaloConfiguration.java b/src/main/java/run/halo/app/config/HaloConfiguration.java
index 6e0f872f3..925a816d8 100644
--- a/src/main/java/run/halo/app/config/HaloConfiguration.java
+++ b/src/main/java/run/halo/app/config/HaloConfiguration.java
@@ -25,6 +25,7 @@ import run.halo.app.security.handler.ContentAuthenticationFailureHandler;
 import run.halo.app.security.handler.DefaultAuthenticationFailureHandler;
 import run.halo.app.service.OptionService;
 import run.halo.app.service.UserService;
+import run.halo.app.utils.HaloUtils;
 import run.halo.app.utils.HttpClientUtils;
 
 import java.security.KeyManagementException;
@@ -102,7 +103,16 @@ public class HaloConfiguration {
                                                                StringCacheStore cacheStore) {
         ContentFilter contentFilter = new ContentFilter(haloProperties, optionService, cacheStore);
         contentFilter.setFailureHandler(new ContentAuthenticationFailureHandler());
-        contentFilter.addExcludeUrlPatterns("/api/**", "/install", "/version", "/admin/**", "/js/**", "/css/**");
+
+        String adminPattern = HaloUtils.ensureBoth(haloProperties.getAdminPath(), "/") + "**";
+
+        contentFilter.addExcludeUrlPatterns(
+                adminPattern,
+                "/api/**",
+                "/install",
+                "/version",
+                "/js/**",
+                "/css/**");
 
         FilterRegistrationBean<ContentFilter> contentFrb = new FilterRegistrationBean<>();
         contentFrb.addUrlPatterns("/*");