From 0f19da93f4949ebaa3a8e37e1162eecf8697f989 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Tue, 16 Feb 2021 08:55:11 +0800 Subject: [PATCH] otpType --- .../password/onetimepwd/AbstractOtpAuthn.java | 20 +++++++++---------- .../password/onetimepwd/impl/CapOtpAuthn.java | 2 +- .../onetimepwd/impl/CounterBasedOtpAuthn.java | 2 +- .../onetimepwd/impl/HotpOtpAuthn.java | 2 +- .../onetimepwd/impl/MailOtpAuthn.java | 6 +++--- .../onetimepwd/impl/MobileOtpAuthn.java | 2 +- .../password/onetimepwd/impl/RsaOtpAuthn.java | 2 +- .../impl/sms/SmsOtpAuthnAliyun.java | 6 +++--- .../impl/sms/SmsOtpAuthnTencentCloud.java | 6 +++--- .../impl/sms/SmsOtpAuthnYunxin.java | 6 +++--- .../maxkey/web/endpoint/LoginEndpoint.java | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java index e27d97fb6..de6843e3f 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java @@ -44,9 +44,9 @@ public abstract class AbstractOtpAuthn { StringGenerator stringGenerator; - protected String optType = OptTypes.TIMEBASED_OPT; + protected String otpType = OtpTypes.TIMEBASED_OTP; - public static final class OptTypes { + public static final class OtpTypes { // 手机 public static String MOBILE = "MOBILE"; // 短信 @@ -54,13 +54,13 @@ public abstract class AbstractOtpAuthn { // 邮箱 public static String EMAIL = "EMAIL"; //TIMEBASED_OPT - public static String TIMEBASED_OPT = "TOPT"; + public static String TIMEBASED_OTP = "TOPT"; // HmacOTP - public static String HOTP_OPT = "HOTP"; + public static String HOTP_OTP = "HOTP"; - public static String RSA_OPT = "RSA"; + public static String RSA_OTP = "RSA"; - public static String CAP_OPT = "CAP"; + public static String CAP_OTP = "CAP"; } @@ -134,12 +134,12 @@ public abstract class AbstractOtpAuthn { this.crypto = crypto; } - public String getOptType() { - return optType; + public String getOtpType() { + return otpType; } - public void setOptType(String optType) { - this.optType = optType; + public void setOtpType(String optType) { + this.otpType = optType; } public void setOptTokenStore(AbstractOtpTokenStore optTokenStore) { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java index c1baa6d10..0470b1bb9 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java @@ -35,7 +35,7 @@ public class CapOtpAuthn extends AbstractOtpAuthn { public CapOtpAuthn() { - optType = OptTypes.CAP_OPT; + otpType = OtpTypes.CAP_OTP; } @Override diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java index cb91198eb..3ab1f342d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java @@ -30,7 +30,7 @@ public class CounterBasedOtpAuthn extends AbstractOtpAuthn { public CounterBasedOtpAuthn() { - optType = OptTypes.HOTP_OPT; + otpType = OtpTypes.HOTP_OTP; } @Override diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java index a1b1c39ed..d1989c6fe 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java @@ -34,7 +34,7 @@ public class HotpOtpAuthn extends AbstractOtpAuthn { int truncation = -1; public HotpOtpAuthn() { - optType = OptTypes.HOTP_OPT; + otpType = OtpTypes.HOTP_OTP; } @Override diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java index 713af5b3e..f187bce4a 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java @@ -38,7 +38,7 @@ public class MailOtpAuthn extends AbstractOtpAuthn { String messageTemplate = "{0} You Token is {1} , it validity in {2} minutes."; public MailOtpAuthn() { - optType = OptTypes.EMAIL; + otpType = OtpTypes.EMAIL; } @Override @@ -68,7 +68,7 @@ public class MailOtpAuthn extends AbstractOtpAuthn { userInfo, token, userInfo.getMobile(), - OptTypes.EMAIL); + OtpTypes.EMAIL); return true; } catch (Exception e) { e.printStackTrace(); @@ -78,7 +78,7 @@ public class MailOtpAuthn extends AbstractOtpAuthn { @Override public boolean validate(UserInfo userInfo, String token) { - return this.optTokenStore.validate(userInfo, token, OptTypes.EMAIL, interval); + return this.optTokenStore.validate(userInfo, token, OtpTypes.EMAIL, interval); } public void setEmailConfig(EmailConfig emailConfig) { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java index 98b99274c..9b2b6e966 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java @@ -25,7 +25,7 @@ public class MobileOtpAuthn extends AbstractOtpAuthn { public MobileOtpAuthn() { - optType = OptTypes.SMS; + otpType = OtpTypes.SMS; } @Override diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java index 65d3ca559..05c80edda 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java @@ -35,7 +35,7 @@ public class RsaOtpAuthn extends AbstractOtpAuthn { public RsaOtpAuthn() { - optType = OptTypes.RSA_OPT; + otpType = OtpTypes.RSA_OTP; } @Override diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java index 10bc55a20..ae0c086a8 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java @@ -42,7 +42,7 @@ public class SmsOtpAuthnAliyun extends SmsOtpAuthn { private static final Logger logger = LoggerFactory.getLogger(SmsOtpAuthnAliyun.class); public SmsOtpAuthnAliyun() { - optType = OptTypes.SMS; + otpType = OtpTypes.SMS; } //请替换你在管理后台应用下申请的accessKeyId @@ -83,7 +83,7 @@ public class SmsOtpAuthnAliyun extends SmsOtpAuthn { userInfo, token, userInfo.getMobile(), - OptTypes.SMS); + OtpTypes.SMS); return true; } } catch (Exception e) { @@ -95,7 +95,7 @@ public class SmsOtpAuthnAliyun extends SmsOtpAuthn { @Override public boolean validate(UserInfo userInfo, String token) { - return this.optTokenStore.validate(userInfo, token, OptTypes.SMS, interval); + return this.optTokenStore.validate(userInfo, token, OtpTypes.SMS, interval); } public String getAccessKeyId() { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java index 45963b058..f7660ba46 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java @@ -52,7 +52,7 @@ public class SmsOtpAuthnTencentCloud extends SmsOtpAuthn { String sign; public SmsOtpAuthnTencentCloud() { - optType = OptTypes.SMS; + otpType = OtpTypes.SMS; } @@ -89,7 +89,7 @@ public class SmsOtpAuthnTencentCloud extends SmsOtpAuthn { userInfo, token, userInfo.getMobile(), - OptTypes.SMS); + OtpTypes.SMS); return true; } @@ -102,7 +102,7 @@ public class SmsOtpAuthnTencentCloud extends SmsOtpAuthn { @Override public boolean validate(UserInfo userInfo, String token) { - return this.optTokenStore.validate(userInfo, token, OptTypes.SMS, interval); + return this.optTokenStore.validate(userInfo, token, OtpTypes.SMS, interval); } diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java index 47b4de6f2..42204b412 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java @@ -45,7 +45,7 @@ public class SmsOtpAuthnYunxin extends SmsOtpAuthn { private static final Logger logger = LoggerFactory.getLogger(SmsOtpAuthnYunxin.class); public SmsOtpAuthnYunxin() { - optType = OptTypes.SMS; + otpType = OtpTypes.SMS; } //发送验证码的请求路径URL @@ -122,7 +122,7 @@ public class SmsOtpAuthnYunxin extends SmsOtpAuthn { userInfo, yunxinSms.getObj(), userInfo.getMobile(), - OptTypes.SMS); + OtpTypes.SMS); return true; } catch (Exception e) { logger.error(" produce code error ", e); @@ -137,7 +137,7 @@ public class SmsOtpAuthnYunxin extends SmsOtpAuthn { @Override public boolean validate(UserInfo userInfo, String token) { - return this.optTokenStore.validate(userInfo, token, OptTypes.SMS, interval); + return this.optTokenStore.validate(userInfo, token, OtpTypes.SMS, interval); } 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 235f2cb98..a8f6f5553 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 @@ -151,7 +151,7 @@ public class LoginEndpoint { modelAndView.addObject("isKerberos", applicationConfig.getLoginConfig().isKerberos()); modelAndView.addObject("isMfa", applicationConfig.getLoginConfig().isMfa()); if(applicationConfig.getLoginConfig().isMfa()) { - modelAndView.addObject("optType", tfaOptAuthn.getOptType()); + modelAndView.addObject("optType", tfaOptAuthn.getOtpType()); modelAndView.addObject("optInterval", tfaOptAuthn.getInterval()); }