Added singleAssertion option.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1677 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/common/RelyingParty.java b/src/edu/internet2/middleware/shibboleth/common/RelyingParty.java
index 525406d..def7739 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/RelyingParty.java
+++ b/src/edu/internet2/middleware/shibboleth/common/RelyingParty.java
@@ -97,12 +97,18 @@ public interface RelyingParty extends ServiceProvider {
        public boolean defaultToPOSTProfile();
 
        /**
-        * A boolean indication of whether assertions issued to this Relying Party should be digitall signed (This is in
+        * A boolean indication of whether assertions issued to this Relying Party should be digitally signed (This is in
         * addition to profile-specific signing).
         */
        public boolean wantsAssertionsSigned();
 
        /**
+        * A boolean indication of whether attributes sent with an authentication response should be included in the same
+        * assertion or left in a second assertion for compatibility with broken SAML products.
+        */
+       public boolean singleAssertion();
+
+       /**
         * Returns the type of SAML Artifact that this appropriate for use with this Relying Party.
         */
        public int getPreferredArtifactType();

diff --git a/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java b/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
index 264f05b..a00e8c7 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
+++ b/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
@@ -220,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;
@@ -454,6 +455,10 @@ public class ServiceProviderMapper {
                        return forceAttributeNoPush;
                }
 
+               public boolean singleAssertion() {
+                       return singleAssertion;
+               }
+               
                public boolean defaultToPOSTProfile() {
 
                        return defaultToPOST;
@@ -511,7 +516,6 @@ public class ServiceProviderMapper {
                                return credential;
                        }
                }
-
        }
 
        /**
@@ -580,6 +584,11 @@ public class ServiceProviderMapper {
                        return wrapped.forceAttributeNoPush();
                }
 
+               public boolean singleAssertion() {
+                       
+                       return wrapped.singleAssertion();
+               }
+               
                public boolean defaultToPOSTProfile() {
 
                        return wrapped.defaultToPOSTProfile();
@@ -672,6 +681,11 @@ public class ServiceProviderMapper {
                        return false;
                }
 
+               public boolean singleAssertion() {
+                       
+                       return false;
+               }
+               
                public boolean defaultToPOSTProfile() {
 
                        return true;

diff --git a/src/schemas/shibboleth-idpconfig-1.0.xsd b/src/schemas/shibboleth-idpconfig-1.0.xsd
index 87f457e..2e3dad8 100644 (file)
--- a/src/schemas/shibboleth-idpconfig-1.0.xsd
+++ b/src/schemas/shibboleth-idpconfig-1.0.xsd
@@ -55,6 +55,7 @@
                                                                <xs:attribute name="forceAttributePush" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="signAssertions" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="forceAttributeNoPush" type="xs:boolean" use="optional"/>
+                                                               <xs:attribute name="singleAssertion" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="defaultToPOSTProfile" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="schemaHack" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="defaultAuthMethod" type="xs:string" use="optional"/>