From d407b88b67bf66089e7c8c25d5ecefb7d979f03c Mon Sep 17 00:00:00 2001 From: kl Date: Fri, 8 Mar 2024 10:12:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20host=20=E9=BB=91=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/keking/web/filter/TrustHostFilter.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/cn/keking/web/filter/TrustHostFilter.java b/server/src/main/java/cn/keking/web/filter/TrustHostFilter.java index 21093638..e4012047 100644 --- a/server/src/main/java/cn/keking/web/filter/TrustHostFilter.java +++ b/server/src/main/java/cn/keking/web/filter/TrustHostFilter.java @@ -2,6 +2,7 @@ package cn.keking.web.filter; import cn.keking.config.ConfigConstants; import cn.keking.utils.WebUtils; + import java.io.IOException; import java.nio.charset.StandardCharsets; import javax.servlet.Filter; @@ -10,6 +11,8 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; + +import org.apache.commons.collections4.CollectionUtils; import org.springframework.core.io.ClassPathResource; import org.springframework.util.FileCopyUtils; @@ -38,7 +41,7 @@ public class TrustHostFilter implements Filter { String url = WebUtils.getSourceUrl(request); String host = WebUtils.getHost(url); assert host != null; - if (!isTrustHost(host) || isNotTrustHost(host)) { + if (isNotTrustHost(host)) { String html = this.notTrustHostHtmlView.replace("${current_host}", host); response.getWriter().write(html); response.getWriter().close(); @@ -47,12 +50,14 @@ public class TrustHostFilter implements Filter { } } - public boolean isTrustHost(String host) { - return !ConfigConstants.getTrustHostSet().isEmpty() && ConfigConstants.getTrustHostSet().contains(host); - } - public boolean isNotTrustHost(String host) { - return !ConfigConstants.getNotTrustHostSet().isEmpty() && ConfigConstants.getNotTrustHostSet().contains(host); + if (CollectionUtils.isNotEmpty(ConfigConstants.getNotTrustHostSet())) { + return ConfigConstants.getNotTrustHostSet().contains(host); + } + if (CollectionUtils.isNotEmpty(ConfigConstants.getTrustHostSet())) { + return !ConfigConstants.getTrustHostSet().contains(host); + } + return false; } @Override