From 101fd1c70b467dd956c976235d35169a3565df5f Mon Sep 17 00:00:00 2001 From: MaxKey Date: Tue, 16 Feb 2021 08:50:03 +0800 Subject: [PATCH] onetimepwd --- .../authn/AbstractAuthenticationProvider.java | 2 +- .../authn/RealmAuthenticationProvider.java | 2 +- .../AuthenticationAutoConfiguration.java | 2 +- .../onetimepwd/AbstractOtpAuthn.java | 6 +++--- .../onetimepwd/OneTimePassword.java | 2 +- .../onetimepwd/algorithm/HOTP.java | 2 +- .../onetimepwd/algorithm/HmacOTP.java | 2 +- .../onetimepwd/algorithm/KeyUriFormat.java | 2 +- .../onetimepwd/algorithm/OtpSecret.java | 2 +- .../onetimepwd/algorithm/TimeBasedOTP.java | 2 +- .../onetimepwd/impl/CapOtpAuthn.java | 4 ++-- .../onetimepwd/impl/CounterBasedOtpAuthn.java | 6 +++--- .../onetimepwd/impl/HotpOtpAuthn.java | 6 +++--- .../onetimepwd/impl/MailOtpAuthn.java | 4 ++-- .../onetimepwd/impl/MobileOtpAuthn.java | 4 ++-- .../onetimepwd/impl/RsaOtpAuthn.java | 4 ++-- .../onetimepwd/impl/SmsOtpAuthn.java | 4 ++-- .../onetimepwd/impl/TimeBasedOtpAuthn.java | 6 +++--- .../onetimepwd/impl/sms/SmsOtpAuthnAliyun.java | 4 ++-- .../impl/sms/SmsOtpAuthnTencentCloud.java | 4 ++-- .../onetimepwd/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, 61 insertions(+), 61 deletions(-) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/AbstractOtpAuthn.java (95%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/OneTimePassword.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/algorithm/HOTP.java (99%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/algorithm/HmacOTP.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/algorithm/KeyUriFormat.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/algorithm/OtpSecret.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/algorithm/TimeBasedOTP.java (99%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/CapOtpAuthn.java (92%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/CounterBasedOtpAuthn.java (93%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/HotpOtpAuthn.java (93%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/MailOtpAuthn.java (96%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/MobileOtpAuthn.java (90%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/RsaOtpAuthn.java (92%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/SmsOtpAuthn.java (94%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/TimeBasedOtpAuthn.java (94%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java (98%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java (97%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/token/AbstractOtpTokenStore.java (94%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{authn/support => }/onetimepwd/token/InMemoryOtpTokenStore.java (96%) rename maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/{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 d31eb639..41c13770 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,12 +22,12 @@ 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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; 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 562c1e62..8867fe01 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,10 +22,10 @@ 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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; 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 6efe0a2b..878fe4e7 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,7 +27,6 @@ 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; @@ -40,6 +39,7 @@ 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.onetimepwd.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/authn/support/onetimepwd/AbstractOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/AbstractOtpAuthn.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/AbstractOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/AbstractOtpAuthn.java index dfb4c478..43acc450 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/AbstractOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/AbstractOtpAuthn.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authn.support.onetimepwd; +package org.maxkey.onetimepwd; -import org.maxkey.authn.support.onetimepwd.token.AbstractOtpTokenStore; -import org.maxkey.authn.support.onetimepwd.token.InMemoryOtpTokenStore; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.token.AbstractOtpTokenStore; +import org.maxkey.onetimepwd.token.InMemoryOtpTokenStore; import org.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/OneTimePassword.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/OneTimePassword.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/OneTimePassword.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/OneTimePassword.java index e444649b..6136763c 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/OneTimePassword.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/OneTimePassword.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd; +package org.maxkey.onetimepwd; import java.io.Serializable; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HOTP.java index d23a7b4d..ad2dab14 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.algorithm; +package org.maxkey.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HmacOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HmacOTP.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HmacOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HmacOTP.java index 3ce5cced..8418c3aa 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/HmacOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HmacOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.algorithm; +package org.maxkey.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/KeyUriFormat.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/KeyUriFormat.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/KeyUriFormat.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/KeyUriFormat.java index 5bcb6a18..1d476e19 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/KeyUriFormat.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/KeyUriFormat.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.algorithm; +package org.maxkey.onetimepwd.algorithm; public class KeyUriFormat { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/OtpSecret.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/OtpSecret.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/OtpSecret.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/OtpSecret.java index d489583b..49434b2d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/OtpSecret.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/OtpSecret.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.algorithm; +package org.maxkey.onetimepwd.algorithm; import java.util.Arrays; import java.util.Random; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/TimeBasedOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/TimeBasedOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/TimeBasedOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/TimeBasedOTP.java index 61e3b94b..ee38a1f3 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/algorithm/TimeBasedOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/TimeBasedOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.algorithm; +package org.maxkey.onetimepwd.algorithm; import java.lang.reflect.UndeclaredThrowableException; import java.math.BigInteger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CapOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CapOtpAuthn.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CapOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CapOtpAuthn.java index 9318b0a7..686fc5b0 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CapOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CapOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.onetimepwd.impl; -import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; /** * Chip Authentication Program EMV stands for Europay, MasterCard and Visa, a diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CounterBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CounterBasedOtpAuthn.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CounterBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CounterBasedOtpAuthn.java index 816d2062..ee4d655a 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/CounterBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CounterBasedOtpAuthn.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/HotpOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/HotpOtpAuthn.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/HotpOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/HotpOtpAuthn.java index b7535738..cae85bb4 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/HotpOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/HotpOtpAuthn.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.onetimepwd.algorithm.HOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MailOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MailOtpAuthn.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MailOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MailOtpAuthn.java index fb29e1f5..eb02abb9 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MailOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MailOtpAuthn.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MobileOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MobileOtpAuthn.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MobileOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MobileOtpAuthn.java index 94fc49d6..ee32ffa1 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/MobileOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MobileOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.onetimepwd.impl; -import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; public class MobileOtpAuthn extends AbstractOtpAuthn { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/RsaOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/RsaOtpAuthn.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/RsaOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/RsaOtpAuthn.java index f0ef3266..e65dc520 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/RsaOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/RsaOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.onetimepwd.impl; -import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; /** * Chip Authentication Program EMV stands for Europay, MasterCard and Visa, a diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/SmsOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/SmsOtpAuthn.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/SmsOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/SmsOtpAuthn.java index a58706c1..da607a5a 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/SmsOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/SmsOtpAuthn.java @@ -15,14 +15,14 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/TimeBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/TimeBasedOtpAuthn.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/TimeBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/TimeBasedOtpAuthn.java index 4a65ac60..3514a829 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/TimeBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/TimeBasedOtpAuthn.java @@ -15,17 +15,17 @@ */ -package org.maxkey.authn.support.onetimepwd.impl; +package org.maxkey.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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java index f7d22415..63c9e27d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.impl.sms; +package org.maxkey.onetimepwd.impl.sms; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -26,8 +26,8 @@ import com.aliyuncs.profile.DefaultProfile; import java.io.IOException; -import org.maxkey.authn.support.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.impl.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java index 5883824c..a985f714 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.impl.sms; +package org.maxkey.onetimepwd.impl.sms; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.profile.ClientProfile; @@ -26,8 +26,8 @@ import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; import java.io.IOException; -import org.maxkey.authn.support.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.impl.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java index 9d67e042..a1960744 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.impl.sms; +package org.maxkey.onetimepwd.impl.sms; import java.io.IOException; import java.util.ArrayList; @@ -29,8 +29,8 @@ 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.authn.support.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java index 94bc2213..5b34a97e 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.impl.sms; +package org.maxkey.onetimepwd.impl.sms; import java.security.MessageDigest; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/AbstractOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/AbstractOtpTokenStore.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/AbstractOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/AbstractOtpTokenStore.java index 8bbf6792..ddd52eaa 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/AbstractOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/AbstractOtpTokenStore.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.token; +package org.maxkey.onetimepwd.token; import org.maxkey.domain.UserInfo; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/InMemoryOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/InMemoryOtpTokenStore.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/InMemoryOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/InMemoryOtpTokenStore.java index c603af57..39142942 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/InMemoryOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/InMemoryOtpTokenStore.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.onetimepwd.token; +package org.maxkey.onetimepwd.token; import org.ehcache.UserManagedCache; import org.ehcache.config.builders.ExpiryPolicyBuilder; @@ -23,9 +23,9 @@ 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.domain.UserInfo; +import org.maxkey.onetimepwd.OneTimePassword; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/RedisOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/RedisOtpTokenStore.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/RedisOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/RedisOtpTokenStore.java index 3517457c..495b4034 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/authn/support/onetimepwd/token/RedisOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/RedisOtpTokenStore.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authn.support.onetimepwd.token; +package org.maxkey.onetimepwd.token; import org.joda.time.DateTime; -import org.maxkey.authn.support.onetimepwd.OneTimePassword; import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.OneTimePassword; 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 6049cc6a..f031ab98 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.onetimepwd.algorithm.HOTP; +import org.maxkey.onetimepwd.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 e23e4930..90d2d563 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.authn.support.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.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 e287ae25..d278a306 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.onetimepwd.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 4e270fe8..04ab6d7a 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java @@ -26,6 +26,7 @@ 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.jobs.DynamicGroupsJob; +import org.maxkey.onetimepwd.impl.TimeBasedOtpAuthn; import org.maxkey.persistence.db.LoginHistoryService; import org.maxkey.persistence.db.LoginService; import org.maxkey.persistence.db.PasswordPolicyValidator; @@ -41,7 +42,6 @@ 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 a8e563cf..bfff6a0e 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.onetimepwd.AbstractOtpAuthn; +import org.maxkey.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.onetimepwd.impl.MailOtpAuthn; +import org.maxkey.onetimepwd.impl.SmsOtpAuthn; +import org.maxkey.onetimepwd.impl.TimeBasedOtpAuthn; +import org.maxkey.onetimepwd.impl.sms.SmsOtpAuthnAliyun; +import org.maxkey.onetimepwd.impl.sms.SmsOtpAuthnTencentCloud; +import org.maxkey.onetimepwd.impl.sms.SmsOtpAuthnYunxin; +import org.maxkey.onetimepwd.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 a9eb9e4b..8ba1e0b7 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,8 +20,8 @@ package org.maxkey.web.contorller; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.maxkey.authn.support.onetimepwd.AbstractOtpAuthn; import org.maxkey.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; 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 997db551..247c4bf6 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,11 +20,11 @@ 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.domain.UserInfo; +import org.maxkey.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.onetimepwd.algorithm.OtpSecret; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.RQCodeUtils; import org.maxkey.web.WebContext; 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 207b427d..8b5200de 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,13 +27,13 @@ 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.domain.UserInfo; +import org.maxkey.onetimepwd.AbstractOtpAuthn; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.StringUtils; import org.maxkey.web.WebConstants;