From 99a4fd879c090427734fcb4d872a0573cfcf24b3 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Tue, 16 Feb 2021 08:47:16 +0800 Subject: [PATCH] onetimepwd --- .../authn/AbstractAuthenticationProvider.java | 2 +- .../authn/RealmAuthenticationProvider.java | 2 +- .../AuthenticationAutoConfiguration.java | 2 +- .../support/onetimepwd}/AbstractOtpAuthn.java | 6 +++--- .../support/onetimepwd}/OneTimePassword.java | 2 +- .../support/onetimepwd}/algorithm/HOTP.java | 2 +- .../support/onetimepwd}/algorithm/HmacOTP.java | 2 +- .../onetimepwd}/algorithm/KeyUriFormat.java | 2 +- .../onetimepwd}/algorithm/OtpSecret.java | 2 +- .../onetimepwd}/algorithm/TimeBasedOTP.java | 2 +- .../support/onetimepwd}/impl/CapOtpAuthn.java | 4 ++-- .../onetimepwd}/impl/CounterBasedOtpAuthn.java | 6 +++--- .../support/onetimepwd}/impl/HotpOtpAuthn.java | 7 ++++--- .../support/onetimepwd}/impl/MailOtpAuthn.java | 4 ++-- .../onetimepwd}/impl/MobileOtpAuthn.java | 4 ++-- .../support/onetimepwd}/impl/RsaOtpAuthn.java | 4 ++-- .../support/onetimepwd}/impl/SmsOtpAuthn.java | 5 +++-- .../onetimepwd}/impl/TimeBasedOtpAuthn.java | 6 +++--- .../impl/sms/SmsOtpAuthnAliyun.java | 4 ++-- .../impl/sms/SmsOtpAuthnTencentCloud.java | 4 ++-- .../impl/sms/SmsOtpAuthnYunxin.java | 4 ++-- .../sms/SmsOtpAuthnYunxinCheckSumBuilder.java | 2 +- .../token/AbstractOtpTokenStore.java | 2 +- .../token/InMemoryOtpTokenStore.java | 4 ++-- .../onetimepwd}/token/RedisOtpTokenStore.java | 4 ++-- .../org/maxkey/otp/algorithm/HmacOTPTest.java | 4 ++-- .../maxkey/otp/algorithm/KeyUriFormatTest.java | 2 +- .../maxkey/otp/algorithm/TimeBasedOTPTest.java | 2 +- .../main/java/org/maxkey/MaxKeyMgtConfig.java | 2 +- .../src/main/java/org/maxkey/MaxKeyConfig.java | 18 +++++++++--------- .../contorller/ForgotPasswordContorller.java | 2 +- .../contorller/OneTimePasswordController.java | 4 ++-- .../org/maxkey/web/endpoint/LoginEndpoint.java | 2 +- 33 files changed, 63 insertions(+), 61 deletions(-) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/AbstractOtpAuthn.java (95%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/OneTimePassword.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/algorithm/HOTP.java (99%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/algorithm/HmacOTP.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/algorithm/KeyUriFormat.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/algorithm/OtpSecret.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/algorithm/TimeBasedOTP.java (99%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/CapOtpAuthn.java (92%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/CounterBasedOtpAuthn.java (93%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/HotpOtpAuthn.java (93%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/MailOtpAuthn.java (96%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/MobileOtpAuthn.java (90%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/RsaOtpAuthn.java (92%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/SmsOtpAuthn.java (94%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/TimeBasedOtpAuthn.java (94%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/sms/SmsOtpAuthnAliyun.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/sms/SmsOtpAuthnTencentCloud.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/sms/SmsOtpAuthnYunxin.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/token/AbstractOtpTokenStore.java (94%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/token/InMemoryOtpTokenStore.java (96%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{crypto/password/otp => authn/support/onetimepwd}/token/RedisOtpTokenStore.java (95%) diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java index e40a517d..d31eb639 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java @@ -22,11 +22,11 @@ import java.util.HashMap; import org.maxkey.authn.online.OnlineTicketServices; import org.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java index 02d4c9fd..562c1e62 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import org.maxkey.authn.online.OnlineTicket; import org.maxkey.authn.online.OnlineTicketServices; import org.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java index 82e5da2c..6efe0a2b 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java @@ -27,6 +27,7 @@ import org.maxkey.authn.online.InMemoryOnlineTicketServices; import org.maxkey.authn.online.OnlineTicketServices; import org.maxkey.authn.online.RedisOnlineTicketServices; import org.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.authn.support.rememberme.InMemoryRemeberMeService; import org.maxkey.authn.support.rememberme.RedisRemeberMeService; @@ -39,7 +40,6 @@ import org.maxkey.crypto.password.NoOpPasswordEncoder; import org.maxkey.crypto.password.MessageDigestPasswordEncoder; import org.maxkey.crypto.password.SM3PasswordEncoder; import org.maxkey.crypto.password.StandardPasswordEncoder; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; import org.maxkey.persistence.db.PasswordPolicyValidator; import org.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/AbstractOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/AbstractOtpAuthn.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/AbstractOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/AbstractOtpAuthn.java index ca50c7e5..dfb4c478 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/AbstractOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/AbstractOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.crypto.password.otp; +package org.maxkey.authn.support.onetimepwd; -import org.maxkey.crypto.password.otp.token.AbstractOtpTokenStore; -import org.maxkey.crypto.password.otp.token.InMemoryOtpTokenStore; +import org.maxkey.authn.support.onetimepwd.token.AbstractOtpTokenStore; +import org.maxkey.authn.support.onetimepwd.token.InMemoryOtpTokenStore; import org.maxkey.domain.UserInfo; import org.maxkey.util.StringGenerator; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/OneTimePassword.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/OneTimePassword.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/OneTimePassword.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/OneTimePassword.java index 2292669f..e444649b 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/OneTimePassword.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/OneTimePassword.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp; +package org.maxkey.authn.support.onetimepwd; import java.io.Serializable; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/HOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/HOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HOTP.java index 0bd8d9a8..d23a7b4d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/HOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.algorithm; +package org.maxkey.authn.support.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/HmacOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HmacOTP.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/HmacOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HmacOTP.java index ed4e6a23..3ce5cced 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/HmacOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HmacOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.algorithm; +package org.maxkey.authn.support.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/KeyUriFormat.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/KeyUriFormat.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/KeyUriFormat.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/KeyUriFormat.java index 5dc1ecbf..5bcb6a18 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/KeyUriFormat.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/KeyUriFormat.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.algorithm; +package org.maxkey.authn.support.onetimepwd.algorithm; public class KeyUriFormat { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/OtpSecret.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/OtpSecret.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/OtpSecret.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/OtpSecret.java index c972f0e3..d489583b 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/OtpSecret.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/OtpSecret.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.algorithm; +package org.maxkey.authn.support.onetimepwd.algorithm; import java.util.Arrays; import java.util.Random; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/TimeBasedOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/TimeBasedOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/TimeBasedOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/TimeBasedOTP.java index 5bef2ce6..61e3b94b 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/algorithm/TimeBasedOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/TimeBasedOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.algorithm; +package org.maxkey.authn.support.onetimepwd.algorithm; import java.lang.reflect.UndeclaredThrowableException; import java.math.BigInteger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/CapOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CapOtpAuthn.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/CapOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CapOtpAuthn.java index aec19ead..9318b0a7 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/CapOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CapOtpAuthn.java @@ -15,9 +15,9 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; /** diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/CounterBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CounterBasedOtpAuthn.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/CounterBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CounterBasedOtpAuthn.java index 52b71b47..816d2062 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/CounterBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CounterBasedOtpAuthn.java @@ -15,12 +15,12 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; import org.apache.commons.codec.binary.Hex; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.algorithm.TimeBasedOTP; import org.maxkey.crypto.Base32Utils; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; -import org.maxkey.crypto.password.otp.algorithm.TimeBasedOTP; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/HotpOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/HotpOtpAuthn.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/HotpOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/HotpOtpAuthn.java index 6889d516..b7535738 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/HotpOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/HotpOtpAuthn.java @@ -15,13 +15,14 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; + +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.algorithm.HOTP; import org.maxkey.crypto.Base32Utils; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; -import org.maxkey.crypto.password.otp.algorithm.HOTP; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/MailOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MailOtpAuthn.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/MailOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MailOtpAuthn.java index 5e7c48a9..fb29e1f5 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/MailOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MailOtpAuthn.java @@ -15,14 +15,14 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; import java.text.MessageFormat; import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.Email; import org.apache.commons.mail.SimpleEmail; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.configuration.EmailConfig; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/MobileOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MobileOtpAuthn.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/MobileOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MobileOtpAuthn.java index f1c20736..94fc49d6 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/MobileOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MobileOtpAuthn.java @@ -15,9 +15,9 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; public class MobileOtpAuthn extends AbstractOtpAuthn { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/RsaOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/RsaOtpAuthn.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/RsaOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/RsaOtpAuthn.java index 20033cfb..f0ef3266 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/RsaOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/RsaOtpAuthn.java @@ -15,9 +15,9 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; /** diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/SmsOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/SmsOtpAuthn.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/SmsOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/SmsOtpAuthn.java index 5fa441d9..a58706c1 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/SmsOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/SmsOtpAuthn.java @@ -15,12 +15,13 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; import java.io.IOException; import java.util.Properties; + +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.constants.ConstantsProperties; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/TimeBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/TimeBasedOtpAuthn.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/TimeBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/TimeBasedOtpAuthn.java index a1bf4f16..4a65ac60 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/TimeBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/TimeBasedOtpAuthn.java @@ -15,16 +15,16 @@ */ -package org.maxkey.crypto.password.otp.impl; +package org.maxkey.authn.support.onetimepwd.impl; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.algorithm.TimeBasedOTP; import org.maxkey.crypto.Base32Utils; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; -import org.maxkey.crypto.password.otp.algorithm.TimeBasedOTP; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnAliyun.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnAliyun.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java index 70fd71e7..f7d22415 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnAliyun.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.impl.sms; +package org.maxkey.authn.support.onetimepwd.impl.sms; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -26,7 +26,7 @@ import com.aliyuncs.profile.DefaultProfile; import java.io.IOException; -import org.maxkey.crypto.password.otp.impl.SmsOtpAuthn; +import org.maxkey.authn.support.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnTencentCloud.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnTencentCloud.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java index 385f1e61..5883824c 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnTencentCloud.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.impl.sms; +package org.maxkey.authn.support.onetimepwd.impl.sms; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.profile.ClientProfile; @@ -26,7 +26,7 @@ import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; import java.io.IOException; -import org.maxkey.crypto.password.otp.impl.SmsOtpAuthn; +import org.maxkey.authn.support.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnYunxin.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnYunxin.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java index 06cce98a..9d67e042 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnYunxin.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.impl.sms; +package org.maxkey.authn.support.onetimepwd.impl.sms; import java.io.IOException; import java.util.ArrayList; @@ -29,7 +29,7 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; -import org.maxkey.crypto.password.otp.impl.SmsOtpAuthn; +import org.maxkey.authn.support.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.domain.UserInfo; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java index da3cc544..94bc2213 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.impl.sms; +package org.maxkey.authn.support.onetimepwd.impl.sms; import java.security.MessageDigest; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/AbstractOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/AbstractOtpTokenStore.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/AbstractOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/AbstractOtpTokenStore.java index 134bafdb..8bbf6792 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/AbstractOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/AbstractOtpTokenStore.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.token; +package org.maxkey.authn.support.onetimepwd.token; import org.maxkey.domain.UserInfo; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/InMemoryOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/InMemoryOtpTokenStore.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/InMemoryOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/InMemoryOtpTokenStore.java index d72899e4..c603af57 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/InMemoryOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/InMemoryOtpTokenStore.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password.otp.token; +package org.maxkey.authn.support.onetimepwd.token; import org.ehcache.UserManagedCache; import org.ehcache.config.builders.ExpiryPolicyBuilder; @@ -23,8 +23,8 @@ import org.ehcache.config.builders.UserManagedCacheBuilder; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.format.DateTimeFormat; +import org.maxkey.authn.support.onetimepwd.OneTimePassword; import org.maxkey.constants.ConstantsTimeInterval; -import org.maxkey.crypto.password.otp.OneTimePassword; import org.maxkey.domain.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/RedisOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/RedisOtpTokenStore.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/RedisOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/RedisOtpTokenStore.java index 81b426e2..3517457c 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/crypto/password/otp/token/RedisOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/RedisOtpTokenStore.java @@ -15,11 +15,11 @@ */ -package org.maxkey.crypto.password.otp.token; +package org.maxkey.authn.support.onetimepwd.token; import org.joda.time.DateTime; +import org.maxkey.authn.support.onetimepwd.OneTimePassword; import org.maxkey.constants.ConstantsTimeInterval; -import org.maxkey.crypto.password.otp.OneTimePassword; import org.maxkey.domain.UserInfo; import org.maxkey.persistence.redis.RedisConnection; import org.maxkey.persistence.redis.RedisConnectionFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java index 5540953d..6049cc6a 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java @@ -21,9 +21,9 @@ package org.maxkey.otp.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import org.maxkey.authn.support.onetimepwd.algorithm.HOTP; +import org.maxkey.authn.support.onetimepwd.algorithm.HmacOTP; import org.maxkey.crypto.Base32Utils; -import org.maxkey.crypto.password.otp.algorithm.HOTP; -import org.maxkey.crypto.password.otp.algorithm.HmacOTP; public class HmacOTPTest { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java index 2ad7bd38..e23e4930 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java @@ -19,7 +19,7 @@ package org.maxkey.otp.algorithm; import java.io.File; -import org.maxkey.crypto.password.otp.algorithm.KeyUriFormat; +import org.maxkey.authn.support.onetimepwd.algorithm.KeyUriFormat; import org.maxkey.util.QRCode; import com.google.zxing.BarcodeFormat; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java index 74c2ae17..e287ae25 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java @@ -24,9 +24,9 @@ import java.util.Date; import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; +import org.maxkey.authn.support.onetimepwd.algorithm.TimeBasedOTP; import org.maxkey.crypto.Base32Utils; import org.maxkey.crypto.HexUtils; -import org.maxkey.crypto.password.otp.algorithm.TimeBasedOTP; /** * goole * @author Crystal.Sea diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java index aa40d4da..4e270fe8 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java @@ -25,7 +25,6 @@ import org.maxkey.authz.oauth2.provider.token.store.InMemoryTokenStore; import org.maxkey.authz.oauth2.provider.token.store.JdbcTokenStore; import org.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; import org.maxkey.constants.ConstantsProperties; -import org.maxkey.crypto.password.otp.impl.TimeBasedOtpAuthn; import org.maxkey.jobs.DynamicGroupsJob; import org.maxkey.persistence.db.LoginHistoryService; import org.maxkey.persistence.db.LoginService; @@ -42,6 +41,7 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; +import org.maxkey.authn.support.onetimepwd.impl.TimeBasedOtpAuthn; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java index 464d4d1d..a8e563cf 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java @@ -27,18 +27,18 @@ import org.maxkey.authn.realm.activedirectory.ActiveDirectoryAuthenticationRealm import org.maxkey.authn.realm.activedirectory.ActiveDirectoryServer; import org.maxkey.authn.support.kerberos.KerberosProxy; import org.maxkey.authn.support.kerberos.RemoteKerberosService; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.authn.support.onetimepwd.impl.MailOtpAuthn; +import org.maxkey.authn.support.onetimepwd.impl.SmsOtpAuthn; +import org.maxkey.authn.support.onetimepwd.impl.TimeBasedOtpAuthn; +import org.maxkey.authn.support.onetimepwd.impl.sms.SmsOtpAuthnAliyun; +import org.maxkey.authn.support.onetimepwd.impl.sms.SmsOtpAuthnTencentCloud; +import org.maxkey.authn.support.onetimepwd.impl.sms.SmsOtpAuthnYunxin; +import org.maxkey.authn.support.onetimepwd.token.RedisOtpTokenStore; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.constants.ConstantsPersistence; import org.maxkey.constants.ConstantsProperties; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; -import org.maxkey.crypto.password.otp.algorithm.KeyUriFormat; -import org.maxkey.crypto.password.otp.impl.MailOtpAuthn; -import org.maxkey.crypto.password.otp.impl.SmsOtpAuthn; -import org.maxkey.crypto.password.otp.impl.TimeBasedOtpAuthn; -import org.maxkey.crypto.password.otp.impl.sms.SmsOtpAuthnAliyun; -import org.maxkey.crypto.password.otp.impl.sms.SmsOtpAuthnTencentCloud; -import org.maxkey.crypto.password.otp.impl.sms.SmsOtpAuthnYunxin; -import org.maxkey.crypto.password.otp.token.RedisOtpTokenStore; import org.maxkey.persistence.db.LoginHistoryService; import org.maxkey.persistence.db.LoginService; import org.maxkey.persistence.db.PasswordPolicyValidator; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java index ce13ed0e..a9eb9e4b 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java @@ -20,7 +20,7 @@ package org.maxkey.web.contorller; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.web.WebConstants; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java index d0e4387a..997db551 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java @@ -20,10 +20,10 @@ package org.maxkey.web.contorller; import java.awt.image.BufferedImage; import java.util.UUID; import org.apache.commons.codec.binary.Hex; +import org.maxkey.authn.support.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.authn.support.onetimepwd.algorithm.OtpSecret; import org.maxkey.crypto.Base32Utils; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.crypto.password.otp.algorithm.KeyUriFormat; -import org.maxkey.crypto.password.otp.algorithm.OtpSecret; import org.maxkey.domain.UserInfo; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.RQCodeUtils; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index af01d31c..207b427d 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -27,12 +27,12 @@ import javax.servlet.http.HttpServletResponse; import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.LoginCredential; import org.maxkey.authn.support.kerberos.KerberosService; +import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.authn.support.wsfederation.WsFederationConstants; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsStatus; -import org.maxkey.crypto.password.otp.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.StringUtils;