aidlab/aida-gateway
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xupei
2026-05-29 19:04:30 +08:00
parent 574ce00657 5a1244ddd6
commit 5d68bca9e7
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/aida/gateway/filter/LogoutBlacklistWebFilter.java
View File

@@ -32,16 +32,25 @@ public class LogoutBlacklistWebFilter implements WebFilter {
@Override @Override
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) { public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
// 仅处理 /internal/logout 路径 String path = exchange.getRequest().getURI().getPath();
if (!exchange.getRequest().getURI().getPath().equals("/internal/logout")) {
// /internal/logout → 拉黑用户
// /internal/clear-blacklist → 清除黑名单
if ("/internal/logout".equals(path)) {
return handleLogout(exchange, chain);
}
if ("/internal/clear-blacklist".equals(path)) {
return handleClearBlacklist(exchange, chain);
}
return chain.filter(exchange); return chain.filter(exchange);
} }
private Mono<Void> handleLogout(ServerWebExchange exchange, WebFilterChain chain) {
if (!"POST".equalsIgnoreCase(exchange.getRequest().getMethod().name())) { if (!"POST".equalsIgnoreCase(exchange.getRequest().getMethod().name())) {
return chain.filter(exchange); return chain.filter(exchange);
} }
// 优先从请求头读取 X-User-Id，其次从 query param 读取 userId（兼容不同客户端调用方式）
String userId = exchange.getRequest().getHeaders().getFirst(AuthConstants.USER_ID_HEADER); String userId = exchange.getRequest().getHeaders().getFirst(AuthConstants.USER_ID_HEADER);
if (userId == null || userId.isBlank()) { if (userId == null || userId.isBlank()) {
userId = exchange.getRequest().getQueryParams().getFirst("userId"); userId = exchange.getRequest().getQueryParams().getFirst("userId");
@@ -51,8 +60,6 @@ public class LogoutBlacklistWebFilter implements WebFilter {
} }
String blacklistKey = AuthConstants.BLACKLIST_PREFIX + userId; String blacklistKey = AuthConstants.BLACKLIST_PREFIX + userId;
// 黑名单 TTL 设为 7 天（与 JWT 有效期保持一致）
String finalUserId = userId; String finalUserId = userId;
return redisTemplate.opsForValue() return redisTemplate.opsForValue()
.set(blacklistKey, "1") .set(blacklistKey, "1")
@@ -65,6 +72,30 @@ public class LogoutBlacklistWebFilter implements WebFilter {
}); });
} }
private Mono<Void> handleClearBlacklist(ServerWebExchange exchange, WebFilterChain chain) {
if (!"POST".equalsIgnoreCase(exchange.getRequest().getMethod().name())) {
return chain.filter(exchange);
}
String userId = exchange.getRequest().getHeaders().getFirst(AuthConstants.USER_ID_HEADER);
if (userId == null || userId.isBlank()) {
userId = exchange.getRequest().getQueryParams().getFirst("userId");
}
if (userId == null || userId.isBlank()) {
return writeResponse(exchange, HttpStatus.BAD_REQUEST, "{\"code\":400,\"message\":\"userId required\"}");
}
String blacklistKey = AuthConstants.BLACKLIST_PREFIX + userId;
String finalUserId = userId;
return redisTemplate.delete(blacklistKey)
.then(writeResponse(exchange, HttpStatus.OK, "{\"code\":200,\"message\":\"ok\"}"))
.onErrorResume(e -> {
log.error("Failed to clear blacklist, userId={}", finalUserId, e);
return writeResponse(exchange, HttpStatus.INTERNAL_SERVER_ERROR,
"{\"code\":500,\"message\":\"internal error\"}");
});
}
private Mono<Void> writeResponse(ServerWebExchange exchange, HttpStatus status, String body) { private Mono<Void> writeResponse(ServerWebExchange exchange, HttpStatus status, String body) {
exchange.getResponse().setStatusCode(status); exchange.getResponse().setStatusCode(status);
exchange.getResponse().getHeaders().setContentType(MediaType.APPLICATION_JSON); exchange.getResponse().getHeaders().setContentType(MediaType.APPLICATION_JSON);