From d812c74535344de8a2e2aa48953d72b1658a3ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 13 Dec 2024 17:11:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20xss=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/common/web/filter/XssFilter.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java index 6571deaf..7f7b4de8 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java @@ -1,9 +1,9 @@ package org.dromara.common.web.filter; +import cn.hutool.core.collection.CollUtil; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.web.config.properties.XssProperties; @@ -25,17 +25,7 @@ public class XssFilter implements Filter { public List excludes = new ArrayList<>(); @Override - public void init(FilterConfig filterConfig) throws ServletException { - XssProperties properties = SpringUtils.getBean(XssProperties.class); - HttpServletRequest request = ServletUtils.getRequest(); - // 从请求头获取gateway转发的服务前缀 - String prefix = StringUtils.blankToDefault(request.getHeader("X-Forwarded-Prefix"), ""); - List excludeUrls = properties.getExcludeUrls() - .stream() - .filter(x -> StringUtils.startsWith(x, prefix)) - .map(x -> x.replaceFirst(prefix, StringUtils.EMPTY)) - .toList(); - excludes.addAll(excludeUrls); + public void init(FilterConfig filterConfig) { } @Override @@ -58,6 +48,16 @@ public class XssFilter implements Filter { if (method == null || HttpMethod.GET.matches(method) || HttpMethod.DELETE.matches(method)) { return true; } + if (CollUtil.isEmpty(excludes)) { + XssProperties properties = SpringUtils.getBean(XssProperties.class); + // 从请求头获取gateway转发的服务前缀 + String prefix = StringUtils.blankToDefault(request.getHeader("X-Forwarded-Prefix"), ""); + List excludeUrls = properties.getExcludeUrls().stream() + .filter(x -> StringUtils.startsWith(x, prefix)) + .map(x -> x.replaceFirst(prefix, StringUtils.EMPTY)) + .toList(); + excludes.addAll(excludeUrls); + } return StringUtils.matches(url, excludes); }