From e218367332cb79d7ae911d5aa67c058ac1d49129 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Wed, 21 Aug 2024 11:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=87=BA=E5=8F=8A=E5=BC=BA=E9=80=80?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/RedisTokenValidationFilter.java | 2 +- .../self/SelfAuthenticationProvider.java | 94 ++++++------------- 2 files changed, 32 insertions(+), 64 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/RedisTokenValidationFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/RedisTokenValidationFilter.java index e6e57a6c2..96daa9f28 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/RedisTokenValidationFilter.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/RedisTokenValidationFilter.java @@ -24,7 +24,7 @@ import java.util.Objects; * @author eightmonth@qq.com * @date 2024/3/7 17:30 */ -//@Component +@Component @AllArgsConstructor public class RedisTokenValidationFilter extends OncePerRequestFilter { private OAuth2AuthorizationService authorizationService; diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/self/SelfAuthenticationProvider.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/self/SelfAuthenticationProvider.java index 778128ab3..3a0b53a75 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/self/SelfAuthenticationProvider.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/self/SelfAuthenticationProvider.java @@ -96,11 +96,11 @@ public class SelfAuthenticationProvider implements AuthenticationProvider { .authorizedScopes(requestScopeSet) .authorizationGrant(passwordGrantAuthenticationToken); -// OAuth2Authorization.Builder authorizationBuilder = OAuth2Authorization.withRegisteredClient(registeredClient) -// .principalName(clientPrincipal.getName()) -// .authorizedScopes(requestScopeSet) -// .attribute(Principal.class.getName(), username) -// .authorizationGrantType(authorizationGrantType); + OAuth2Authorization.Builder authorizationBuilder = OAuth2Authorization.withRegisteredClient(registeredClient) + .principalName(clientPrincipal.getName()) + .authorizedScopes(requestScopeSet) + .attribute(Principal.class.getName(), username) + .authorizationGrantType(authorizationGrantType); // ----- Access token ----- @@ -112,68 +112,36 @@ public class SelfAuthenticationProvider implements AuthenticationProvider { OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, generatedAccessToken.getTokenValue(), generatedAccessToken.getIssuedAt(), generatedAccessToken.getExpiresAt(), tokenContext.getAuthorizedScopes()); -// if (generatedAccessToken instanceof ClaimAccessor) { -// authorizationBuilder.token(accessToken, (metadata) -> { -// metadata.put(OAuth2Authorization.Token.CLAIMS_METADATA_NAME, ((ClaimAccessor) generatedAccessToken).getClaims()); -// }); -// } else { -// authorizationBuilder.accessToken(accessToken); -// } + if (generatedAccessToken instanceof ClaimAccessor) { + authorizationBuilder.token(accessToken, (metadata) -> { + metadata.put(OAuth2Authorization.Token.CLAIMS_METADATA_NAME, ((ClaimAccessor) generatedAccessToken).getClaims()); + }); + } else { + authorizationBuilder.accessToken(accessToken); + } - // ----- Refresh token ----- -// OAuth2RefreshToken refreshToken = null; -// if (registeredClient.getAuthorizationGrantTypes().contains(AuthorizationGrantType.REFRESH_TOKEN) && -// // 不向公共客户端颁发刷新令牌 -// !clientPrincipal.getClientAuthenticationMethod().equals(ClientAuthenticationMethod.NONE)) { -// -// tokenContext = tokenContextBuilder.tokenType(OAuth2TokenType.REFRESH_TOKEN).build(); -// OAuth2Token generatedRefreshToken = this.tokenGenerator.generate(tokenContext); -// if (!(generatedRefreshToken instanceof OAuth2RefreshToken)) { -// Map map = new HashMap<>(); -// map.put("message", "无法生成刷新token，请联系管理员。"); -// return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER,"fdsafas", Instant.now(), Instant.now().plusNanos(1)), null, map); -// } -// -// refreshToken = (OAuth2RefreshToken) generatedRefreshToken; -// authorizationBuilder.refreshToken(refreshToken); -// } +// ----- Refresh token ----- + OAuth2RefreshToken refreshToken = null; + if (registeredClient.getAuthorizationGrantTypes().contains(AuthorizationGrantType.REFRESH_TOKEN) && + // 不向公共客户端颁发刷新令牌 + !clientPrincipal.getClientAuthenticationMethod().equals(ClientAuthenticationMethod.NONE)) { -// OAuth2Authorization authorization = authorizationBuilder.build(); -// -// // 保存认证信息至redis -// authorizationService.save(authorization); + tokenContext = tokenContextBuilder.tokenType(OAuth2TokenType.REFRESH_TOKEN).build(); + OAuth2Token generatedRefreshToken = this.tokenGenerator.generate(tokenContext); + if (!(generatedRefreshToken instanceof OAuth2RefreshToken)) { + Map map = new HashMap<>(); + map.put("message", "无法生成刷新token，请联系管理员。"); + return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER,"fdsafas", Instant.now(), Instant.now().plusNanos(1)), null, map); + } -// JSONObject addition = new JSONObject(new LinkedHashMap<>()); -// addition.put("token", accessToken.getTokenValue()); -// // 设置租户 -// JSONObject jsonObject = commonAPI.setLoginTenant(username); -// addition.putAll(jsonObject.getInnerMap()); -// -// // 设置登录用户信息 -// addition.put("userInfo", loginUser); -// addition.put("sysAllDictItems", commonAPI.queryAllDictItems()); -// -// List departs = commonAPI.queryUserDeparts(loginUser.getId()); -// addition.put("departs", departs); -// if (departs == null || departs.size() == 0) { -// addition.put("multi_depart", 0); -// } else if (departs.size() == 1) { -// commonAPI.updateUserDepart(username, departs.get(0).getOrgCode(),null); -// addition.put("multi_depart", 1); -// } else { -// //查询当前是否有登录部门 -// if(oConvertUtils.isEmpty(loginUser.getOrgCode())){ -// commonAPI.updateUserDepart(username, departs.get(0).getOrgCode(),null); -// } -// addition.put("multi_depart", 2); -// } + refreshToken = (OAuth2RefreshToken) generatedRefreshToken; + authorizationBuilder.refreshToken(refreshToken); + } - // 兼容原有shiro登录结果处理 -// Map map = new HashMap<>(); -// map.put("result", addition); -// map.put("code", 200); -// map.put("success", true); -// map.put("timestamp", System.currentTimeMillis()); + OAuth2Authorization authorization = authorizationBuilder.build(); + + // 保存认证信息至redis + authorizationService.save(authorization); // 返回access_token、refresh_token以及其它信息给到前端 return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, accessToken);