Added singleAssertion option.

[java-idp.git] / src / edu / internet2 / middleware / shibboleth / common / ServiceProviderMapper.java

diff --git a/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java b/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
index a451d33..a00e8c7 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
+++ b/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
@@ -134,12 +134,15 @@ public class ServiceProviderMapper {
                if (provider != null) {
                        EntitiesDescriptor parent = provider.getEntitiesDescriptor();
                        while (parent != null) {
-                               if (relyingParties.containsKey(parent.getName())) {
-                                       log.info("Found matching Relying Party for group (" + parent.getName() + ").");
-                                       return (RelyingParty) relyingParties.get(parent.getName());
-                               } else {
-                                       log.debug("Provider is a member of group (" + parent.getName()
-                                                       + "), but no matching Relying Party was found.");
+                               if (parent.getName() != null) {
+                                       if (relyingParties.containsKey(parent.getName())) {
+                                               log.info("Found matching Relying Party for group (" + parent.getName() + ").");
+                                               return (RelyingParty) relyingParties.get(parent.getName());
+                                       }
+                                       else {
+                                               log.debug("Provider is a member of group (" + parent.getName()
+                                                               + "), but no matching Relying Party was found.");
+                                       }
                                }
                                parent = parent.getEntitiesDescriptor();
                        }
@@ -217,6 +220,7 @@ public class ServiceProviderMapper {
                private boolean passThruIsOverriden = false;
                private boolean forceAttributePush = false;
                private boolean forceAttributeNoPush = false;
+               private boolean singleAssertion = false;
                private boolean defaultToPOST = true;
                private boolean wantsAssertionsSigned = false;
                private int preferredArtifactType = 1;
@@ -451,6 +455,10 @@ public class ServiceProviderMapper {
                        return forceAttributeNoPush;
                }
 
+               public boolean singleAssertion() {
+                       return singleAssertion;
+               }
+               
                public boolean defaultToPOSTProfile() {
 
                        return defaultToPOST;
@@ -508,7 +516,6 @@ public class ServiceProviderMapper {
                                return credential;
                        }
                }
-
        }
 
        /**
@@ -577,6 +584,11 @@ public class ServiceProviderMapper {
                        return wrapped.forceAttributeNoPush();
                }
 
+               public boolean singleAssertion() {
+                       
+                       return wrapped.singleAssertion();
+               }
+               
                public boolean defaultToPOSTProfile() {
 
                        return wrapped.defaultToPOSTProfile();
@@ -669,6 +681,11 @@ public class ServiceProviderMapper {
                        return false;
                }
 
+               public boolean singleAssertion() {
+                       
+                       return false;
+               }
+               
                public boolean defaultToPOSTProfile() {
 
                        return true;