From f646bfc0f53e6d86e18d240ee6bfd47afb8edbb6 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 03 Dec 2022 13:14:59 +0800
Subject: [PATCH] !286 此处修改曾导致 nacos修改xss开关时，spring容器未重启，filter仍起效。故增加参数判断，参数刷新后，xss开关正常关闭。 Merge pull request !286 from ylwang/N/A
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
index 8517c79..101de63 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
@@ -1,25 +1,24 @@
package com.ruoyi.gateway.filter;
-import javax.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.core.Ordered;
-import org.springframework.data.redis.core.ValueOperations;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
-import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.utils.SecurityUtils;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.constant.TokenConstants;
+import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
+import io.jsonwebtoken.Claims;
import reactor.core.publisher.Mono;
/**
@@ -32,17 +31,13 @@
{
private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
- private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 60;
-
// 排除过滤的 uri 地址，nacos自行添加
@Autowired
private IgnoreWhiteProperties ignoreWhite;
- @Resource(name = "stringRedisTemplate")
- private ValueOperations<String, String> sops;
-
@Autowired
private RedisService redisService;
+
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
@@ -61,24 +56,30 @@
{
return unauthorizedResponse(exchange, "令牌不能为空");
}
- String userStr = sops.get(getTokenKey(token));
- if (StringUtils.isEmpty(userStr))
+ Claims claims = JwtUtils.parseToken(token);
+ if (claims == null)
+ {
+ return unauthorizedResponse(exchange, "令牌已过期或验证不正确！");
+ }
+ String userkey = JwtUtils.getUserKey(claims);
+ boolean islogin = redisService.hasKey(getTokenKey(userkey));
+ if (!islogin)
{
return unauthorizedResponse(exchange, "登录状态已过期");
}
- JSONObject cacheObj = JSONObject.parseObject(userStr);
- String userid = cacheObj.getString("userid");
- String username = cacheObj.getString("username");
+ String userid = JwtUtils.getUserId(claims);
+ String username = JwtUtils.getUserName(claims);
if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username))
{
return unauthorizedResponse(exchange, "令牌验证失败");
}
- // 设置过期时间
- redisService.expire(getTokenKey(token), EXPIRE_TIME);
// 设置用户信息到请求
- addHeader(mutate, CacheConstants.DETAILS_USER_ID, userid);
- addHeader(mutate, CacheConstants.DETAILS_USERNAME, username);
+ addHeader(mutate, SecurityConstants.USER_KEY, userkey);
+ addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid);
+ addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username);
+ // 内部请求来源参数清除
+ removeHeader(mutate, SecurityConstants.FROM_SOURCE);
return chain.filter(exchange.mutate().request(mutate.build()).build());
}
@@ -91,6 +92,11 @@
String valueStr = value.toString();
String valueEncode = ServletUtils.urlEncode(valueStr);
mutate.header(name, valueEncode);
+ }
+
+ private void removeHeader(ServerHttpRequest.Builder mutate, String name)
+ {
+ mutate.headers(httpHeaders -> httpHeaders.remove(name)).build();
}
private Mono<Void> unauthorizedResponse(ServerWebExchange exchange, String msg)
@@ -112,8 +118,13 @@
*/
private String getToken(ServerHttpRequest request)
{
- String token = request.getHeaders().getFirst(CacheConstants.TOKEN_AUTHENTICATION);
- return SecurityUtils.replaceTokenPrefix(token);
+ String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION);
+ // 如果前端设置了令牌前缀，则裁剪掉前缀
+ if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX))
+ {
+ token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY);
+ }
+ return token;
}
@Override
--
Gitblit v1.9.3