From 4b21a3bc48963ef6e85de832ca05f7b6ee40f6dc Mon Sep 17 00:00:00 2001
From: wangfeiyu <wangfeiyu@cscec.com>
Date: Wed, 22 Feb 2023 08:54:10 +0800
Subject: [PATCH] 在方法isMatchedIp的参数中，当filter为null而ip非null/空时，报filter为null异常。把判断条件由&&改为||解决此bug。
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
index 08307fc..66e8d40 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
@@ -42,9 +42,14 @@
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
{
ServerHttpRequest request = exchange.getRequest();
+ // xss开关未开启 或 通过nacos关闭，不过滤
+ if (!xss.getEnabled())
+ {
+ return chain.filter(exchange);
+ }
// GET DELETE 不过滤
HttpMethod method = request.getMethod();
- if (method == null || method.matches("GET") || method.matches("DELETE"))
+ if (method == null || method == HttpMethod.GET || method == HttpMethod.DELETE)
{
return chain.filter(exchange);
}
@@ -108,7 +113,7 @@
/**
* 是否是Json请求
*
- * @param request
+ * @param exchange HTTP请求
*/
public boolean isJsonRequest(ServerWebExchange exchange)
{
--
Gitblit v1.9.3