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

v3.0.0

Browse Source
This commit is contained in:
Crystal.Sea
2021-09-24 14:37:15 +08:00
parent 5f4c44ec59
commit 2fdd018239
114 changed files with 451 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java
View File

@@ -35,6 +35,7 @@ import org.maxkey.authz.saml.common.EndpointGenerator;
import org.maxkey.authz.saml.common.TrustResolver;
import org.maxkey.authz.saml.service.IDService;
import org.maxkey.authz.saml.service.TimeService;
import org.maxkey.authz.saml20.binding.BindingAdapter;
import org.maxkey.authz.saml20.binding.ExtractBindingAdapter;
import org.maxkey.authz.saml20.consumer.AuthnRequestGenerator;
import org.maxkey.authz.saml20.consumer.spring.IdentityProviderAuthenticationException;
@@ -51,6 +52,7 @@ import org.opensaml.common.binding.security.MessageReplayRule;
import org.opensaml.saml2.core.Assertion;
import org.opensaml.saml2.core.Response;
import org.opensaml.saml2.core.StatusCode;
import org.opensaml.ws.message.decoder.MessageDecodingException;
import org.opensaml.xml.security.CriteriaSet;
import org.opensaml.xml.security.SecurityException;
import org.opensaml.xml.security.credential.Credential;
@@ -77,6 +79,8 @@ public class ConsumerEndpoint {
private final static Logger logger = LoggerFactory.getLogger(ConsumerEndpoint.class);
private BindingAdapter bindingAdapter;
@Autowired
@Qualifier("spKeyStoreLoader")
private KeyStoreLoader keyStoreLoader;
@@ -129,8 +133,8 @@ public class ConsumerEndpoint {
initCredential(spId);
SAMLMessageContext messageContext=null;
/*try {
/*
try {
messageContext = bindingAdapter.extractSAMLMessageContext(request);
} catch (MessageDecodingException me) {
logger.error("Could not decode SAML Response", me);

6
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/jit/ProvisioningAdapter.java
View File

@@ -18,12 +18,6 @@
package org.maxkey.authz.saml20.jit;
import java.util.HashMap;
import java.util.List;
import org.maxkey.entity.UserInfo;
public interface ProvisioningAdapter {
//HashMap<String,String> construct(UserInfo userInfo,Companys company,List<Roles> listRoles) ;

1
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/xml/SAML2ValidatorSuite.java
View File

@@ -21,7 +21,6 @@ import org.opensaml.xml.Configuration;
import org.opensaml.xml.XMLObject;
import org.opensaml.xml.validation.ValidationException;
import org.opensaml.xml.validation.ValidatorSuite;
import org.springframework.beans.factory.InitializingBean;
public class SAML2ValidatorSuite {

3
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java
View File

@@ -107,6 +107,7 @@ public class Saml20AutoConfiguration implements InitializingBean {
@Bean(name = "authnResponseGenerator")
public AuthnResponseGenerator authnResponseGenerator(TimeService timeService,IDService idService,
@Value("${maxkey.saml.v20.idp.issuer}") String issuerEntityName) {
_logger.debug("issuerEntityName " + issuerEntityName);
AuthnResponseGenerator generator = new AuthnResponseGenerator(issuerEntityName,timeService,idService);
return generator;
}
@@ -163,6 +164,7 @@ public class Saml20AutoConfiguration implements InitializingBean {
* MapBasedStorageService.
* @return mapBasedStorageService
*/
@SuppressWarnings("rawtypes")
@Bean(name = "mapBasedStorageService")
public MapBasedStorageService mapBasedStorageService() {
MapBasedStorageService mapBasedStorageService = new MapBasedStorageService();
@@ -175,6 +177,7 @@ public class Saml20AutoConfiguration implements InitializingBean {
* @throws IOException
* @throws VelocityException
*/
@SuppressWarnings({ "deprecation"})
@Bean(name = "velocityEngine")
public VelocityEngine velocityEngine() throws VelocityException, IOException {
VelocityEngineFactoryBean factory = new VelocityEngineFactoryBean();