Renamed signedAssertions.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2701 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/shibboleth2.xml.in b/configs/shibboleth2.xml.in
index 1bf9bb3..0ea2deb 100644 (file)
--- a/configs/shibboleth2.xml.in
+++ b/configs/shibboleth2.xml.in
@@ -82,15 +82,6 @@
         REMOTE_USER="eppn persistent-id targeted-id"
         localLogout="@-PKGSYSCONFDIR-@/localLogout.html"
         globalLogout="@-PKGSYSCONFDIR-@/globalLogout.html"
-        authType="TLS"
-        artifactEndpointIndex="1"
-        signing="false"
-        encryption="false"
-        requireConfidentiality="true"
-        requireTransportAuth="true"
-        signedAssertions="false"
-        chunkedEncoding="false"
-        connectTimeout="15" timeout="30"
         >
 
         <!--

diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index 2fed592..11043df 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -505,7 +505,7 @@
         <attribute name="timeout" type="unsignedShort"/>\r
         <attribute name="requireConfidentiality" type="boolean"/>\r
         <attribute name="requireTransportAuth" type="boolean"/>\r
-        <attribute name="signedAssertions" type="boolean"/>\r
+        <attribute name="requireSignedAssertions" type="boolean"/>\r
     </attributeGroup>\r
     \r
        <element name="Sessions">\r

diff --git a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
index 2b36e99..98e5aba 100644 (file)
--- a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
+++ b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
@@ -330,7 +330,7 @@ bool QueryResolver::SAML1Query(QueryContext& ctx) const
     auto_ptr<saml1p::Response> wrapper(response);
     saml1::Assertion* newtoken = assertions.front();
 
-    pair<bool,bool> signedAssertions = relyingParty->getBool("signedAssertions");
+    pair<bool,bool> signedAssertions = relyingParty->getBool("requireSignedAssertions");
     if (!newtoken->getSignature() && signedAssertions.first && signedAssertions.second) {
         m_log.error("assertion unsigned, rejecting it based on signedAssertions policy");
         return true;
@@ -405,7 +405,7 @@ bool QueryResolver::SAML2Query(QueryContext& ctx) const
     shibsp::SOAPClient soaper(policy);
 
     const PropertySet* relyingParty = application.getRelyingParty(ctx.getEntityDescriptor());
-    pair<bool,bool> signedAssertions = relyingParty->getBool("signedAssertions");
+    pair<bool,bool> signedAssertions = relyingParty->getBool("requireSignedAssertions");
     pair<bool,const char*> encryption = relyingParty->getString("encryption");
 
     auto_ptr_XMLCh binding(samlconstants::SAML20_BINDING_SOAP);

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index bcf9e35..5002e8a 100644 (file)
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -256,7 +256,7 @@ pair<bool,long> MetadataGenerator::processMessage(
     prop = relyingParty->getString("signing");
     if (prop.first && (!strcmp(prop.second,"true") || !strcmp(prop.second,"front")))
         role->AuthnRequestsSigned(true);
-    pair<bool,bool> flagprop = relyingParty->getBool("signedAssertions");
+    pair<bool,bool> flagprop = relyingParty->getBool("requireSignedAssertions");
     if (flagprop.first && flagprop.second)
         role->WantAssertionsSigned(true);
 

diff --git a/shibsp/handler/impl/SAML1Consumer.cpp b/shibsp/handler/impl/SAML1Consumer.cpp
index 475184c..d1c46b8 100644 (file)
--- a/shibsp/handler/impl/SAML1Consumer.cpp
+++ b/shibsp/handler/impl/SAML1Consumer.cpp
@@ -149,7 +149,7 @@ void SAML1Consumer::implementProtocol(
 
     // With this flag on, we ignore any unsigned assertions.
     const EntityDescriptor* entity = policy.getIssuerMetadata() ? dynamic_cast<const EntityDescriptor*>(policy.getIssuerMetadata()->getParent()) : NULL;
-    pair<bool,bool> flag = application.getRelyingParty(entity)->getBool("signedAssertions");
+    pair<bool,bool> flag = application.getRelyingParty(entity)->getBool("requireSignedAssertions");
 
     // authnskew allows rejection of SSO if AuthnInstant is too old.
     const PropertySet* sessionProps = application.getPropertySet("Sessions");

diff --git a/shibsp/handler/impl/SAML2Consumer.cpp b/shibsp/handler/impl/SAML2Consumer.cpp
index af3505a..7064d9e 100644 (file)
--- a/shibsp/handler/impl/SAML2Consumer.cpp
+++ b/shibsp/handler/impl/SAML2Consumer.cpp
@@ -137,7 +137,7 @@ void SAML2Consumer::implementProtocol(
     pair<bool,bool> flag = make_pair(false,false);
     if (alreadySecured && policy.getIssuerMetadata()) {
         entity = dynamic_cast<const EntityDescriptor*>(policy.getIssuerMetadata()->getParent());
-        flag = application.getRelyingParty(entity)->getBool("signedAssertions");
+        flag = application.getRelyingParty(entity)->getBool("requireSignedAssertions");
     }
 
     time_t now = time(NULL);
@@ -174,7 +174,7 @@ void SAML2Consumer::implementProtocol(
             // If we hadn't established Issuer yet, redo the signedAssertions check.
             if (!entity && policy.getIssuerMetadata()) {
                 entity = dynamic_cast<const EntityDescriptor*>(policy.getIssuerMetadata()->getParent());
-                flag = application.getRelyingParty(entity)->getBool("signedAssertions");
+                flag = application.getRelyingParty(entity)->getBool("requireSignedAssertions");
                 if (!(*a)->getSignature() && flag.first && flag.second)
                     throw SecurityPolicyException("The incoming assertion was unsigned, violating local security policy.");
             }