LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mgt sso

Browse Source 
mgt sso
This commit is contained in:
shimingxy
2019-12-02 11:55:20 +08:00
parent 40bef5723d
commit c1a82ab45b
7 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java
View File

@@ -99,6 +99,9 @@ public class LoginEndpoint {
}else {
WebContext.setAttribute(WebConstants.SPRING_PROCESS_SAVED_REQUEST, firstSavedRequest);
}
if(WebContext.isAuthenticated()){
return WebContext.redirect("/main");
}
modelAndView.setViewName("login");
return modelAndView;
}
@@ -106,11 +109,10 @@ public class LoginEndpoint {
@RequestMapping(value={"/logon.do"})
public ModelAndView logon(@ModelAttribute("authentication") BasicAuthentication authentication) {
authenticationProvider.authenticate(authentication);
if(WebContext.isAuthenticated()){
return WebContext.redirect("/main");
}else{
authenticationProvider.authenticate(authentication);
return WebContext.redirect("/login");
}
}

2
maxkey-web-manage/src/main/resources/config/applicationLogin.properties
View File

@@ -91,7 +91,7 @@ config.support.wsfederation.logoutUrl=https://adfs.connsec.com/adfs/ls/?wa=wsign
#############################################################################
#############################################################################
config.oidc.metadata.issuer=${config.server.maxkey.uri}
config.oidc.metadata.issuer=${config.server.name}/maxkey
config.oidc.metadata.authorizationEndpoint=${config.server.maxkey.uri}/oauth/v20/authorize
config.oidc.metadata.tokenEndpoint=${config.server.maxkey.uri}/oauth/v20/token
config.oidc.metadata.userinfoEndpoint=${config.server.maxkey.uri}/api/connect/userinfo

10
maxkey-web-manage/src/main/resources/spring/maxkey-mgt-security.xml
View File

@@ -38,15 +38,15 @@
<bean id="jwtSignerValidationService" class="org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService">
<constructor-arg name="keyStore" ref="jwkSetKeyStore" />
<property name="defaultSignerKeyId" value="connsec_rsa" />
<property name="defaultSignerKeyId" value="maxkey_rsa" />
<property name="defaultSigningAlgorithmName" value="RS256" />
</bean>
<bean id="jwtEncryptionService" class="org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService">
<constructor-arg name="keyStore" ref="jwkSetKeyStore" />
<property name="defaultAlgorithm" value="RSA1_5" />
<property name="defaultDecryptionKeyId" value="connsec_rsa" />
<property name="defaultEncryptionKeyId" value="connsec_rsa" />
<property name="defaultDecryptionKeyId" value="maxkey_rsa" />
<property name="defaultEncryptionKeyId" value="maxkey_rsa" />
</bean>
<bean id="jwtLoginService" class="org.maxkey.authn.support.jwt.JwtLoginService">
@@ -105,8 +105,8 @@
<bean id="timeBasedKeyUriFormat" class="org.maxkey.crypto.password.opt.algorithm.KeyUriFormat">
<property name="type" value="totp" />
<property name="digits" value="6" />
<property name="issuer" value="ConnSec" />
<property name="domain" value="connsec.com" />
<property name="issuer" value="maxkey" />
<property name="domain" value="maxkey.org" />
<property name="period" value="30" />
</bean>