[java-idp-oidc] branch master updated: Update test to use mapped claims, fix up null return behavior.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=40f9a605fb2e137de71488b728f61790599521a4

The following commit(s) were added to refs/heads/master by this push:
       new  40f9a60   Update test to use mapped claims, fix up null return behavior.
40f9a60 is described below

commit 40f9a605fb2e137de71488b728f61790599521a4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 13 10:17:27 2020 -0500

    Update test to use mapped claims, fix up null return behavior.
---
 .../AttributeInOIDCRequestedClaimsMatcher.java     |  2 +-
 .../AttributeInOIDCRequestedClaimsMatcherTest.java | 28 ++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java
index e94fa87..e4097a0 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java
@@ -158,7 +158,7 @@ public class AttributeInOIDCRequestedClaimsMatcher extends AbstractIdentifiableI
                 return Set.copyOf(attribute.getValues());
             } else {
                 log.debug("{} none of the values matched as not silent mode", getLogPrefix());
-                return null;
+                return Collections.emptySet();
             }
         }
         
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
index e72cda7..dc6f7bf 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
@@ -20,8 +20,10 @@ import java.net.URI;
 import java.util.Date;
 import java.util.Set;
 
+import net.shibboleth.idp.attribute.AttributesMapContainer;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.IdPRequestedAttribute;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.idp.profile.RequestContextBuilder;
 import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
@@ -34,6 +36,8 @@ import org.springframework.webflow.execution.RequestContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import com.nimbusds.oauth2.sdk.ResponseType;
 import com.nimbusds.oauth2.sdk.Scope;
 import com.nimbusds.oauth2.sdk.auth.Secret;
@@ -67,14 +71,12 @@ public class AttributeInOIDCRequestedClaimsMatcherTest {
         if (!idtoken && !userinfo) {
             msgCtx.setMessage(new AuthenticationRequest(new URI("htts://example.org"), ResponseType.getDefault(),
                     new Scope("openid"), new ClientID(), new URI("htts://example.org"), new State(), new Nonce()));
-            
         } else {
-
             msgCtx.setMessage(new AuthenticationRequest(new URI("htts://example.org"), ResponseType.getDefault(), null,
                     new Scope("openid"), new ClientID(), new URI("htts://example.org"), new State(), new Nonce(), null,
                     null, 0, null, null, null, null, null, getClaimsRequest(idtoken, userinfo), null, null, null, null, null, userinfo, null));
             respCtx.setRequestedClaims(getClaimsRequest(idtoken, userinfo));
-            
+            setMappedClaims(respCtx, idtoken, userinfo);
         }
         
         // shortcut, may break the test
@@ -89,6 +91,21 @@ public class AttributeInOIDCRequestedClaimsMatcherTest {
         matcher.setId("componentId");
     }
 
+    private void setMappedClaims(final OIDCAuthenticationResponseContext respCtx, final boolean idtoken,
+            final boolean userinfo) {
+        final Multimap<String,IdPAttribute> map = HashMultimap.create();
+        map.put("any", new IdPRequestedAttribute("any"));
+        if (idtoken || userinfo) {
+            map.put("test", new IdPRequestedAttribute("test"));
+        }
+        if (idtoken) {
+            respCtx.setMappedIdTokenRequestedClaims(new AttributesMapContainer(map));
+        }
+        if (userinfo) {
+            respCtx.setMappedUserinfoRequestedClaims(new AttributesMapContainer(map));
+        }
+    }
+    
     private ClaimsRequest getClaimsRequest(final boolean idtoken, final boolean userinfo) {
         final ClaimsRequest request = new ClaimsRequest();
         request.addIDTokenClaim("any");
@@ -99,6 +116,7 @@ public class AttributeInOIDCRequestedClaimsMatcherTest {
         if (userinfo) {
             request.addUserInfoClaim("test");
         }
+        
         return request;
     }
 
@@ -106,7 +124,9 @@ public class AttributeInOIDCRequestedClaimsMatcherTest {
     public void testNoEncoders() throws Exception {
         setUp(false, false);
         matcher.initialize();
-        Assert.assertNull(matcher.getMatchingValues(attribute, filtercontext));
+        final Set<IdPAttributeValue> result = matcher.getMatchingValues(attribute, filtercontext);
+        Assert.assertNotNull(result);
+        Assert.assertEquals(result.size(), 0);
     }
 
     @Test

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.