github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:halo-dev/halo into fix-backup-function

pull/565/head
johnniang 2020-02-11 21:32:56 +08:00
parent 078e3b3013 84b6c2aa14
commit e0c12a23ee
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
View File

@ -236,8 +236,7 @@ public class WebMvcAutoConfiguration extends WebMvcConfigurationSupport {
private void initBlackPatterns() {
String uploadUrlPattern = ensureBoth(haloProperties.getUploadUrlPrefix(), URL_SEPARATOR) + "**";
String adminPathPattern = ensureBoth(haloProperties.getAdminPath(), URL_SEPARATOR) + "**";
String adminPathPattern = ensureBoth(haloProperties.getAdminPath(), URL_SEPARATOR) + "?*/**";
blackPatterns.add("/themes/**");
blackPatterns.add("/js/**");

3
src/main/java/run/halo/app/controller/content/MainController.java
View File

@ -11,6 +11,7 @@ import run.halo.app.model.properties.BlogProperties;
import run.halo.app.model.support.HaloConst;
import run.halo.app.service.OptionService;
import run.halo.app.service.UserService;
import run.halo.app.utils.HaloUtils;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@ -48,7 +49,7 @@ public class MainController {
@GetMapping("${halo.admin-path:admin}")
public void admin(HttpServletResponse response) throws IOException {
String adminIndexRedirectUri = StringUtils.appendIfMissing(this.haloProperties.getAdminPath(), "/") + INDEX_REDIRECT_URI;
String adminIndexRedirectUri = HaloUtils.ensureBoth(haloProperties.getAdminPath(), HaloUtils.URL_SEPARATOR) + INDEX_REDIRECT_URI;
response.sendRedirect(adminIndexRedirectUri);
}

24
src/test/java/run/halo/app/conf/AntPathMatcherTest.java Normal file
View File

@ -0,0 +1,24 @@
package run.halo.app.conf;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.util.AntPathMatcher;
/**
* Ant path matcher test.
*
* @author johnniang
*/
public class AntPathMatcherTest {
private final AntPathMatcher pathMatcher = new AntPathMatcher();
@Test
public void matchTest() {
Assert.assertFalse(pathMatcher.match("/admin/?*/**", "/admin"));
Assert.assertFalse(pathMatcher.match("/admin/?*/**", "/admin/"));
Assert.assertTrue(pathMatcher.match("/admin/?*/**", "/admin/index.html"));
Assert.assertTrue(pathMatcher.match("/admin/?*/**", "/admin/index.html/more"));
}
}