[cpp-sp COMMIT] in /branches/REL_2: Shibboleth.sln schemas/shibboleth-2.0-native-sp-config.xsd shibsp/Makefile.am shi...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 27 22:49:45 2011
New Revision: 3524

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3524&view=rev
Log:
Extend SSPCPP-343 with generic Assertion extractor

Added:
    branches/REL_2/shibsp/attribute/resolver/impl/AssertionAttributeExtractor.cpp
Removed:
    branches/REL_2/shibsp/attribute/resolver/impl/AuthnAuthorityAttributeExtractor.cpp
Modified:
    branches/REL_2/Shibboleth.sln
    branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
    branches/REL_2/shibsp/Makefile.am
    branches/REL_2/shibsp/ServiceProvider.cpp
    branches/REL_2/shibsp/attribute/resolver/AttributeExtractor.h
    branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp
    branches/REL_2/shibsp/shibsp.vcxproj
    branches/REL_2/shibsp/shibsp.vcxproj.filters

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3524&r1=3523&r2=3524&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Tue Sep 27 22:49:45 2011
@@ -59,7 +59,6 @@
 		configs\shibboleth2.xml = configs\shibboleth2.xml
 		configs\shibd-debian.in = configs\shibd-debian.in
 		configs\shibd-osx.plist.in = configs\shibd-osx.plist.in
-		configs\shibd-redhat.in = configs\shibd-redhat.in
 		configs\shibd-suse.in = configs\shibd-suse.in
 		configs\shibd.logger.in = configs\shibd.logger.in
 		configs\sslError.html = configs\sslError.html
@@ -79,7 +78,6 @@
 		doxygen.cfg = doxygen.cfg
 		m4\doxygen.m4 = m4\doxygen.m4
 		Makefile.am = Makefile.am
-		shibboleth.spec.in = shibboleth.spec.in
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6ED5E3E7-1B0E-43FB-A8D1-77A0FCAE9AC8}"

Modified: branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd?rev=3524&r1=3523&r2=3524&view=diff
==============================================================================
--- branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd (original)
+++ branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd Tue Sep 27 22:49:45 2011
@@ -9,7 +9,7 @@
 	elementFormDefault="qualified"
 	attributeFormDefault="unqualified"
 	blockDefault="substitution"
-	version="2.4.2">
+	version="2.5">
 
   <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd" />
   <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>
@@ -236,13 +236,14 @@
     <attribute name="requireSession" type="boolean"/>
     <attribute name="requireSessionWith" type="conf:string"/>
     <attribute name="exportAssertion" type="boolean"/>
+    <attribute name="exportStdVars" type="boolean"/>
     <attribute name="redirectToSSL" type="unsignedInt"/>
     <attribute name="entityID" type="anyURI"/>
     <attribute name="discoveryURL" type="anyURI"/>
     <attribute name="isPassive" type="boolean"/>
     <attribute name="returnOnError" type="boolean"/>
     <attribute name="forceAuthn" type="boolean"/>
-    <attribute name="authnContextClassRef" type="anyURI"/>
+    <attribute name="authnContextClassRef" type="conf:listOfURIs"/>
     <attribute name="authnContextComparison" type="samlp:AuthnContextComparisonType"/>
     <attribute name="NameIDFormat" type="anyURI"/>
     <attribute name="SPNameQualifier" type="conf:string"/>

Modified: branches/REL_2/shibsp/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/Makefile.am?rev=3524&r1=3523&r2=3524&view=diff
==============================================================================
--- branches/REL_2/shibsp/Makefile.am (original)
+++ branches/REL_2/shibsp/Makefile.am Tue Sep 27 22:49:45 2011
@@ -205,7 +205,7 @@
 	attribute/resolver/impl/ChainingAttributeResolver.cpp \
 	attribute/resolver/impl/QueryAttributeResolver.cpp \
 	attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \
-    attribute/resolver/impl/AuthnAuthorityAttributeExtractor.cpp \
+    attribute/resolver/impl/AssertionAttributeExtractor.cpp \
 	attribute/resolver/impl/ChainingAttributeExtractor.cpp \
 	attribute/resolver/impl/DelegationAttributeExtractor.cpp \
 	attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \

Modified: branches/REL_2/shibsp/ServiceProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/ServiceProvider.cpp?rev=3524&r1=3523&r2=3524&view=diff
==============================================================================
--- branches/REL_2/shibsp/ServiceProvider.cpp (original)
+++ branches/REL_2/shibsp/ServiceProvider.cpp Tue Sep 27 22:49:45 2011
@@ -452,24 +452,29 @@
         app->setHeader(request, "Shib-Application-ID", app->getId());
         app->setHeader(request, "Shib-Session-ID", session->getID());
 
-        // Export the IdP name and Authn method/context info.
-        const char* hval = session->getEntityID();
-        if (hval)

[... 121 lines stripped ...]