From 205acfaaeb6ca52db60a274ceb585e72525c97ec Mon Sep 17 00:00:00 2001 From: shimingxy Date: Thu, 7 Nov 2024 14:42:29 +0800 Subject: [PATCH] HMAC512Service to Hmac512Service --- .../java/org/dromara/maxkey/authn/jwt/AuthJwtService.java | 6 +++--- .../dromara/maxkey/authn/jwt/AuthRefreshTokenService.java | 4 ++-- .../java/org/dromara/maxkey/authn/jwt/AuthTokenService.java | 4 ++-- .../authn/support/rememberme/AbstractRemeberMeManager.java | 4 ++-- .../crypto/jwt/{HMAC512Service.java => Hmac512Service.java} | 6 +++--- .../org/maxkey/crypto/signature/HMAC512ServiceTest.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/{HMAC512Service.java => Hmac512Service.java} (95%) diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java index 2a82f3543..4fd592753 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java @@ -22,7 +22,7 @@ import java.util.Date; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.SignPrincipal; -import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.crypto.jwt.Hmac512Service; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.web.WebContext; import org.joda.time.DateTime; @@ -38,7 +38,7 @@ import com.nimbusds.jwt.SignedJWT; public class AuthJwtService { private static final Logger _logger = LoggerFactory.getLogger(AuthJwtService.class); - HMAC512Service hmac512Service; + Hmac512Service hmac512Service; /** * JWT with Authentication @@ -60,7 +60,7 @@ public class AuthJwtService { .issueTime(currentDateTime.toDate()) .expirationTime(expirationTime) .claim("locale", userInfo.getLocale()) - .claim("kid", HMAC512Service.MXK_AUTH_JWK) + .claim("kid", Hmac512Service.MXK_AUTH_JWK) .claim("institution", userInfo.getInstId()) .build(); diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthRefreshTokenService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthRefreshTokenService.java index 21040c040..10ce0fb46 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthRefreshTokenService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthRefreshTokenService.java @@ -18,7 +18,7 @@ package org.dromara.maxkey.authn.jwt; import org.dromara.maxkey.configuration.AuthJwkConfig; -import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.crypto.jwt.Hmac512Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; @@ -33,7 +33,7 @@ public class AuthRefreshTokenService extends AuthJwtService{ public AuthRefreshTokenService(AuthJwkConfig authJwkConfig) throws JOSEException { this.authJwkConfig = authJwkConfig; - this.hmac512Service = new HMAC512Service(authJwkConfig.getRefreshSecret()); + this.hmac512Service = new Hmac512Service(authJwkConfig.getRefreshSecret()); } /** diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthTokenService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthTokenService.java index a46cdaf94..24198caf4 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthTokenService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthTokenService.java @@ -20,7 +20,7 @@ package org.dromara.maxkey.authn.jwt; import java.text.ParseException; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.configuration.AuthJwkConfig; -import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.crypto.jwt.Hmac512Service; import org.dromara.maxkey.persistence.cache.MomentaryService; import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; @@ -54,7 +54,7 @@ public class AuthTokenService extends AuthJwtService{ this.refreshTokenService = refreshTokenService; - this.hmac512Service = new HMAC512Service(authJwkConfig.getSecret()); + this.hmac512Service = new Hmac512Service(authJwkConfig.getSecret()); } diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java index 659676fcc..14c994eec 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java @@ -23,7 +23,7 @@ import java.util.Date; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authn.jwt.AuthTokenService; import org.dromara.maxkey.configuration.ApplicationConfig; -import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.crypto.jwt.Hmac512Service; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.util.DateUtils; import org.dromara.maxkey.web.WebContext; @@ -107,7 +107,7 @@ public abstract class AbstractRemeberMeManager { .jwtID(remeberMe.getId()) .issueTime(remeberMe.getLastLoginTime()) .expirationTime(remeberMe.getExpirationTime()) - .claim("kid", HMAC512Service.MXK_AUTH_JWK) + .claim("kid", Hmac512Service.MXK_AUTH_JWK) .build(); return authTokenService.signedJWT(remeberMeJwtClaims); diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java similarity index 95% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java index 48356a4b2..4770b6e3f 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java @@ -31,7 +31,7 @@ import com.nimbusds.jose.jwk.KeyUse; import com.nimbusds.jose.jwk.OctetSequenceKey; import com.nimbusds.jose.util.Base64URL; -public class HMAC512Service { +public class Hmac512Service { public static final String MXK_AUTH_JWK = "mxk_auth_jwk"; @@ -39,11 +39,11 @@ public class HMAC512Service { MACVerifier verifier; - public HMAC512Service() { + public Hmac512Service() { super(); } - public HMAC512Service(String secretString) throws JOSEException { + public Hmac512Service(String secretString) throws JOSEException { Base64URL secret=new Base64URL(secretString); OctetSequenceKey octKey= new OctetSequenceKey.Builder(secret) .keyID(MXK_AUTH_JWK) diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java index d43055ceb..048bd3a8a 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java @@ -17,7 +17,7 @@ package org.maxkey.crypto.signature; -import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.crypto.jwt.Hmac512Service; import com.nimbusds.jose.JOSEException; @@ -26,7 +26,7 @@ public class HMAC512ServiceTest { public static void main(String[] args) throws JOSEException { // TODO Auto-generated method stub String key ="7heM-14BtxjyKPuH3ITIm7q2-ps5MuBirWCsrrdbzzSAOuSPrbQYiaJ54AeA0uH2XdkYy3hHAkTFIsieGkyqxOJZ_dQzrCbaYISH9rhUZAKYx8tUY0wkE4ArOC6LqHDJarR6UIcMsARakK9U4dhoOPO1cj74XytemI-w6ACYfzRUn_Rn4e-CQMcnD1C56oNEukwalf06xVgXl41h6K8IBEzLVod58y_VfvFn-NGWpNG0fy_Qxng6dg8Dgva2DobvzMN2eejHGLGB-x809MvC4zbG7CKNVlcrzMYDt2Gt2sOVDrt2l9YqJNfgaLFjrOEVw5cuXemGkX1MvHj6TAsbLg"; - HMAC512Service HMAC512Service = new HMAC512Service(key); + Hmac512Service HMAC512Service = new Hmac512Service(key); String sign = HMAC512Service.sign("{\"sub\":\"hkkkk\"}"); System.out.println(sign); boolean isverify = HMAC512Service.verify(sign);