github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleaned up some more x509 references

pull/306/merge
Justin Richer 2013-03-15 15:10:59 -04:00
parent b8d2adcf31
commit 30c6271e72
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
View File

@ -9,7 +9,6 @@ import java.util.UUID;
import org.mitre.jwt.signer.service.JwtSigningAndValidationService; import org.mitre.jwt.signer.service.JwtSigningAndValidationService;
import org.mitre.openid.connect.view.JwkKeyListView; import org.mitre.openid.connect.view.JwkKeyListView;
import org.mitre.openid.connect.view.X509CertificateView;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@ -29,8 +28,6 @@ public class ClientKeyPublisher implements BeanDefinitionRegistryPostProcessor {
private String jwkPublishUrl; private String jwkPublishUrl;
private String x509PublishUrl;
private BeanDefinitionRegistry registry; private BeanDefinitionRegistry registry;
private String jwkViewName = "jwkKeyList"; private String jwkViewName = "jwkKeyList";
@ -43,7 +40,7 @@ public class ClientKeyPublisher implements BeanDefinitionRegistryPostProcessor {
*/ */
@Override @Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
if (!Strings.isNullOrEmpty(getJwkPublishUrl()) || !Strings.isNullOrEmpty(getX509PublishUrl())) { if (!Strings.isNullOrEmpty(getJwkPublishUrl())) {
// add a mapping to this class // add a mapping to this class
BeanDefinitionBuilder clientKeyMapping = BeanDefinitionBuilder.rootBeanDefinition(ClientKeyPublisherMapping.class); BeanDefinitionBuilder clientKeyMapping = BeanDefinitionBuilder.rootBeanDefinition(ClientKeyPublisherMapping.class);
@ -63,19 +60,6 @@ public class ClientKeyPublisher implements BeanDefinitionRegistryPostProcessor {
viewResolver.addPropertyReference("jwk", "jwkKeyList"); viewResolver.addPropertyReference("jwk", "jwkKeyList");
} }
if (!Strings.isNullOrEmpty(getX509PublishUrl())) {
clientKeyMapping.addPropertyValue("x509PublishUrl", getX509PublishUrl());
// randomize view name to make sure it doesn't conflict with local views
x509ViewName = "x509certs-" + UUID.randomUUID().toString();
viewResolver.addPropertyValue("x509ViewName", x509ViewName);
// view bean
BeanDefinitionBuilder x509View = BeanDefinitionBuilder.rootBeanDefinition(X509CertificateView.class);
registry.registerBeanDefinition("x509certs", x509View.getBeanDefinition());
viewResolver.addPropertyReference("x509", "x509certs");
}
registry.registerBeanDefinition("clientKeyMapping", clientKeyMapping.getBeanDefinition()); registry.registerBeanDefinition("clientKeyMapping", clientKeyMapping.getBeanDefinition());
registry.registerBeanDefinition("jwkViewResolver", viewResolver.getBeanDefinition()); registry.registerBeanDefinition("jwkViewResolver", viewResolver.getBeanDefinition());
@ -132,20 +116,6 @@ public class ClientKeyPublisher implements BeanDefinitionRegistryPostProcessor {
this.jwkPublishUrl = jwkPublishUrl; this.jwkPublishUrl = jwkPublishUrl;
} }
/**
* @return the x509PublishUrl
*/
public String getX509PublishUrl() {
return x509PublishUrl;
}
/**
* @param x509PublishUrl the x509PublishUrl to set
*/
public void setX509PublishUrl(String x509PublishUrl) {
this.x509PublishUrl = x509PublishUrl;
}
/** /**
* @return the signingAndValidationService * @return the signingAndValidationService
*/ */