diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java index 6fc8a6a88e9a3e012b1112531d09e61e7f527c6a..1340838dc07018b265180b927e49b6fb84be6b5b 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java @@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; /** @@ -48,10 +48,6 @@ public class ImageCaptchaEndpoint { @Autowired private Producer captchaProducer; - - @Value("${maxkey.login.captcha.type}") - private String captchaType; - /** * captcha image Producer. @@ -60,9 +56,11 @@ public class ImageCaptchaEndpoint { * @param response HttpServletResponse */ @RequestMapping(value = "/captcha") - public void captchaHandleRequest(HttpServletRequest request, HttpServletResponse response) { + public void captchaHandleRequest(HttpServletRequest request, + HttpServletResponse response, + @RequestParam(value="captcha",required=false,defaultValue="text") String captchaType) { try { - + String kaptchaText = captchaProducer.createText(); if (captchaType.equalsIgnoreCase("Arithmetic")) { Integer intParamA = Integer.valueOf(kaptchaText.substring(0, 1)); @@ -127,11 +125,6 @@ public class ImageCaptchaEndpoint { } } } - - - public void setCaptchaType(String captchaType) { - this.captchaType = captchaType; - } public void setCaptchaProducer(Producer captchaProducer) { this.captchaProducer = captchaProducer; 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 8b8a7a969f00b1f109cd7e4fedfe2b18cc5be210..2988f56ecaee70c7501ed0b542dc58d4de3147c9 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 @@ -203,8 +203,7 @@ public abstract class AbstractAuthenticationProvider { */ protected void captchaValid(String captcha, String authType) { // for basic - if (applicationConfig.getLoginConfig().isCaptcha() - && authType.equalsIgnoreCase(AuthType.NORMAL)) { + if (authType.equalsIgnoreCase(AuthType.NORMAL)) { _logger.info("captcha : " + WebContext.getSession().getAttribute( WebConstants.KAPTCHA_SESSION_KEY).toString()); 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 2e2e532578367c51d868ba7114dc2a488b9cb67f..40a606e3bec27e5202ceffd02efdc3fc5353a1ac 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 @@ -24,6 +24,7 @@ import org.maxkey.authn.online.OnlineTicketServices; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.entity.Institutions; import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.password.onetimepwd.OtpAuthnService; @@ -84,8 +85,11 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider //jwtTokenValid(j_jwtToken); authTypeValid(loginCredential.getAuthType()); - - captchaValid(loginCredential.getCaptcha(),loginCredential.getAuthType()); + + Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); + if(inst.getCaptcha().equalsIgnoreCase("YES")) { + captchaValid(loginCredential.getCaptcha(),loginCredential.getAuthType()); + } emptyPasswordValid(loginCredential.getPassword()); diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java index 3a6459380c4e1371779bf7217aee803a9f5a002e..d130a54463ee1156cbf6e49dcbade2b8d96d1099 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java @@ -22,19 +22,10 @@ import org.springframework.context.annotation.Configuration; @Configuration public class LoginConfig { - @Value("${maxkey.login.captcha}") - boolean captcha; - - //验证码类型 text 文本 ， arithmetic算术验证码 - @Value("${maxkey.login.captcha.type:text}") - String captchaType; @Value("${maxkey.login.mfa}") boolean mfa; - @Value("${maxkey.login.socialsignon}") - boolean socialSignOn; - @Value("${maxkey.login.kerberos}") boolean kerberos; @@ -43,9 +34,6 @@ public class LoginConfig { @Value("${maxkey.login.wsfederation}") boolean wsFederation; - - @Value("${maxkey.login.default.uri}") - String defaultUri; /** * . @@ -53,21 +41,7 @@ public class LoginConfig { public LoginConfig() { } - public boolean isCaptcha() { - return captcha; - } - - public void setCaptcha(boolean captcha) { - this.captcha = captcha; - } - - public boolean isSocialSignOn() { - return socialSignOn; - } - public void setSocialSignOn(boolean socialSignOn) { - this.socialSignOn = socialSignOn; - } public boolean isKerberos() { return kerberos; @@ -85,13 +59,7 @@ public class LoginConfig { this.mfa = mfa; } - public String getDefaultUri() { - return defaultUri; - } - public void setDefaultUri(String defaultUri) { - this.defaultUri = defaultUri; - } public boolean isRemeberMe() { return remeberMe; @@ -109,35 +77,19 @@ public class LoginConfig { this.wsFederation = wsFederation; } - public String getCaptchaType() { - return captchaType; - } - - public void setCaptchaType(String captchaType) { - this.captchaType = captchaType; - } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("LoginConfig [captcha="); - builder.append(captcha); - builder.append(", captchaType="); - builder.append(captchaType); - builder.append(", mfa="); - builder.append(mfa); - builder.append(", socialSignOn="); - builder.append(socialSignOn); - builder.append(", kerberos="); - builder.append(kerberos); - builder.append(", remeberMe="); - builder.append(remeberMe); - builder.append(", wsFederation="); - builder.append(wsFederation); - builder.append(", defaultUri="); - builder.append(defaultUri); - builder.append("]"); - return builder.toString(); - } + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("LoginConfig [mfa="); + builder.append(mfa); + builder.append(", kerberos="); + builder.append(kerberos); + builder.append(", remeberMe="); + builder.append(remeberMe); + builder.append(", wsFederation="); + builder.append(wsFederation); + builder.append("]"); + return builder.toString(); + } } diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java b/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java index 3b19658d6c555c7e2ccdedc591a0c4779fbe78e8..cfc143a5d4c6e6459d292f6588cd4f6bd15a85a1 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java @@ -44,14 +44,6 @@ public class Institutions extends JpaBaseEntity implements Serializable { @Column private String fullName; @Column - private String logo; - @Column - private String title; - @Column - private String consoleTitle; - @Column - private String domain; - @Column private String division; @Column private String country; @@ -76,8 +68,25 @@ public class Institutions extends JpaBaseEntity implements Serializable { @Column private String description; + @Column private int status; + + @Column + private String logo; + @Column + private String title; + @Column + private String consoleTitle; + @Column + private String domain; + @Column + private String captcha; + @Column + private String captchaSupport; + @Column + private String defaultUri; + @Column String createdBy; @Column @@ -236,6 +245,33 @@ public class Institutions extends JpaBaseEntity implements Serializable { public void setModifiedDate(String modifiedDate) { this.modifiedDate = modifiedDate; } + + + public String getCaptcha() { + return captcha; + } + public void setCaptcha(String captcha) { + this.captcha = captcha; + } + + public String getCaptchaSupport() { + return captchaSupport; + } + + public boolean isCaptchaSupport() { + return (captchaSupport !=null && captchaSupport.equalsIgnoreCase("YES") ? true : false); + } + + + public void setCaptchaSupport(String captchaSupport) { + this.captchaSupport = captchaSupport; + } + public String getDefaultUri() { + return defaultUri; + } + public void setDefaultUri(String defaultUri) { + this.defaultUri = defaultUri; + } @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java b/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java index 4a71510941301049732f0fd12f57bf1bb320e942..6bc3f5875df9c28b78dcc141c83a4c55be1bb2e6 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java @@ -104,6 +104,9 @@ public class InstitutionsRepository { institution.setDomain(rs.getString("domain")); institution.setTitle(rs.getString("title")); institution.setConsoleTitle(rs.getString("consoletitle")); + institution.setCaptcha(rs.getString("captcha")); + institution.setCaptchaSupport(rs.getString("CaptchaSupport")); + institution.setDefaultUri(rs.getString("DefaultUri")); return institution; } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java index 51270c28fce397d911da8dd1e3ac144fb655259d..0cf945dee70ae6771bd4b98a82ab84c1df564238 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java @@ -56,36 +56,36 @@ public class SocialSignOnListController { public ModelAndView forwardUpdate() { ModelAndView modelAndView=new ModelAndView("social/socialSignOnProvider"); - if(applicationConfig.getLoginConfig().isSocialSignOn()){ - Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); - List listSocialSignOnProvider = - socialSignOnProviderService.loadSocialsProviders(inst.getId()).getSocialSignOnProviders(); - - SocialsAssociate socialSignOnUser=new SocialsAssociate(); - socialSignOnUser.setUserId(WebContext.getUserInfo().getId()); - List listSocialSignOnUserToken= socialSignOnUserService.query(socialSignOnUser); - List listBindSocialSignOnProvider=new ArrayList(); - _logger.debug("list SocialSignOnProvider : "+listSocialSignOnProvider); - _logger.debug("list SocialSignOnUserToken : "+listSocialSignOnUserToken); - for (SocialsProvider ssop : listSocialSignOnProvider){ - SocialsProvider socialSignOnProvider=new SocialsProvider(); - socialSignOnProvider.setProvider(ssop.getProvider()); - socialSignOnProvider.setProviderName(ssop.getProviderName()); - socialSignOnProvider.setIcon(ssop.getIcon()); - socialSignOnProvider.setSortOrder(ssop.getSortOrder()); - for(SocialsAssociate ssout :listSocialSignOnUserToken){ - if(ssout.getProvider().equals(ssop.getProvider())){ - socialSignOnProvider.setUserBind(true); - socialSignOnProvider.setBindTime(ssout.getCreatedDate()); - socialSignOnProvider.setLastLoginTime(ssout.getUpdatedDate()); - _logger.debug("binded provider : "+ssout.getProvider()); - } + + Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); + List listSocialSignOnProvider = + socialSignOnProviderService.loadSocialsProviders(inst.getId()).getSocialSignOnProviders(); + + SocialsAssociate socialSignOnUser=new SocialsAssociate(); + socialSignOnUser.setUserId(WebContext.getUserInfo().getId()); + List listSocialSignOnUserToken= socialSignOnUserService.query(socialSignOnUser); + List listBindSocialSignOnProvider=new ArrayList(); + _logger.debug("list SocialSignOnProvider : "+listSocialSignOnProvider); + _logger.debug("list SocialSignOnUserToken : "+listSocialSignOnUserToken); + for (SocialsProvider ssop : listSocialSignOnProvider){ + SocialsProvider socialSignOnProvider=new SocialsProvider(); + socialSignOnProvider.setProvider(ssop.getProvider()); + socialSignOnProvider.setProviderName(ssop.getProviderName()); + socialSignOnProvider.setIcon(ssop.getIcon()); + socialSignOnProvider.setSortOrder(ssop.getSortOrder()); + for(SocialsAssociate ssout :listSocialSignOnUserToken){ + if(ssout.getProvider().equals(ssop.getProvider())){ + socialSignOnProvider.setUserBind(true); + socialSignOnProvider.setBindTime(ssout.getCreatedDate()); + socialSignOnProvider.setLastLoginTime(ssout.getUpdatedDate()); + _logger.debug("binded provider : "+ssout.getProvider()); } - listBindSocialSignOnProvider.add(socialSignOnProvider); } - - modelAndView.addObject("listSocialSignOnProvider", listBindSocialSignOnProvider); + listBindSocialSignOnProvider.add(socialSignOnProvider); } + + modelAndView.addObject("listSocialSignOnProvider", listBindSocialSignOnProvider); + return modelAndView; } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java index b0bad2ae526ca9131a6dcd2ba7470d88e7ce62a0..8c624855d85266b4a9617487ddcfda37b6e027f0 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java @@ -24,6 +24,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.entity.Institutions; +import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,10 +55,11 @@ public class IndexEndpoint { public ModelAndView forwardindex(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { _logger.debug("IndexEndpoint /forwardindex."); - String defaultUri = applicationConfig.getLoginConfig().getDefaultUri(); + Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); + String defaultUri = inst.getDefaultUri(); if (defaultUri != null && !defaultUri.equals("")) { _logger.debug("defaultUri " + defaultUri); - return WebContext.redirect(applicationConfig.getLoginConfig().getDefaultUri()); + return WebContext.redirect(defaultUri); } _logger.debug("Uri /appList"); return new ModelAndView("/appList"); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index bef5a0116f5ae4e48e55fa903efcf454b4aaac26..d468aa463ad5f9229e44f98113b6a98b25e3a488 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -122,15 +122,13 @@ public class LoginEndpoint { if( applicationConfig.getLoginConfig().isKerberos()){ modelAndView.addObject("userDomainUrlJson", kerberosService.buildKerberosProxys()); } - modelAndView.addObject("isCaptcha", applicationConfig.getLoginConfig().isCaptcha()); + Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); + modelAndView.addObject("isCaptcha", inst.isCaptchaSupport()); + modelAndView.addObject("captcha", inst.getCaptcha()); modelAndView.addObject("sessionid", WebContext.getSession().getId()); //modelAndView.addObject("jwtToken",jwtLoginService.buildLoginJwt()); //load Social Sign On Providers - if(applicationConfig.getLoginConfig().isSocialSignOn()){ - _logger.trace("Load Social Sign On Providers "); - Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); - modelAndView.addObject("sspLogin", socialSignOnProviderService.loadSocialsProviders(inst.getId())); - } + modelAndView.addObject("sspLogin", socialSignOnProviderService.loadSocialsProviders(inst.getId())); Object loginErrorMessage=WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE); modelAndView.addObject("loginErrorMessage", loginErrorMessage==null?"":loginErrorMessage); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties index d228f14e4e9d8b0fa6133121be980db158c4e662..4d9b7d9ab912b57ec0844621a442284760b3cdab 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties @@ -48,10 +48,6 @@ maxkey.app.issuer =CN=ConSec,CN=COM,CN=SH ############################################################################ #Login configuration # ############################################################################ -#enable captcha -maxkey.login.captcha =${LOGIN_CAPTCHA:true} -#text or arithmetic -maxkey.login.captcha.type =${LOGIN_CAPTCHA_TYPE:text} #enable two factor,use one time password maxkey.login.mfa =${LOGIN_MFA_ENABLED:true} #TimeBasedOtpAuthn MailOtpAuthn SmsOtpAuthnYunxin SmsOtpAuthnAliyun SmsOtpAuthnTencentCloud @@ -69,8 +65,7 @@ maxkey.login.remeberme.validity =0 #JWT support maxkey.login.jwt =${LOGIN_JWT:true} maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:${maxkey.server.authz.uri}} -#to default application web site -maxkey.login.default.uri =appList +#whitelist maxkey.ipaddress.whitelist =false #notices show maxkey.notices.visible =false diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties index bacf226f82a328910a910f5d6d0b1e01b0b67fa7..63fda03d989d13d59ac444c8c70a619c3d0b4294 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties @@ -49,10 +49,6 @@ maxkey.app.issuer =CN=ConSec,CN=COM,CN=SH ############################################################################ #Login configuration # ############################################################################ -#enable captcha -maxkey.login.captcha =${LOGIN_CAPTCHA:true} -#text or arithmetic -maxkey.login.captcha.type =${LOGIN_CAPTCHA_TYPE:text} #enable two factor,use one time password maxkey.login.mfa =${LOGIN_MFA_ENABLED:true} #TimeBasedOtpAuthn MailOtpAuthn SmsOtpAuthnYunxin SmsOtpAuthnAliyun SmsOtpAuthnTencentCloud @@ -70,8 +66,7 @@ maxkey.login.remeberme.validity =0 #JWT support maxkey.login.jwt =${LOGIN_JWT:true} maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:${maxkey.server.authz.uri}} -#to default application web site -maxkey.login.default.uri =appList +#whitelist maxkey.ipaddress.whitelist =false #notices show maxkey.notices.visible =false diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl index 536469b6cfe2e6a31a5da35c1bca0fb8139f57f6..1390303553e69fd1acb748303d7690c27313377e 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl @@ -38,7 +38,7 @@
- +
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index 6b2428317c3b3e1e86b704754b531eea823c7505..ede60c8cb6ee3b35743626b5175b0098d755efdf 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -20,6 +20,7 @@ package org.maxkey.web.endpoint; import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.LoginCredential; import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.entity.Institutions; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -64,8 +65,10 @@ public class LoginEndpoint { } ModelAndView modelAndView = new ModelAndView(); + Institutions inst = (Institutions)WebContext.getAttribute(WebConstants.CURRENT_INST); modelAndView.addObject("isRemeberMe", applicationConfig.getLoginConfig().isRemeberMe()); - modelAndView.addObject("isCaptcha", applicationConfig.getLoginConfig().isCaptcha()); + modelAndView.addObject("isCaptcha", inst.isCaptchaSupport()); + modelAndView.addObject("captcha", inst.getCaptcha()); modelAndView.addObject("sessionid", WebContext.getSession().getId()); Object loginErrorMessage=WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE); modelAndView.addObject("loginErrorMessage", loginErrorMessage==null?"":loginErrorMessage); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties index b2ff28a8cfd9056b812114ad540950425bc428c2..fd3964a1dd708fb414ad4913c69085161b0765ef 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties @@ -43,14 +43,8 @@ maxkey.server.message.queue =${SERVER_MESSAGE_QUEUE:none} ############################################################################ #Login configuration # ############################################################################ -#enable captcha -maxkey.login.captcha =${LOGIN_CAPTCHA:true} -#text or arithmetic -maxkey.login.captcha.type =${LOGIN_CAPTCHA_TYPE:text} #enable two factor,use one time password maxkey.login.mfa =false -#enable social sign on -maxkey.login.socialsignon =false #Enable kerberos/SPNEGO maxkey.login.kerberos =false #wsFederation @@ -59,9 +53,6 @@ maxkey.login.wsfederation =false maxkey.login.remeberme =false #validity maxkey.login.remeberme.validity =0 -#default.uri -#to appList page -maxkey.login.default.uri =appList #ipaddress whitelist maxkey.ipaddress.whitelist =false #JWT support diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties index 9e0c057acf5ff12db7e3c1fe34b0bd2c9f4f81d7..24b0cff41c6cfa778b3692547f4e4c133fee5329 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties @@ -504,10 +504,6 @@ synchronizers.syncStartTime=\u533A\u95F4 institutions.name=\u7B80\u79F0 institutions.fullName=\u5168\u79F0 -institutions.logo=\u56FE\u6807 -institutions.title=\u7CFB\u7EDF\u540D\u79F0 -institutions.consoleTitle=\u63A7\u5236\u53F0\u540D\u79F0 -institutions.domain=\u57DF\u540D institutions.division=\u5206\u652F\u673A\u6784 institutions.contact=\u8054\u7CFB\u4EBA institutions.phone=\u7535\u8BDD @@ -520,6 +516,17 @@ institutions.street=\u8857\u9053 institutions.address=\u5730\u5740 institutions.postalcode=\u90AE\u7F16 +institutions.logo=\u56FE\u6807 +institutions.title=\u7CFB\u7EDF\u540D\u79F0 +institutions.consoleTitle=\u63A7\u5236\u53F0\u540D\u79F0 +institutions.domain=\u57DF\u540D +institutions.captchaSupport=\u9A8C\u8BC1\u7801\u652F\u6301 +institutions.captcha=\u9A8C\u8BC1\u7801 +institutions.captcha.type=\u9A8C\u8BC1\u7801\u7C7B\u578B +institutions.captcha.type.text=\u6570\u5B57 +institutions.captcha.type.arithmetic=\u7B97\u672F +institutions.default.uri=\u9ED8\u8BA4\u5730\u5740 + localization.property=\u5C5E\u6027 localization.langZh=\u4E2D\u6587 localization.langEn=\u82F1\u6587 @@ -680,6 +687,7 @@ navs.resources=\u8D44\u6E90\u7BA1\u7406 navs.adapters=\u9002\u914D\u5668\u6CE8\u518C navs.notices=\u901A\u77E5\u516C\u544A navs.institutions=\u673A\u6784\u914D\u7F6E +navs.institutions.system=\u7CFB\u7EDF\u4FE1\u606F navs.socials.provider=\u793E\u4EA4\u670D\u52A1 navs.synchronizers=\u540C\u6B65\u5668\u7BA1\u7406 navs.ldapcontext=LDAP\u914D\u7F6E diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties index 59e8a69af9afb81859c17cb00ae9bc82db86745a..e973df0817b36f12a7cc87161be723a05e16bad1 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties @@ -512,10 +512,6 @@ synchronizers.syncStartTime=During institutions.name=name institutions.fullName=fullName -institutions.logo=logo -institutions.title=Title -institutions.consoleTitle=ConsoleTitle -institutions.domain=domainName institutions.division=division institutions.contact=contact institutions.phone=phone @@ -528,6 +524,17 @@ institutions.street=street institutions.address=address institutions.postalcode=postalcode +institutions.logo=logo +institutions.title=Title +institutions.consoleTitle=ConsoleTitle +institutions.domain=domainName +institutions.captchaSupport=captchaSupport +institutions.captcha=captcha +institutions.captcha.type=captchaType +institutions.captcha.type.text=Numeral +institutions.captcha.type.arithmetic=Arithmetic +institutions.default.uri=defaultUri + localization.property=Property localization.langZh=Chinese localization.langEn=English @@ -688,6 +695,7 @@ navs.resources=Resources navs.adapters=Adapters navs.notices=Notices navs.institutions=Institutions +navs.institutions.system=System navs.socials.provider=SocialsProvider navs.synchronizers=Synchronizers navs.ldapcontext=LdapContext diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties index 893b7de3fae91e75df54fd8a13ee8d9c7409056f..aad257486617425fde3871e047f47b420e6833cb 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties @@ -503,10 +503,7 @@ synchronizers.syncStartTime=\u533A\u95F4 institutions.name=\u7B80\u79F0 institutions.fullName=\u5168\u79F0 -institutions.logo=\u56FE\u6807 -institutions.title=\u7CFB\u7EDF\u540D\u79F0 -institutions.consoleTitle=\u63A7\u5236\u53F0\u540D\u79F0 -institutions.domain=\u57DF\u540D + institutions.division=\u5206\u652F\u673A\u6784 institutions.contact=\u8054\u7CFB\u4EBA institutions.phone=\u7535\u8BDD @@ -519,6 +516,17 @@ institutions.street=\u8857\u9053 institutions.address=\u5730\u5740 institutions.postalcode=\u90AE\u7F16 +institutions.logo=\u56FE\u6807 +institutions.title=\u7CFB\u7EDF\u540D\u79F0 +institutions.consoleTitle=\u63A7\u5236\u53F0\u540D\u79F0 +institutions.domain=\u57DF\u540D +institutions.captchaSupport=\u9A8C\u8BC1\u7801\u652F\u6301 +institutions.captcha=\u9A8C\u8BC1\u7801 +institutions.captcha.type=\u9A8C\u8BC1\u7801\u7C7B\u578B +institutions.captcha.type.text=\u6570\u5B57 +institutions.captcha.type.arithmetic=\u7B97\u672F +institutions.default.uri=\u9ED8\u8BA4\u5730\u5740 + localization.property=\u5C5E\u6027 localization.langZh=\u4E2D\u6587 localization.langEn=\u82F1\u6587 @@ -679,6 +687,7 @@ navs.resources=\u8D44\u6E90\u7BA1\u7406 navs.adapters=\u9002\u914D\u5668\u6CE8\u518C navs.notices=\u901A\u77E5\u516C\u544A navs.institutions=\u673A\u6784\u914D\u7F6E +navs.institutions.system=\u7CFB\u7EDF\u4FE1\u606F navs.socials.provider=\u793E\u4EA4\u670D\u52A1 navs.synchronizers=\u540C\u6B65\u5668\u7BA1\u7406 navs.ldapcontext=LDAP\u914D\u7F6E diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl index 81ca9e3160b2a8dbda2164854ebbc984afd64fba..6567beed3dc2920805f230263987cab222f92976 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl @@ -33,215 +33,259 @@
-
-
-
-

<@locale code="navs.institutions"/>

-
-
-
+
+
+
+

<@locale code="navs.institutions"/>

+
+ + +
-
-
- -
- - +
+
+ +
+ + +
-
-
-
- -
- +
+
+ +
+ +
-
-
-
-
- -
- - -
-
- " - wurl="<@base/>/localization/forward/global.title" - wwidth="650" - wheight="200" - target="window"> -
-
-
-
-
- -
- -
-
- " - wurl="<@base/>/localization/forward/global.consoleTitle" - wwidth="650" - wheight="200" - target="window"> -
-
-
-
-
-
-
- -
- +
+
+
+ +
+ +
-
-
-
- -
- +
+
+ +
+ +
-
-
-
-
- -
- +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
-
-
- -
- -
+
+
+
+ + +
+ +
+
+
+
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ + +
+ +
+
+
+
+
+
+
+ + +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
-
-
- -
- +
+
+

<@locale code="navs.institutions.system"/>

+
+
+ +
+
+
+ +
+ + +
+
+ " + wurl="<@base/>/localization/forward/global.title" + wwidth="650" + wheight="200" + target="window"> +
-
-
-
-
-
- - -
- +
+
+ +
+ +
+
+ " + wurl="<@base/>/localization/forward/global.consoleTitle" + wwidth="650" + wheight="200" + target="window"> +
-
-
-
- -
- +
+
+
+
+ +
+ +
-
-
-
-
-
- -
- +
+
+ +
+ +
-
-
-
- - -
- +
+
+
+
+ +
+ +
-
-
-
-
-
- - -
- +
+
+ +
+ +
-
-
-
- -
- +
+ +
+
+
+
+ +
+
+ +
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
-
-
- -
-
- -
+
+
+
+
+ +
+
-
-
-
-
- - -
-
-
- - -
-
+
+
+
<#include "../layout/footer.ftl"/>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl index bfb31b4f5f6599657423168468c46ca3d8a8e6d9..cd36a2c51b5cc37b939b347ba41400324426bc95 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl @@ -38,7 +38,7 @@
"> - +
diff --git a/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js b/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js index 5a6030c2bc7724b40241091850ac97515b006560..ed2edeb7f11412f06b1973c592802427c520d2cf 100644 --- a/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js +++ b/maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js @@ -29,9 +29,10 @@ $(function(){ }); }); + var captchaImageUrl = $('.captcha-image').attr("src"); //on captcha image click ,new a captcha code $('.captcha-image').click(function () {// - $(this).attr("src", webContextPath + "/captcha?"+(new Date()).getTime()); + $(this).attr("src", captchaImageUrl+"&"+(new Date()).getTime()); }); //passwdeye