From 89a8f983fd8b6cd27c4905e6ace4c9a73ac2d3b6 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Mon, 7 Jun 2021 21:06:00 +0800 Subject: [PATCH] =?UTF-8?q?docs:=E6=9B=B4=E6=96=B0=E4=BA=91=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E7=9A=84nacos=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/nacos/DEFAULT_GROUP.zip | Bin 7778 -> 7803 bytes .../security/AuthorizationManager.java | 2 ++ ...GlobalFilter.java => JwtGlobalFilter.java} | 8 ++++---- .../security/ResourceServerConfig.java | 14 +++----------- .../SentinelConfiguration.java | 2 +- .../{WebUtils.java => ResponseUtils.java} | 5 ++--- 6 files changed, 12 insertions(+), 19 deletions(-) rename youlai-gateway/src/main/java/com/youlai/gateway/security/{AuthGlobalFilter.java => JwtGlobalFilter.java} (90%) rename youlai-gateway/src/main/java/com/youlai/gateway/{config => sentinel}/SentinelConfiguration.java (96%) rename youlai-gateway/src/main/java/com/youlai/gateway/util/{WebUtils.java => ResponseUtils.java} (89%) diff --git a/docs/nacos/DEFAULT_GROUP.zip b/docs/nacos/DEFAULT_GROUP.zip index 6ea4bb058a148c8ddd2699820ae830b13c955f23..8f407537c4f0ff4eea79f6e4a39157ceb5f594e4 100644 GIT binary patch delta 3073 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 NuiuXoj7$Dp{SP>cZdL#Q diff --git a/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java b/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java index 1be71ea39..5ba894a9f 100644 --- a/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java +++ b/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java @@ -25,6 +25,8 @@ import static com.youlai.common.constant.AuthConstants.AUTHORITY_PREFIX; /** * 网关自定义鉴权管理器 + * @author hxr + * @date 2021-06-07 */ @Component @AllArgsConstructor diff --git a/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthGlobalFilter.java b/youlai-gateway/src/main/java/com/youlai/gateway/security/JwtGlobalFilter.java similarity index 90% rename from youlai-gateway/src/main/java/com/youlai/gateway/security/AuthGlobalFilter.java rename to youlai-gateway/src/main/java/com/youlai/gateway/security/JwtGlobalFilter.java index c2cf4d806..593cd353c 100644 --- a/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthGlobalFilter.java +++ b/youlai-gateway/src/main/java/com/youlai/gateway/security/JwtGlobalFilter.java @@ -6,7 +6,7 @@ import cn.hutool.json.JSONUtil; import com.nimbusds.jose.JWSObject; import com.youlai.common.constant.AuthConstants; import com.youlai.common.result.ResultCode; -import com.youlai.gateway.util.WebUtils; +import com.youlai.gateway.util.ResponseUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; @@ -28,7 +28,7 @@ import reactor.core.publisher.Mono; */ @Component @Slf4j -public class AuthGlobalFilter implements GlobalFilter, Ordered { +public class JwtGlobalFilter implements GlobalFilter, Ordered { @Autowired private RedisTemplate redisTemplate; @@ -49,7 +49,7 @@ public class AuthGlobalFilter implements GlobalFilter, Ordered { && HttpMethod.DELETE.toString().equals(request.getMethodValue()) // 删除方法 && HttpMethod.PUT.toString().equals(request.getMethodValue()) // 修改方法 ) { - return WebUtils.writeErrorInfoToResponse(response, ResultCode.FORBIDDEN_OPERATION); + return ResponseUtils.writeErrorInfo(response, ResultCode.FORBIDDEN_OPERATION); } // 非JWT或者JWT为空不作处理 @@ -66,7 +66,7 @@ public class AuthGlobalFilter implements GlobalFilter, Ordered { String jti = jsonObject.getStr(AuthConstants.JWT_JTI); Boolean isBlack = redisTemplate.hasKey(AuthConstants.TOKEN_BLACKLIST_PREFIX + jti); if (isBlack) { - return WebUtils.writeErrorInfoToResponse(response, ResultCode.TOKEN_ACCESS_FORBIDDEN); + return ResponseUtils.writeErrorInfo(response, ResultCode.TOKEN_ACCESS_FORBIDDEN); } // 存在token且不是黑名单，request写入JWT的载体信息 diff --git a/youlai-gateway/src/main/java/com/youlai/gateway/security/ResourceServerConfig.java b/youlai-gateway/src/main/java/com/youlai/gateway/security/ResourceServerConfig.java index 76e61ad3e..8e9e79447 100644 --- a/youlai-gateway/src/main/java/com/youlai/gateway/security/ResourceServerConfig.java +++ b/youlai-gateway/src/main/java/com/youlai/gateway/security/ResourceServerConfig.java @@ -3,11 +3,9 @@ package com.youlai.gateway.security; import cn.hutool.core.codec.Base64; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.ArrayUtil; import com.youlai.common.constant.AuthConstants; import com.youlai.common.result.ResultCode; -import com.youlai.gateway.security.AuthorizationManager; -import com.youlai.gateway.util.WebUtils; +import com.youlai.gateway.util.ResponseUtils; import lombok.AllArgsConstructor; import lombok.Setter; import lombok.SneakyThrows; @@ -28,16 +26,10 @@ import org.springframework.security.web.server.SecurityWebFilterChain; import org.springframework.security.web.server.ServerAuthenticationEntryPoint; import org.springframework.security.web.server.authorization.ServerAccessDeniedHandler; import reactor.core.publisher.Mono; -import sun.misc.BASE64Decoder; -import sun.security.rsa.RSAPublicKeyImpl; import java.io.InputStream; -import java.io.ObjectInputStream; -import java.math.BigInteger; import java.security.KeyFactory; -import java.security.PublicKey; import java.security.interfaces.RSAPublicKey; -import java.security.spec.RSAPublicKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.List; @@ -83,7 +75,7 @@ public class ResourceServerConfig { ServerAccessDeniedHandler accessDeniedHandler() { return (exchange, denied) -> { Mono mono = Mono.defer(() -> Mono.just(exchange.getResponse())) - .flatMap(response -> WebUtils.writeErrorInfoToResponse(response, ResultCode.ACCESS_UNAUTHORIZED)); + .flatMap(response -> ResponseUtils.writeErrorInfo(response, ResultCode.ACCESS_UNAUTHORIZED)); return mono; }; } @@ -95,7 +87,7 @@ public class ResourceServerConfig { ServerAuthenticationEntryPoint authenticationEntryPoint() { return (exchange, e) -> { Mono mono = Mono.defer(() -> Mono.just(exchange.getResponse())) - .flatMap(response -> WebUtils.writeErrorInfoToResponse(response, ResultCode.TOKEN_INVALID_OR_EXPIRED)); + .flatMap(response -> ResponseUtils.writeErrorInfo(response, ResultCode.TOKEN_INVALID_OR_EXPIRED)); return mono; }; } diff --git a/youlai-gateway/src/main/java/com/youlai/gateway/config/SentinelConfiguration.java b/youlai-gateway/src/main/java/com/youlai/gateway/sentinel/SentinelConfiguration.java similarity index 96% rename from youlai-gateway/src/main/java/com/youlai/gateway/config/SentinelConfiguration.java rename to youlai-gateway/src/main/java/com/youlai/gateway/sentinel/SentinelConfiguration.java index 8d55160af..59389d615 100644 --- a/youlai-gateway/src/main/java/com/youlai/gateway/config/SentinelConfiguration.java +++ b/youlai-gateway/src/main/java/com/youlai/gateway/sentinel/SentinelConfiguration.java @@ -1,4 +1,4 @@ -package com.youlai.gateway.config; +package com.youlai.gateway.sentinel; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager; diff --git a/youlai-gateway/src/main/java/com/youlai/gateway/util/WebUtils.java b/youlai-gateway/src/main/java/com/youlai/gateway/util/ResponseUtils.java similarity index 89% rename from youlai-gateway/src/main/java/com/youlai/gateway/util/WebUtils.java rename to youlai-gateway/src/main/java/com/youlai/gateway/util/ResponseUtils.java index efb7b1936..8551d3fcf 100644 --- a/youlai-gateway/src/main/java/com/youlai/gateway/util/WebUtils.java +++ b/youlai-gateway/src/main/java/com/youlai/gateway/util/ResponseUtils.java @@ -16,11 +16,10 @@ import java.nio.charset.Charset; /** * @Author haoxr * @Date 2021-01-29 13:30 - * @Version 1.0.0 */ -public class WebUtils { +public class ResponseUtils { - public static Mono writeErrorInfoToResponse(ServerHttpResponse response,ResultCode resultCode){ + public static Mono writeErrorInfo(ServerHttpResponse response, ResultCode resultCode){ response.setStatusCode(HttpStatus.OK); response.getHeaders().set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); response.getHeaders().set("Access-Control-Allow-Origin", "*");