[cpp-sp COMMIT] in /branches/REL_2: adfs/adfs.cpp shibsp/Makefile.am shibsp/attribute/resolver/impl/AssertionAttribut...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Feb  9 04:33:47 2012
New Revision: 3575

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3575&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-421

Modified:
    branches/REL_2/adfs/adfs.cpp
    branches/REL_2/shibsp/Makefile.am
    branches/REL_2/shibsp/attribute/resolver/impl/AssertionAttributeExtractor.cpp
    branches/REL_2/shibsp/handler/AssertionConsumerService.h
    branches/REL_2/shibsp/handler/impl/AssertionConsumerService.cpp
    branches/REL_2/shibsp/handler/impl/AttributeCheckerHandler.cpp
    branches/REL_2/shibsp/handler/impl/SAML1Consumer.cpp
    branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp

Modified: branches/REL_2/adfs/adfs.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/adfs/adfs.cpp?rev=3575&r1=3574&r2=3575&view=diff
==============================================================================
--- branches/REL_2/adfs/adfs.cpp (original)
+++ branches/REL_2/adfs/adfs.cpp Thu Feb  9 04:33:47 2012
@@ -767,6 +767,7 @@
             &httpRequest,
             policy.getIssuerMetadata(),
             m_protocol.get(),
+            nullptr,
             saml1name,
             saml1statement,
             (saml1name ? nameid.get() : saml2name),

Modified: branches/REL_2/shibsp/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/Makefile.am?rev=3575&r1=3574&r2=3575&view=diff
==============================================================================
--- branches/REL_2/shibsp/Makefile.am (original)
+++ branches/REL_2/shibsp/Makefile.am Thu Feb  9 04:33:47 2012
@@ -242,16 +242,16 @@
 paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < ${srcdir}/$@.in > $@.tmp \
-	    -e 's:@-PREFIX-@:${prefix}:g' \
-        -e 's:@-LIBDIR-@:${libdir}:g' \
-        -e 's:@-SYSCONFDIR-@:${sysconfdir}:g' \
-        -e 's:@-LOGDIR-@:${logdir}:g' \
-        -e 's:@-RUNDIR-@:${rundir}:g' \
-        -e 's:@-XMLDIR-@:${xmldir}:g' \
-	    -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-	    -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
-	    -e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g' \
-	    -e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g'
+		-e 's:@-PREFIX-@:${prefix}:g' \
+		-e 's:@-LIBDIR-@:${libdir}:g' \
+		-e 's:@-SYSCONFDIR-@:${sysconfdir}:g' \
+		-e 's:@-LOGDIR-@:${logdir}:g' \
+		-e 's:@-RUNDIR-@:${rundir}:g' \
+		-e 's:@-XMLDIR-@:${xmldir}:g' \
+		-e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+		-e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+		-e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g' \
+		-e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g'
 	cmp -s $@ $@.tmp || mv $@.tmp $@
 	rm -f $@.tmp
 
@@ -264,7 +264,7 @@
 	shibsp.vcxproj.filters \
 	shibsp-lite.vcxproj.filters \
 	config_pub.h.in \
-    config_pub_win32.h\
+	config_pub_win32.h\
 	paths.h.in \
 	resource.h \
 	shibsp.rc

Modified: branches/REL_2/shibsp/attribute/resolver/impl/AssertionAttributeExtractor.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/AssertionAttributeExtractor.cpp?rev=3575&r1=3574&r2=3575&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/AssertionAttributeExtractor.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/AssertionAttributeExtractor.cpp Thu Feb  9 04:33:47 2012
@@ -31,7 +31,7 @@
 #include "attribute/resolver/AttributeExtractor.h"
 
 #include <saml/saml1/core/Assertions.h>
-#include <saml/saml2/core/Assertions.h>
+#include <saml/saml2/core/Protocols.h>
 #include <saml/saml2/metadata/Metadata.h>
 #include <xmltooling/util/DateTime.h>
 #include <xmltooling/util/XMLHelper.h>
@@ -83,7 +83,8 @@
             m_sessionIndex,
             m_sessionNotOnOrAfter,
             m_subjectAddress,
-            m_subjectDNS;
+            m_subjectDNS,
+            m_consent;
     };
 
 #if defined (_MSC_VER)
@@ -107,7 +108,8 @@
         m_sessionIndex(XMLHelper::getAttrString(e, nullptr, AuthnStatement::SESSIONINDEX_ATTRIB_NAME)),
         m_sessionNotOnOrAfter(XMLHelper::getAttrString(e, nullptr, AuthnStatement::SESSIONNOTONORAFTER_ATTRIB_NAME)),
         m_subjectAddress(XMLHelper::getAttrString(e, nullptr, saml2::SubjectLocality::ADDRESS_ATTRIB_NAME)),
-        m_subjectDNS(XMLHelper::getAttrString(e, nullptr, saml2::SubjectLocality::DNSNAME_ATTRIB_NAME))
+        m_subjectDNS(XMLHelper::getAttrString(e, nullptr, saml2::SubjectLocality::DNSNAME_ATTRIB_NAME)),
+        m_consent(XMLHelper::getAttrString(e, nullptr, saml2p::StatusResponseType::CONSENT_ATTRIB_NAME))
 {
 }
 
@@ -115,6 +117,21 @@
     const Application& application, const RoleDescriptor* issuer, const XMLObject& xmlObject, vector<shibsp::Attribute*>& attributes
     ) const
 {
+    const saml2p::StatusResponseType* srt = dynamic_cast<const saml2p::StatusResponseType*>(&xmlObject);
+    if (srt) {
+        // Consent
+        if (!m_consent.empty() && srt->getConsent()) {
+            auto_ptr_char temp(srt->getConsent());
+            if (temp.get() && *temp.get()) {

[... 498 lines stripped ...]