mobile login

This commit is contained in:
MaxKey
2021-05-17 11:34:39 +08:00
parent ff3d97d51f
commit b378f9fa2f
27 changed files with 447 additions and 309 deletions

View File

@@ -19,6 +19,8 @@ package org.maxkey;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm;
import org.maxkey.authn.realm.ldap.LdapAuthenticationRealm;
import org.maxkey.authn.realm.ldap.LdapServer;
@@ -164,7 +166,13 @@ public class MaxKeyConfig implements InitializingBean {
@Value("${maxkey.support.ldap.basedn}")String baseDN,
@Value("${maxkey.support.ldap.domain}")String domain,
@Value("${maxkey.support.ldap.product:openldap}")String product) {
AbstractAuthenticationRealm ldapAuthenticationRealm =
ldapAuthenticationRealm(
ldapSupport,ldapJit,
providerUrl,principal,credentials,
filter,baseDN,domain,product,
jdbcTemplate
);
JdbcAuthenticationRealm authenticationRealm = new JdbcAuthenticationRealm(
passwordEncoder,
passwordPolicyValidator,
@@ -172,18 +180,13 @@ public class MaxKeyConfig implements InitializingBean {
loginHistoryService,
remeberMeService,
jdbcTemplate,
ldapAuthenticationRealm(
ldapSupport,ldapJit,
providerUrl,principal,credentials,
filter,baseDN,domain,product,
jdbcTemplate),
ldapSupport);
ldapAuthenticationRealm,
ldapSupport
);
return authenticationRealm;
}
@Bean(name = "timeBasedOtpAuthn")
public TimeBasedOtpAuthn timeBasedOtpAuthn() {
TimeBasedOtpAuthn tfaOtpAuthn = new TimeBasedOtpAuthn();
@@ -191,32 +194,14 @@ public class MaxKeyConfig implements InitializingBean {
return tfaOtpAuthn;
}
//default tfaOtpAuthn
@Bean(name = "tfaOtpAuthn")
public AbstractOtpAuthn tfaOptAuthn(
@Value("${maxkey.login.mfa.type}")String mfaType,
@Value("${maxkey.server.persistence}") int persistence,
MailOtpAuthn tfaMailOtpAuthn,
RedisConnectionFactory redisConnFactory) {
AbstractOtpAuthn tfaOtpAuthn = null;
if(mfaType.equalsIgnoreCase("SmsOtpAuthnAliyun")) {
tfaOtpAuthn = new SmsOtpAuthnAliyun();
_logger.debug("SmsOtpAuthnAliyun inited.");
}else if(mfaType.equalsIgnoreCase("SmsOtpAuthnTencentCloud")) {
tfaOtpAuthn = new SmsOtpAuthnTencentCloud();
_logger.debug("SmsOtpAuthnTencentCloud inited.");
}else if(mfaType.equalsIgnoreCase("SmsOtpAuthnYunxin")) {
tfaOtpAuthn = new SmsOtpAuthnYunxin();
_logger.debug("SmsOtpAuthnYunxin inited.");
}else if(mfaType.equalsIgnoreCase("MailOtpAuthn")) {
tfaOtpAuthn = tfaMailOtpAuthn;
_logger.debug("MailOtpAuthn inited.");
}else {
tfaOtpAuthn = new TimeBasedOtpAuthn();
_logger.debug("TimeBasedOtpAuthn inited.");
}
AbstractOtpAuthn tfaOtpAuthn = new TimeBasedOtpAuthn();
_logger.debug("TimeBasedOtpAuthn inited.");
if (persistence == ConstantsPersistence.REDIS) {
RedisOtpTokenStore redisOptTokenStore = new RedisOtpTokenStore(redisConnFactory);
tfaOtpAuthn.setOptTokenStore(redisOptTokenStore);
@@ -226,7 +211,7 @@ public class MaxKeyConfig implements InitializingBean {
return tfaOtpAuthn;
}
@Bean(name = "tfaMailOtpAuthn")
@Bean(name = "mailOtpAuthn")
public MailOtpAuthn mailOtpAuthn(
@Value("${spring.mail.properties.mailotp.message.subject}")
String messageSubject,
@@ -236,14 +221,15 @@ public class MaxKeyConfig implements InitializingBean {
MailOtpAuthn mailOtpAuthn = new MailOtpAuthn();
mailOtpAuthn.setSubject(messageSubject);
mailOtpAuthn.setMessageTemplate(messageTemplate);
_logger.debug("tfaMailOtpAuthn inited.");
_logger.debug("MailOtpAuthn inited.");
return mailOtpAuthn;
}
@Bean(name = "tfaMobileOtpAuthn")
@Bean(name = "smsOtpAuthn")
public SmsOtpAuthn smsOtpAuthn(
@Value("${maxkey.otp.sms}")String optSmsProvider,
@Value("${maxkey.server.persistence}") int persistence,
Properties applicationProperty,
RedisConnectionFactory redisConnFactory) {
SmsOtpAuthn smsOtpAuthn = null;
if(optSmsProvider.equalsIgnoreCase("SmsOtpAuthnAliyun")) {
@@ -257,6 +243,7 @@ public class MaxKeyConfig implements InitializingBean {
RedisOtpTokenStore redisOptTokenStore = new RedisOtpTokenStore(redisConnFactory);
smsOtpAuthn.setOptTokenStore(redisOptTokenStore);
}
smsOtpAuthn.setProperties(applicationProperty);
smsOtpAuthn.initPropertys();
_logger.debug("SmsOtpAuthn inited.");

View File

@@ -62,12 +62,12 @@ public class ForgotPasswordContorller {
private UserInfoService userInfoService;
@Autowired
@Qualifier("tfaMailOtpAuthn")
protected AbstractOtpAuthn tfaMailOtpAuthn;
@Qualifier("mailOtpAuthn")
protected AbstractOtpAuthn mailOtpAuthn;
@Autowired
@Qualifier("tfaMobileOtpAuthn")
protected AbstractOtpAuthn tfaMobileOtpAuthn;
@Qualifier("smsOtpAuthn")
protected AbstractOtpAuthn smsOtpAuthn;
@RequestMapping(value = { "/forward" })
@@ -89,10 +89,10 @@ public class ForgotPasswordContorller {
Matcher matcher = emailRegex.matcher(emailMobile);
if (matcher.matches() && null != userInfo) {
tfaMailOtpAuthn.produce(userInfo);
mailOtpAuthn.produce(userInfo);
forgotType = ForgotType.EMAIL;
}else if (null != userInfo) {
tfaMobileOtpAuthn.produce(userInfo);
smsOtpAuthn.produce(userInfo);
forgotType = ForgotType.MOBILE;
}
@@ -126,8 +126,8 @@ public class ForgotPasswordContorller {
userInfo.setUsername(username);
userInfo.setPassword(password);
userInfo.setDecipherable(password);
if ((forgotType == ForgotType.EMAIL && tfaMailOtpAuthn.validate(userInfo, captcha)) ||
(forgotType == ForgotType.MOBILE && tfaMobileOtpAuthn.validate(userInfo, captcha))
if ((forgotType == ForgotType.EMAIL && mailOtpAuthn.validate(userInfo, captcha)) ||
(forgotType == ForgotType.MOBILE && smsOtpAuthn.validate(userInfo, captcha))
) {
userInfoService.changePassword(userInfo);
modelAndView.addObject("passwordResetResult", PasswordResetResult.SUCCESS);

View File

@@ -19,6 +19,8 @@ package org.maxkey.web.endpoint;
import java.io.IOException;
import java.util.HashMap;
import java.util.regex.Pattern;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -79,6 +81,13 @@ public class LoginEndpoint {
@Qualifier("tfaOtpAuthn")
protected AbstractOtpAuthn tfaOtpAuthn;
@Autowired
@Qualifier("smsOtpAuthn")
protected AbstractOtpAuthn smsOtpAuthn;
Pattern mobileRegex = Pattern.compile(
"^(13[4,5,6,7,8,9]|15[0,8,9,1,7]|188|187)\\\\d{8}$");
/**
* init login
* @return
@@ -154,14 +163,12 @@ public class LoginEndpoint {
return authnType;
}
@RequestMapping("/login/otp/{username}")
@RequestMapping("/login/sendsms/{mobile}")
@ResponseBody
public String produceOtp(@PathVariable("username") String username) {
UserInfo userInfo = new UserInfo();
userInfo.setUsername(username);
UserInfo queryUserInfo=userInfoService.loadByUsername(username);//(userInfo);
public String produceOtp(@PathVariable("mobile") String mobile) {
UserInfo queryUserInfo=userInfoService.queryUserInfoByEmailMobile(mobile);
if(queryUserInfo!=null) {
tfaOtpAuthn.produce(queryUserInfo);
smsOtpAuthn.produce(queryUserInfo);
return "ok";
}

View File

@@ -206,9 +206,9 @@ maxkey.otp.sms.aliyun.accesssecret=05d5485357bc
maxkey.otp.sms.aliyun.templatecode=14860095
maxkey.otp.sms.aliyun.signname=maxkey
#yunxin
maxkey.otp.sms.yunxin.appkey=94395d754eb55693043f5d6a2b772ef4
maxkey.otp.sms.yunxin.appkey=94395d754eb55693043f5d6a2b772ef3
maxkey.otp.sms.yunxin.appsecret=05d5485357bc
maxkey.otp.sms.yunxin.templateid=14860095
maxkey.otp.sms.yunxin.templateid=14860099
#tencentcloud
maxkey.otp.sms.tencentcloud.secretid=94395d754eb55693043f5d6a2b772ef4
maxkey.otp.sms.tencentcloud.secretkey=05d5485357bc

View File

@@ -42,11 +42,22 @@ login.text.login.twofactor.obtain=\u83b7\u53d6\u52a8\u6001\u9a8c\u8bc1\u7801
login.text.login.twofactor.obtain.valid.unit=\u79d2
login.text.login.twofactor.validTime=\u5269\u4f59\u65f6\u95f4
login.text.login.twofactor.validTime.unit=\u79d2
login.text.login.mobile.obtain.valid=\u91cd\u65b0\u83b7\u53d6
login.text.login.mobile.obtain=\u53D1\u9001\u9a8c\u8bc1\u7801
login.text.login.mobile.obtain.valid.unit=\u79d2
login.text.login.mobile.validTime=\u5269\u4f59\u65f6\u95f4
login.text.login.mobile.validTime.unit=\u79d2
login.text.login.twofactor=\u5b89\u5168\u8ba4\u8bc1
login.text.login.normal=\u57fa\u672c\u8ba4\u8bc1
login.text.login.mobile=\u624B\u673A\u767B\u5F55
login.text.username=\u7528\u6237\u540d
login.text.mobile=\u624B\u673A\u53F7\u7801
login.text.password=\u5bc6    \u7801
login.text.captcha=\u9a8c\u8bc1\u7801
login.text.smscode=\u77ED\u4FE1\u9a8c\u8bc1\u7801
login.text.remeberme=\u8bb0\u4f4f\u767b\u5f55
login.text.forgotpassword=\u5fd8\u8bb0\u5bc6\u7801
login.button.login=\u767b\u5f55

View File

@@ -42,11 +42,22 @@ login.text.login.twofactor.obtain=Get dynamic verification code
login.text.login.twofactor.obtain.valid.unit=seconds
login.text.login.twofactor.validTime=Remaining
login.text.login.twofactor.validTime.unit=seconds
login.text.login.mobile.obtain.valid=Resend
login.text.login.mobile.obtain=Send code
login.text.login.mobile.obtain.valid.unit=seconds
login.text.login.mobile.validTime=Remaining
login.text.login.mobile.validTime.unit=seconds
login.text.login.twofactor=Two-Factors
login.text.login.normal=Normal Login
login.text.login.mobile=Mobile Login
login.text.username=Username
login.text.mobile=Phone Number
login.text.password=Password
login.text.captcha=CAPTCHA
login.text.smscode=Message Code
login.text.remeberme=RemeberMe
login.text.forgotpassword=Forgot Password
login.button.login=Login

View File

@@ -42,11 +42,22 @@ login.text.login.twofactor.obtain=\u83b7\u53d6\u52a8\u6001\u9a8c\u8bc1\u7801
login.text.login.twofactor.obtain.valid.unit=\u79d2
login.text.login.twofactor.validTime=\u5269\u4f59\u65f6\u95f4
login.text.login.twofactor.validTime.unit=\u79d2
login.text.login.mobile.obtain.valid=\u91cd\u65b0\u83b7\u53d6
login.text.login.mobile.obtain=\u53D1\u9001\u9a8c\u8bc1\u7801
login.text.login.mobile.obtain.valid.unit=\u79d2
login.text.login.mobile.validTime=\u5269\u4f59\u65f6\u95f4
login.text.login.mobile.validTime.unit=\u79d2
login.text.login.twofactor=\u5b89\u5168\u8ba4\u8bc1
login.text.login.normal=\u57fa\u672c\u8ba4\u8bc1
login.text.login.mobile=\u624B\u673A\u767B\u5F55
login.text.username=\u7528\u6237\u540d
login.text.mobile=\u624B\u673A\u53F7\u7801
login.text.password=\u5bc6    \u7801
login.text.captcha=\u9a8c\u8bc1\u7801
login.text.smscode=\u77ED\u4FE1\u9a8c\u8bc1\u7801
login.text.remeberme=\u8bb0\u4f4f\u767b\u5f55
login.text.forgotpassword=\u5fd8\u8bb0\u5bc6\u7801
login.button.login=\u767b\u5f55

View File

@@ -310,15 +310,14 @@ body{
font-weight: bold;
}
#tfa_j_otp_captcha{
width :120px;
/*width :230px;*/
#tfa_j_otp_captcha,#mobile_j_password{
width :110px;
font-size: 14px;
font-weight: bold;
}
#tfa_j_otp_captcha_button{
width :130px;
#tfa_j_otp_captcha_button,#mobile_j_otp_captcha_button{
width :120px;
height: 34px;
font-size: 14px;
font-weight: bold;
@@ -330,11 +329,11 @@ body{
vertical-align: top;
}
#switch_commonLogin,#switch_tfaLogin{
#normalLogin,#tfaLogin,#mobileLogin{
width :49%;
}
#div_tfaLogin{
#div_tfaLogin , #div_mobileLogin{
display: none;
}

View File

@@ -35,16 +35,16 @@ $(function(){
if($(".switch_tab_current").attr("id")==(this.id)){
return;
}
$(".switch_tab .switch_tab_class").removeClass("switch_tab_current");
$(this).addClass("switch_tab_current");
$(".switch_tab li").each(function(){
$("#"+$(this).attr("value")).hide();
$("#div_"+$(this).attr("id")).hide();
});
$("#"+$(this).attr("value")).show();
$("#div_"+$(this).attr("id")).show();
if (typeof(switchTab) == "function"){
switchTab($(this).attr("value"));//user define after switch Tab
switchTab($(this).attr("id"));//user define after switch Tab
}
});
//document forward

File diff suppressed because one or more lines are too long

View File

@@ -31,12 +31,12 @@
var captchaCountTimer;
var captchaCount=60;
function getCaptchaCount(){
$("#tfa_j_otp_captcha_button").val("<@locale code="login.text.login.twofactor.obtain.valid"/>("+captchaCount+")<@locale code="login.text.login.twofactor.obtain.valid.unit"/>");
$("#mobile_j_otp_captcha_button").val("<@locale code="login.text.login.mobile.obtain.valid"/>("+captchaCount+")<@locale code="login.text.login.mobile.obtain.valid.unit"/>");
captchaCount--;
if(captchaCount==0){
$("#tfa_j_otp_captcha_button").val("<@locale code="login.text.login.twofactor.obtain"/>");
$("#mobile_j_otp_captcha_button").val("<@locale code="login.text.login.mobile.obtain"/>");
captchaCount=60;
clearInterval(captchaCountTimer);
}
@@ -93,26 +93,20 @@
$("#tfa_j_otp_captcha_button").val("<@locale code="login.text.login.twofactor.validTime"/>("+timeBaseCount+")<@locale code="login.text.login.twofactor.validTime.unit"/>");
};
</#if>
var currentSwitchTab="div_commonLogin";
var currentSwitchTab="normalLogin";
<#--submit form-->
function doLoginSubmit(){
if(currentSwitchTab=="div_commonLogin"){
$.cookie("username", $("#loginForm input[name=j_username]").val(), { expires: 7 });
$.cookie("switch_form", 1, { expires: 7 });
$("#loginSubmitButton").click();
}else{
$.cookie("username", $("#tfaLoginForm input[name=j_username]").val(), { expires: 7 });
$.cookie("switch_form", 2, { expires: 7 });
$("#tfaLoginSubmitButton").click();
}
$.cookie("username", $("#"+currentSwitchTab+"Form input[name=username]").val(), { expires: 7 });
$("#"+currentSwitchTab+"SubmitButton").click();
$.cookie("switch_tab", currentSwitchTab, { expires: 7 });
};
<#--switch LoginForm && tfaLoginForm-->
<#--switch Login Form-->
function switchTab(id){
if($("#"+id+" input[name=j_username]").val()==""){
$("#"+id+" input[name=j_username]").focus();
if($("#"+id+"Form input[name=username]").val()==""){
$("#"+id+"Form input[name=username]").focus();
}else{
$("#"+id+" input[name=j_password]").focus();
$("#"+id+"Form input[name=password]").focus();
}
currentSwitchTab=id;
}
@@ -130,39 +124,30 @@
</#if>
<#--submit loginForme-->
$("#loginSubmit").on("click",function(){
doLoginSubmit();
});
<#--submit tfaLoginForme-->
$("#tfa_loginSubmit").on("click",function(){
$(".doLoginSubmit").on("click",function(){
doLoginSubmit();
});
<#--read username cookie for login e-->
if($.cookie("username")!=undefined&&$.cookie("username")!=""){
$("input[name=j_username]").val($.cookie("username")==undefined?"":$.cookie("username"));
$("input[name=j_password]").val("");
var switch_tab=$.cookie("switch_tab")==undefined?1:$.cookie("switch_tab");
if(switch_tab==2){
switchTab("switch_tfaLogin");
}else{
$("#div_commonLogin input[name=j_password]").focus();
}
var switch_tab=$.cookie("switch_tab")==undefined?"normalLogin":$.cookie("switch_tab");
$("#"+switch_tab).click();
$("#"+switch_tab+"Form input[name=username]").val($.cookie("username")==undefined?"":$.cookie("username"));
$("#div_"+switch_tab+" input[name=password]").focus();
}else{
$("#div_commonLogin input[name=j_username]").focus();
$("#div_normalLogin input[name=username]").focus();
}
<#--resend captchae-->
$("#tfa_j_otp_captcha_button").on("click",function(){
$("#mobile_j_otp_captcha_button").on("click",function(){
if(captchaCount<60){
return;
}
var loginName=$("#tfa_j_username").val();
var loginName=$("#mobile_j_username").val();
if(loginName==""){
return;
}
$.get("<@base />/login/otp/"+loginName,function(data,status){
alert("Data: " + data + "\nStatus: " + status);
$.get("<@base />/login/sendsms/"+loginName,function(data,status){
//alert("Data: " + data + "\nStatus: " + status);
});
<#--todo:send captcha-->
@@ -190,159 +175,37 @@
<tr>
<td>
<ul id="switch_tab" class="switch_tab">
<li id="switch_commonLogin" value="div_commonLogin" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);">
<@locale code="login.text.login.normal"/></a></li>
<li id="switch_tfaLogin" value="div_tfaLogin" class="switch_tab_class"><a href="javascript:void(0);">
<@locale code="login.text.login.twofactor"/></a></li>
<li id="normalLogin" class="switch_tab_class switch_tab_current">
<a href="javascript:void(0);">
<@locale code="login.text.login.normal"/>
</a>
</li>
<!--
<li id="tfaLogin" class="switch_tab_class">
<a href="javascript:void(0);">
<@locale code="login.text.login.twofactor"/>
</a>
</li>-->
<!---->
<li id="mobileLogin" class="switch_tab_class">
<a href="javascript:void(0);">
<@locale code="login.text.login.mobile"/>
</a>
</li>
</ul>
</td>
</tr>
<tr>
<td>
<div id="div_commonLogin" >
<form id="loginForm" name="loginForm" action="<@base />/logon.do" method="post" class="needs-validation" novalidate>
<input type="hidden" name="authType" value="basic"/>
<table class="table login_form_table">
<tr class="loginErrorMessage" <#if ''==loginErrorMessage>style="display:none;"</#if>>
<td colspan="2" style="color:red;">
${loginErrorMessage!}
</td>
</tr>
<tr>
<td><@locale code="login.text.username"/></td>
<td>
<div class="wrapper">
<i class="fa fa-user"></i>
<input required="" class="form-control" type='text' id='j_username' name='username' value="admin" tabindex="1"/>
</div >
</td>
</tr>
<tr>
<td><@locale code="login.text.password"/></td>
<td>
<div class="wrapper">
<i class="fa fa-key fa-2" style="color: #FFD700;"></i>
<input required="" class="form-control" type='password' id='j_password' name='password' value="maxkey" tabindex="2"/>
</div >
</td>
</tr>
<#if true==isCaptcha>
<tr>
<td><@locale code="login.text.captcha"/></td>
<td>
<div class="wrapper">
<i class="fa fa-lock fa-2"></i>
<input required="" class="form-control " type='text' id="j_captcha" name="captcha" tabindex="3" value="" style="float: left;"/><img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha"/>
</div >
</td>
</tr>
</#if>
<#if true==isRemeberMe>
<tr>
<td colspan="2">
<table style="width:100%">
<tr>
<td style="width:50%">
<span class="form_checkbox_label">
<input type='checkbox' id="remeberMe" name="remeberMe" class="checkbox" tabindex="4" value="remeberMe" />
<@locale code="login.text.remeberme"/>
</span>
</td>
<td style="width:50%"><a href="<@base />/forgotpassword/forward"><@locale code="login.text.forgotpassword"/></a></td>
</tr>
</table>
</td>
</tr>
</#if>
<tr style="display:none">
<td>sessionid</td>
<td><input class="form-control" type='text' id="j_sessionid" name="sessionId" value="${sessionid}" /></td>
</tr>
<tr >
<td colspan="2">
<input type="submit" id="loginSubmitButton" style="display: none;" />
<input id="loginSubmit" type="button" tabindex="5" style="width: 100%;" class="button btn btn-lg btn-primary btn-block" value="<@locale code="login.button.login"/>"/></td>
</tr>
</table>
<div class="clear"></div>
</form>
</div>
<div id="div_tfaLogin" >
<form id="tfaLoginForm" name="tfaLoginForm" action="<@base />/logon.do" method="post" class="needs-validation" novalidate>
<input type="hidden" name="authType" value="tfa"/>
<table class="login_form_table">
<tr class="loginErrorMessage" <#if ''==loginErrorMessage>style="display:none;"</#if>>
<td colspan="2" style="color:red;">
${loginErrorMessage!}
</td>
</tr>
<tr>
<td><@locale code="login.text.username"/></td>
<td><input required="" class="form-control" type='text' id='tfa_j_username' name='username' value="" tabindex="1"/></td>
</tr>
<tr>
<td><@locale code="login.text.password"/></td>
<td><input required="" class="form-control" type='password' id='tfa_j_password' name='password' value="" tabindex="2" /></td>
</tr>
<#if true==isMfa >
<tr>
<td><@locale code="login.text.captcha"/></td>
<td>
<input required="" class="form-control" type='text' id="tfa_j_otp_captcha" name="otpCaptcha" tabindex="3" value="" style="float: left;"/>
<input class="form-control" id="tfa_j_otp_captcha_button" type="button" tabindex="5" class="button" value="获取动态验证码"/>
</td>
</tr>
<#if "TOPT"==otpType >
<tr>
<td><@locale code="login.text.currenttime"/></td>
<td>
<input class="form-control" readonly type='text' id="currentTime" name="currentTime" tabindex="3" value="" />
</td>
</tr>
</#if>
<tr>
<td></td>
<td>
<div id="currentTime"></div>
</td>
</tr>
</#if>
<#if true==isRemeberMe>
<tr>
<td colspan="2">
<table style="width:100%">
<tr>
<td style="width:50%">
<span class="form_checkbox_label">
<input type='checkbox' id="tfa_remeberMe" name="remeberMe" class="checkbox" tabindex="4" value="remeberMe" />
<@locale code="login.text.remeberme"/>
</span>
</td>
<td style="width:50%"><a href="<@base />/forgotpassword/forward"><@locale code="login.text.forgotpassword"/></a></td>
</tr>
</table>
</td>
</tr>
</#if>
<tr style="display:none">
<td>sessionid</td>
<td><input class="form-control" type='text' id="tfa_sessionid" name="sessionId" value="${sessionid}" /></td>
</tr>
<tr >
<td colspan="2">
<input type="submit" id="tfaLoginSubmitButton" style="display: none;" />
<input id="tfa_loginSubmit" type="button" style="width: 100%;" tabindex="5" class="button btn btn-lg btn-primary btn-block" value="<@locale code="login.button.login"/>"/></td>
</tr>
</table>
<div class="clear"></div>
</form>
</div>
<div id="div_normalLogin" >
<#include "loginnormal.ftl">
</div>
<div id="div_tfaLogin" >
<#include "logintfa.ftl">
</div>
<div id="div_mobileLogin" >
<#include "loginmobile.ftl">
</div>
</td>
</tr>
<tr>

View File

@@ -0,0 +1,57 @@
<form id="mobileLoginForm" name="mobileLoginForm" action="<@base />/logon.do" method="post" class="needs-validation" novalidate>
<input type="hidden" name="authType" value="mobile"/>
<table class="login_form_table">
<tr class="loginErrorMessage" <#if ''==loginErrorMessage>style="display:none;"</#if>>
<td colspan="2" style="color:red;">
${loginErrorMessage!}
</td>
</tr>
<tr>
<td><@locale code="login.text.mobile"/></td>
<td>
<div class="wrapper">
<i class="fa fa-mobile"></i>
<input required="" class="form-control" type='text' id='mobile_j_username' name='username' value="" tabindex="1"/>
</div>
</td>
</tr>
<tr>
<td><@locale code="login.text.smscode"/></td>
<td>
<div class="wrapper">
<i class="fa fa-lock fa-2"></i>
<input required="" class="form-control" type='password' id='mobile_j_password' name='password' value="" tabindex="2" style="float: left;"/>
<input class="form-control" id="mobile_j_otp_captcha_button" type="button" tabindex="5" class="button" value="<@locale code="login.text.login.mobile.obtain"/>"/>
</div>
</td>
</tr>
<#if true==isRemeberMe>
<tr>
<td colspan="2">
<table style="width:100%">
<tr>
<td style="width:50%">
<span class="form_checkbox_label">
<input type='checkbox' id="mobile_remeberMe" name="remeberMe" class="checkbox" tabindex="4" value="remeberMe" />
<@locale code="login.text.remeberme"/>
</span>
</td>
<td style="width:50%"><a href="<@base />/forgotpassword/forward"><@locale code="login.text.forgotpassword"/></a></td>
</tr>
</table>
</td>
</tr>
</#if>
<tr style="display:none">
<td>sessionid</td>
<td><input class="form-control" type='text' id="mobile_sessionid" name="sessionId" value="${sessionid}" /></td>
</tr>
<tr >
<td colspan="2">
<input type="submit" id="mobileLoginSubmitButton" style="display: none;" />
<input id="mobileLoginSubmit" type="button" style="width: 100%;" tabindex="5" class="doLoginSubmit button btn btn-lg btn-primary btn-block" value="<@locale code="login.button.login"/>"/></td>
</tr>
</table>
<div class="clear"></div>
</form>

View File

@@ -0,0 +1,69 @@
<form id="normalLoginForm" name="normalLoginForm" action="<@base />/logon.do" method="post" class="needs-validation" novalidate>
<input type="hidden" name="authType" value="normal"/>
<table class="table login_form_table">
<tr class="loginErrorMessage" <#if ''==loginErrorMessage>style="display:none;"</#if>>
<td colspan="2" style="color:red;">
${loginErrorMessage!}
</td>
</tr>
<tr>
<td><@locale code="login.text.username"/></td>
<td>
<div class="wrapper">
<i class="fa fa-user"></i>
<input required="" class="form-control" type='text' id='j_username' name='username' value="admin" tabindex="1"/>
</div >
</td>
</tr>
<tr>
<td><@locale code="login.text.password"/></td>
<td>
<div class="wrapper">
<i class="fa fa-key fa-2" style="color: #FFD700;"></i>
<input required="" class="form-control" type='password' id='j_password' name='password' value="maxkey" tabindex="2"/>
</div >
</td>
</tr>
<#if true==isCaptcha>
<tr>
<td><@locale code="login.text.captcha"/></td>
<td>
<div class="wrapper">
<i class="fa fa-lock fa-2"></i>
<input required="" class="form-control " type='text' id="j_captcha" name="captcha" tabindex="3" value="" style="float: left;"/><img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha"/>
</div >
</td>
</tr>
</#if>
<#if true==isRemeberMe>
<tr>
<td colspan="2">
<table style="width:100%">
<tr>
<td style="width:50%">
<span class="form_checkbox_label">
<input type='checkbox' id="remeberMe" name="remeberMe" class="checkbox" tabindex="4" value="remeberMe" />
<@locale code="login.text.remeberme"/>
</span>
</td>
<td style="width:50%"><a href="<@base />/forgotpassword/forward"><@locale code="login.text.forgotpassword"/></a></td>
</tr>
</table>
</td>
</tr>
</#if>
<tr style="display:none">
<td>sessionid</td>
<td><input class="form-control" type='text' id="j_sessionid" name="sessionId" value="${sessionid}" /></td>
</tr>
<tr >
<td colspan="2">
<input type="submit" id="normalLoginSubmitButton" style="display: none;" />
<input id="normalLoginSubmit" type="button" tabindex="5" style="width: 100%;" class="doLoginSubmit button btn btn-lg btn-primary btn-block" value="<@locale code="login.button.login"/>"/></td>
</tr>
</table>
<div class="clear"></div>
</form>

View File

@@ -0,0 +1,83 @@
<form id="tfaLoginForm" name="tfaLoginForm" action="<@base />/logon.do" method="post" class="needs-validation" novalidate>
<input type="hidden" name="authType" value="tfa"/>
<table class="login_form_table">
<tr class="loginErrorMessage" <#if ''==loginErrorMessage>style="display:none;"</#if>>
<td colspan="2" style="color:red;">
${loginErrorMessage!}
</td>
</tr>
<tr>
<td><@locale code="login.text.username"/></td>
<td>
<div class="wrapper">
<i class="fa fa-user"></i>
<input required="" class="form-control" type='text' id='tfa_j_username' name='username' value="" tabindex="1"/>
</div>
</td>
</tr>
<tr>
<td><@locale code="login.text.password"/></td>
<td>
<div class="wrapper">
<i class="fa fa-key fa-2" style="color: #FFD700;"></i>
<input required="" class="form-control" type='password' id='tfa_j_password' name='password' value="" tabindex="2" />
</div>
</td>
</tr>
<#if true==isMfa >
<tr>
<td><@locale code="login.text.captcha"/></td>
<td>
<div class="wrapper">
<i class="fa fa-lock fa-2"></i>
<input required="" class="form-control" type='text' id="tfa_j_otp_captcha" name="otpCaptcha" tabindex="3" value="" style="float: left;"/>
<input class="form-control" id="tfa_j_otp_captcha_button" type="button" tabindex="5" class="button" value="<@locale code="login.text.login.twofactor.obtain"/>"/>
</div>
</td>
</tr>
<#if "TOPT"==otpType >
<tr>
<td><@locale code="login.text.currenttime"/></td>
<td>
<input class="form-control" readonly type='text' id="currentTime" name="currentTime" tabindex="3" value="" />
</td>
</tr>
</#if>
<tr>
<td></td>
<td>
<div id="currentTime"></div>
</td>
</tr>
</#if>
<#if true==isRemeberMe>
<tr>
<td colspan="2">
<table style="width:100%">
<tr>
<td style="width:50%">
<span class="form_checkbox_label">
<input type='checkbox' id="tfa_remeberMe" name="remeberMe" class="checkbox" tabindex="4" value="remeberMe" />
<@locale code="login.text.remeberme"/>
</span>
</td>
<td style="width:50%"><a href="<@base />/forgotpassword/forward"><@locale code="login.text.forgotpassword"/></a></td>
</tr>
</table>
</td>
</tr>
</#if>
<tr style="display:none">
<td>sessionid</td>
<td><input class="form-control" type='text' id="tfa_sessionid" name="sessionId" value="${sessionid}" /></td>
</tr>
<tr >
<td colspan="2">
<input type="submit" id="tfaLoginSubmitButton" style="display: none;" />
<input id="tfaLoginSubmit" type="button" style="width: 100%;" tabindex="5" class="doLoginSubmit button btn btn-lg btn-primary btn-block" value="<@locale code="login.button.login"/>"/></td>
</tr>
</table>
<div class="clear"></div>
</form>