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 41c13770..51b5ded8 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 @@ -27,7 +27,7 @@ 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.password.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 8867fe01..d06e7251 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 @@ -25,7 +25,7 @@ import org.maxkey.authn.realm.AbstractAuthenticationRealm; 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.password.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 878fe4e7..85087337 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 @@ -39,7 +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.password.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/onetimepwd/AbstractOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/AbstractOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java index 43acc450..e27d97fb 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/AbstractOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java @@ -15,11 +15,11 @@ */ -package org.maxkey.onetimepwd; +package org.maxkey.password.onetimepwd; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.token.AbstractOtpTokenStore; -import org.maxkey.onetimepwd.token.InMemoryOtpTokenStore; +import org.maxkey.password.onetimepwd.token.AbstractOtpTokenStore; +import org.maxkey.password.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/onetimepwd/OneTimePassword.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/OneTimePassword.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/OneTimePassword.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/OneTimePassword.java index 6136763c..4015fcc3 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/OneTimePassword.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/OneTimePassword.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd; +package org.maxkey.password.onetimepwd; import java.io.Serializable; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HOTP.java index ad2dab14..68d0147c 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.algorithm; +package org.maxkey.password.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HmacOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HmacOTP.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HmacOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HmacOTP.java index 8418c3aa..472c1d76 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/HmacOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HmacOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.algorithm; +package org.maxkey.password.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/KeyUriFormat.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/KeyUriFormat.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/KeyUriFormat.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/KeyUriFormat.java index 1d476e19..35d62c82 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/KeyUriFormat.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/KeyUriFormat.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.algorithm; +package org.maxkey.password.onetimepwd.algorithm; public class KeyUriFormat { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/OtpSecret.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpSecret.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/OtpSecret.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpSecret.java index 49434b2d..527a189e 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/OtpSecret.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpSecret.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.algorithm; +package org.maxkey.password.onetimepwd.algorithm; import java.util.Arrays; import java.util.Random; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/TimeBasedOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/TimeBasedOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java index ee38a1f3..323e7a91 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/algorithm/TimeBasedOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.algorithm; +package org.maxkey.password.onetimepwd.algorithm; import java.lang.reflect.UndeclaredThrowableException; import java.math.BigInteger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CapOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CapOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java index 686fc5b0..c1baa6d1 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CapOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.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/onetimepwd/impl/CounterBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CounterBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java index ee4d655a..cb91198e 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/CounterBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java @@ -15,13 +15,13 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import org.apache.commons.codec.binary.Hex; import org.maxkey.crypto.Base32Utils; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; -import org.maxkey.onetimepwd.algorithm.TimeBasedOTP; +import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/HotpOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/HotpOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java index cae85bb4..a1b1c39e 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/HotpOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java @@ -15,15 +15,15 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import org.maxkey.crypto.Base32Utils; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; -import org.maxkey.onetimepwd.algorithm.HOTP; +import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.onetimepwd.algorithm.HOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MailOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MailOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java index eb02abb9..713af5b3 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MailOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import java.text.MessageFormat; import org.apache.commons.mail.DefaultAuthenticator; @@ -23,7 +23,7 @@ import org.apache.commons.mail.Email; import org.apache.commons.mail.SimpleEmail; import org.maxkey.configuration.EmailConfig; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.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/onetimepwd/impl/MobileOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MobileOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java index ee32ffa1..98b99274 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/MobileOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.onetimepwd.AbstractOtpAuthn; public class MobileOtpAuthn extends AbstractOtpAuthn { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/RsaOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/RsaOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java index e65dc520..65d3ca55 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/RsaOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.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/onetimepwd/impl/SmsOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/SmsOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java index da607a5a..efa4db45 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/SmsOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java @@ -15,14 +15,14 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import java.io.IOException; import java.util.Properties; import org.maxkey.constants.ConstantsProperties; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.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/onetimepwd/impl/TimeBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/TimeBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java index 3514a829..fddf5d40 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/TimeBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.impl; +package org.maxkey.password.onetimepwd.impl; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -24,8 +24,8 @@ import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; import org.maxkey.crypto.Base32Utils; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; -import org.maxkey.onetimepwd.algorithm.TimeBasedOTP; +import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java index 63c9e27d..10bc55a2 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.impl.sms; +package org.maxkey.password.onetimepwd.impl.sms; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -27,7 +27,7 @@ import com.aliyuncs.profile.DefaultProfile; import java.io.IOException; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.impl.SmsOtpAuthn; +import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java index a985f714..45963b05 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.impl.sms; +package org.maxkey.password.onetimepwd.impl.sms; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.profile.ClientProfile; @@ -27,7 +27,7 @@ import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; import java.io.IOException; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.impl.SmsOtpAuthn; +import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java index a1960744..47b4de6f 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.impl.sms; +package org.maxkey.password.onetimepwd.impl.sms; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.impl.SmsOtpAuthn; +import org.maxkey.password.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/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java index 5b34a97e..8a9d3b8a 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxinCheckSumBuilder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.impl.sms; +package org.maxkey.password.onetimepwd.impl.sms; import java.security.MessageDigest; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/AbstractOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/AbstractOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java index ddd52eaa..f72aba00 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/AbstractOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.token; +package org.maxkey.password.onetimepwd.token; import org.maxkey.domain.UserInfo; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/InMemoryOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/InMemoryOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java index 39142942..6f56f4f0 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/InMemoryOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java @@ -15,7 +15,7 @@ */ -package org.maxkey.onetimepwd.token; +package org.maxkey.password.onetimepwd.token; import org.ehcache.UserManagedCache; import org.ehcache.config.builders.ExpiryPolicyBuilder; @@ -25,7 +25,7 @@ import org.joda.time.Duration; import org.joda.time.format.DateTimeFormat; import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.OneTimePassword; +import org.maxkey.password.onetimepwd.OneTimePassword; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/RedisOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/RedisOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java index 495b4034..25ae7a1f 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/onetimepwd/token/RedisOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java @@ -15,12 +15,12 @@ */ -package org.maxkey.onetimepwd.token; +package org.maxkey.password.onetimepwd.token; import org.joda.time.DateTime; import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.OneTimePassword; +import org.maxkey.password.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 f031ab98..88694bf0 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 @@ -22,8 +22,8 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import org.maxkey.crypto.Base32Utils; -import org.maxkey.onetimepwd.algorithm.HOTP; -import org.maxkey.onetimepwd.algorithm.HmacOTP; +import org.maxkey.password.onetimepwd.algorithm.HOTP; +import org.maxkey.password.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 90d2d563..a99c2cf2 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.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.password.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 d278a306..f22db89c 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 @@ -26,7 +26,7 @@ import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; import org.maxkey.crypto.Base32Utils; import org.maxkey.crypto.HexUtils; -import org.maxkey.onetimepwd.algorithm.TimeBasedOTP; +import org.maxkey.password.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 04ab6d7a..5ca7efa1 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java @@ -26,7 +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.password.onetimepwd.impl.TimeBasedOtpAuthn; 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/MaxKeyConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java index bfff6a0e..1e5a4030 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java @@ -30,15 +30,15 @@ import org.maxkey.authn.support.kerberos.RemoteKerberosService; 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.password.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.password.onetimepwd.impl.MailOtpAuthn; +import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn; +import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; +import org.maxkey.password.onetimepwd.impl.sms.SmsOtpAuthnAliyun; +import org.maxkey.password.onetimepwd.impl.sms.SmsOtpAuthnTencentCloud; +import org.maxkey.password.onetimepwd.impl.sms.SmsOtpAuthnYunxin; +import org.maxkey.password.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 8ba1e0b7..2adc9b17 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 @@ -21,7 +21,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.maxkey.domain.UserInfo; -import org.maxkey.onetimepwd.AbstractOtpAuthn; +import org.maxkey.password.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 247c4bf6..eed6c3fe 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 @@ -23,8 +23,8 @@ import org.apache.commons.codec.binary.Hex; 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.password.onetimepwd.algorithm.KeyUriFormat; +import org.maxkey.password.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 8b5200de..235f2cb9 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 @@ -33,7 +33,7 @@ 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.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.StringUtils; import org.maxkey.web.WebConstants;