From 8e016a8d3041fa4e3c5664e4a0e2514b3d61420b Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Fri, 22 Jul 2016 13:50:37 -0400
Subject: [PATCH] make the null assertion processor the default

---
 .../assertion/impl/NullAssertionValidator.java  |  6 +++++-
 .../main/webapp/WEB-INF/assertion-config.xml    | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/assertion/impl/NullAssertionValidator.java b/openid-connect-common/src/main/java/org/mitre/jwt/assertion/impl/NullAssertionValidator.java
index 60f6c06e2..c2adfb953 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/assertion/impl/NullAssertionValidator.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/assertion/impl/NullAssertionValidator.java
@@ -22,14 +22,18 @@ import org.mitre.jwt.assertion.AssertionValidator;
 import com.nimbusds.jwt.JWT;
 
 /**
+ * Reject all assertions passed in.
+ * 
  * @author jricher
  *
  */
 public class NullAssertionValidator implements AssertionValidator {
 
+	/**
+	 * Reject all assertions passed in, always returns false.
+	 */
 	@Override
 	public boolean isValid(JWT assertion) {
-		// TODO Auto-generated method stub
 		return false;
 
 	}
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/assertion-config.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/assertion-config.xml
index 7a7a494a2..cc4d84e77 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/assertion-config.xml
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/assertion-config.xml
@@ -31,13 +31,16 @@
 
 
 	<!-- validate client software statements for dynamic registration -->
-	<bean id="clientAssertionValidator" class="org.mitre.jwt.assertion.impl.WhitelistedIssuerAssertionValidator">
-		<property name="whitelist">
-			<map>
-				<entry key="http://artemesia.local" value="http://localhost:8080/openid-connect-server-webapp/jwk" />
-			</map>
-		</property>
-	</bean>
+	<bean id="clientAssertionValidator" class="org.mitre.jwt.assertion.impl.NullAssertionValidator" />
+	
+	<!-- this class will pass assertions signed by the issuers and keys in the whitelist -->
+<!-- 	<bean id="clientAssertionValidator" class="org.mitre.jwt.assertion.impl.WhitelistedIssuerAssertionValidator"> -->
+<!-- 		<property name="whitelist"> -->
+<!-- 			<map> -->
+<!-- 				<entry key="http://artemesia.local" value="http://localhost:8080/openid-connect-server-webapp/jwk" /> -->
+<!-- 			</map> -->
+<!-- 		</property> -->
+<!-- 	</bean> -->
 
 
 </beans>
\ No newline at end of file