From 5910d29472770155c00c90bf7fbf14ff80d71c2c Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Thu, 2 May 2013 10:59:15 -0400
Subject: [PATCH] removed x509 publishing from client lib

---
 .../keypublisher/ClientKeyPublisher.java      |  2 +-
 .../ClientKeyPublisherMapping.java            | 25 -------------
 .../client/keypublisher/JwkViewResolver.java  | 35 +------------------
 3 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
index 86198b40d..e39327b3b 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
@@ -33,7 +33,7 @@ public class ClientKeyPublisher implements BeanDefinitionRegistryPostProcessor {
 	private String jwkViewName = "jwkKeyList";
 
 	/**
-	 * If either the jwkPublishUrl or x509PublishUrl fields are set on this bean, set up a listener on that URL to publish keys.
+	 * If the jwkPublishUrl field is set on this bean, set up a listener on that URL to publish keys.
 	 */
 	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java
index eae8a4c0b..ca13406e4 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java
@@ -18,7 +18,6 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMappi
 public class ClientKeyPublisherMapping extends RequestMappingInfoHandlerMapping {
 
 	private String jwkPublishUrl;
-	private String x509PublishUrl;
 
 	/* (non-Javadoc)
 	 * @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#isHandler(java.lang.Class)
@@ -30,7 +29,6 @@ public class ClientKeyPublisherMapping extends RequestMappingInfoHandlerMapping
 
 	/**
 	 * Map the "jwkKeyPublish" method to our jwkPublishUrl.
-	 * Map the "x509KeyPublish" method to our x509PublishUrl.
 	 */
 	@Override
 	protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handlerType) {
@@ -44,15 +42,6 @@ public class ClientKeyPublisherMapping extends RequestMappingInfoHandlerMapping
 					null,
 					null,
 					null);
-		} else if (method.getName().equals("publishClientx509") && getX509PublishUrl() != null) {
-			return new RequestMappingInfo(
-					new PatternsRequestCondition(new String[] {getX509PublishUrl()}, getUrlPathHelper(), getPathMatcher(), false, false),
-					null,
-					null,
-					null,
-					null,
-					null,
-					null);
 		} else {
 			return null;
 		}
@@ -73,18 +62,4 @@ public class ClientKeyPublisherMapping extends RequestMappingInfoHandlerMapping
 		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;
-	}
-
 }
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java
index d72b06a26..eaa4610a8 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java
@@ -21,13 +21,10 @@ public class JwkViewResolver implements ViewResolver, Ordered {
 	private String jwkViewName = "jwkKeyList";
 	private View jwk;
 
-	private String x509ViewName = "x509certs";
-	private View x509;
-
 	private int order = HIGHEST_PRECEDENCE; // highest precedence, most specific -- avoids hitting the catch-all view resolvers
 
 	/**
-	 * Map "jwkKeyList" to the jwk property and "x509certs" to the x509 property on this bean.
+	 * Map "jwkKeyList" to the jwk property on this bean.
 	 * Everything else returns null
 	 */
 	@Override
@@ -35,8 +32,6 @@ public class JwkViewResolver implements ViewResolver, Ordered {
 		if (viewName != null) {
 			if (viewName.equals(getJwkViewName())) {
 				return getJwk();
-			} else if (viewName.equals(getX509ViewName())) {
-				return getX509();
 			} else {
 				return null;
 			}
@@ -45,20 +40,6 @@ public class JwkViewResolver implements ViewResolver, Ordered {
 		}
 	}
 
-	/**
-	 * @return the x509
-	 */
-	public View getX509() {
-		return x509;
-	}
-
-	/**
-	 * @param x509 the x509 to set
-	 */
-	public void setX509(View x509) {
-		this.x509 = x509;
-	}
-
 	/**
 	 * @return the jwk
 	 */
@@ -102,18 +83,4 @@ public class JwkViewResolver implements ViewResolver, Ordered {
 		this.jwkViewName = jwkViewName;
 	}
 
-	/**
-	 * @return the x509ViewName
-	 */
-	public String getX509ViewName() {
-		return x509ViewName;
-	}
-
-	/**
-	 * @param x509ViewName the x509ViewName to set
-	 */
-	public void setX509ViewName(String x509ViewName) {
-		this.x509ViewName = x509ViewName;
-	}
-
 }