msg/idtoken claims validator not performing automatic verify

jalauros · jalauros · commit 6db25bce42da · 2018-07-23T19:06:54.000+03:00
diff --git a/src/main/java/org/oidc/msg/validator/IDTokenClaimValidator.java b/src/main/java/org/oidc/msg/validator/IDTokenClaimValidator.java
@@ -17,7 +17,6 @@
 package org.oidc.msg.validator;
 
 import org.oidc.msg.InvalidClaimException;
-import org.oidc.msg.Message;
 import org.oidc.msg.oidc.IDToken;
 
 /** General validator for claims type of id token. */
@@ -29,11 +28,6 @@ public Object validate(Object value) throws InvalidClaimException {
       throw new InvalidClaimException(
           String.format("Parameter '%s' is not of expected type", value));
     }
-    // TODO: This might not be correct phase to do verify as we might not be able to set all input
-    // for verify
-    if (!((IDToken) value).verify()) {
-      throw new InvalidClaimException(String.format("Parameter '%s' verification failed", value));
-    }
     return value;
   }
 }
diff --git a/src/main/java/org/oidc/msg/validator/MessageClaimValidator.java b/src/main/java/org/oidc/msg/validator/MessageClaimValidator.java
@@ -28,11 +28,6 @@ public Object validate(Object value) throws InvalidClaimException {
       throw new InvalidClaimException(
           String.format("Parameter '%s' is not of expected type", value));
     }
-    // TODO: This might not be correct phase to do verify as we might not be able to set all input
-    // for verify
-    if (!((Message) value).verify()) {
-      throw new InvalidClaimException(String.format("Parameter '%s' verification failed", value));
-    }
     return value;
   }
 }
diff --git a/src/test/java/org/oidc/msg/AbstractMessageTest.java b/src/test/java/org/oidc/msg/AbstractMessageTest.java
@@ -440,26 +440,7 @@ public void successTestMessageType() throws InvalidClaimException {
         ((Message) (mockMessage.getClaims().get("parameter1"))).getClaims().get("parameter1"),
         "value");
   }
-
-  @Test(expected = InvalidClaimException.class)
-  public void failTestMessageTypeInnerFails() throws InvalidClaimException {
-    HashMap<String, Object> innerClaims = new HashMap<>();
-    innerClaims.put("parameter1", 5);
-    Map<String, ParameterVerificationDefinition> innerParVerDef = new HashMap<String, ParameterVerificationDefinition>();
-    innerParVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_STRING.getValue());
-    MockMessage innerMockMessage = new MockMessage(innerClaims, innerParVerDef);
-
-    HashMap<String, Object> claims = new HashMap<>();
-    claims.put("parameter1", innerMockMessage);
-    Map<String, ParameterVerificationDefinition> parVerDef = new HashMap<String, ParameterVerificationDefinition>();
-    parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_MESSAGE.getValue());
-    MockMessage mockMessage = new MockMessage(claims, parVerDef);
-    mockMessage.verify();
-    Assert.assertEquals(
-        ((Message) (mockMessage.getClaims().get("parameter1"))).getClaims().get("parameter1"),
-        "value");
-  }
-
+  
   @Test(expected = InvalidClaimException.class)
   public void failTestMessageType() throws InvalidClaimException {
     HashMap<String, Object> claims = new HashMap<>();

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`package org.oidc.msg.validator;`
`18`	`18`
`19`	`19`	`import org.oidc.msg.InvalidClaimException;`
`20`		`-import org.oidc.msg.Message;`
`21`	`20`	`import org.oidc.msg.oidc.IDToken;`
`22`	`21`
`23`	`22`	`/** General validator for claims type of id token. */`
`@@ -29,11 +28,6 @@ public Object validate(Object value) throws InvalidClaimException {`
`29`	`28`	`throw new InvalidClaimException(`
`30`	`29`	`String.format("Parameter '%s' is not of expected type", value));`
`31`	`30`	`}`
`32`		`- // TODO: This might not be correct phase to do verify as we might not be able to set all input`
`33`		`- // for verify`
`34`		`- if (!((IDToken) value).verify()) {`
`35`		`- throw new InvalidClaimException(String.format("Parameter '%s' verification failed", value));`
`36`		`- }`
`37`	`31`	`return value;`
`38`	`32`	`}`
`39`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,6 @@ public Object validate(Object value) throws InvalidClaimException {`
`28`	`28`	`throw new InvalidClaimException(`
`29`	`29`	`String.format("Parameter '%s' is not of expected type", value));`
`30`	`30`	`}`
`31`		`- // TODO: This might not be correct phase to do verify as we might not be able to set all input`
`32`		`- // for verify`
`33`		`- if (!((Message) value).verify()) {`
`34`		`- throw new InvalidClaimException(String.format("Parameter '%s' verification failed", value));`
`35`		`- }`
`36`	`31`	`return value;`
`37`	`32`	`}`
`38`	`33`	`}`