[cpp-sp COMMIT] in /branches/REL_2: Shibboleth.sln configs/Makefile.am configs/attrChecker.html configs/example-shibb...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb  8 16:49:49 2012
New Revision: 3574

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

Added:
    branches/REL_2/configs/attrChecker.html
    branches/REL_2/shibsp/handler/impl/AttributeCheckerHandler.cpp
Modified:
    branches/REL_2/Shibboleth.sln
    branches/REL_2/configs/Makefile.am
    branches/REL_2/configs/example-shibboleth2.xml
    branches/REL_2/configs/shibboleth2.xml
    branches/REL_2/configs/win-shibboleth2.xml
    branches/REL_2/doc/main.css
    branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
    branches/REL_2/shibsp/Makefile.am
    branches/REL_2/shibsp/handler/Handler.h
    branches/REL_2/shibsp/handler/impl/AbstractHandler.cpp
    branches/REL_2/shibsp/impl/XMLAccessControl.cpp
    branches/REL_2/shibsp/shibsp-lite.vcxproj
    branches/REL_2/shibsp/shibsp-lite.vcxproj.filters
    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=3574&r1=3573&r2=3574&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Wed Feb  8 16:49:49 2012
@@ -36,6 +36,7 @@
 		configs\apache.config.in = configs\apache.config.in
 		configs\apache2.config.in = configs\apache2.config.in
 		configs\apache22.config.in = configs\apache22.config.in
+		configs\attrChecker.html = configs\attrChecker.html
 		configs\attribute-map.xml = configs\attribute-map.xml
 		configs\attribute-policy.xml = configs\attribute-policy.xml
 		configs\bindingTemplate.html = configs\bindingTemplate.html
@@ -55,7 +56,6 @@
 		configs\postTemplate.html = configs\postTemplate.html
 		configs\protocols.xml = configs\protocols.xml
 		configs\security-policy.xml = configs\security-policy.xml
-		configs\sessionError.html = configs\sessionError.html
 		configs\shibboleth2.xml = configs\shibboleth2.xml
 		configs\shibd-debian.in = configs\shibd-debian.in
 		configs\shibd-osx.plist.in = configs\shibd-osx.plist.in

Modified: branches/REL_2/configs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/Makefile.am?rev=3574&r1=3573&r2=3574&view=diff
==============================================================================
--- branches/REL_2/configs/Makefile.am (original)
+++ branches/REL_2/configs/Makefile.am Wed Feb  8 16:49:49 2012
@@ -42,6 +42,7 @@
 	console.logger \
 	syslog.logger \
 	accessError.html \
+    attrChecker.html \
 	sessionError.html \
 	metadataError.html \
 	bindingTemplate.html \

Modified: branches/REL_2/configs/example-shibboleth2.xml
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/example-shibboleth2.xml?rev=3574&r1=3573&r2=3574&view=diff
==============================================================================
--- branches/REL_2/configs/example-shibboleth2.xml (original)
+++ branches/REL_2/configs/example-shibboleth2.xml Wed Feb  8 16:49:49 2012
@@ -93,6 +93,8 @@
     -->
     <ApplicationDefaults entityID="https://sp.example.org/shibboleth"
                          REMOTE_USER="eppn persistent-id targeted-id"
+                         metadataAttributePrefix="Meta-"
+                         sessionHook="/Shibboleth.sso/AttrChecker"
                          signing="false" encryption="false">
 
         <!--
@@ -199,6 +201,10 @@
 
             <!-- JSON feed of discovery information. -->
             <Handler type="DiscoveryFeed" Location="/DiscoFeed"/>
+
+            <!-- Checks for required attribute(s) before login completes. -->
+            <Handler type="AttributeChecker" Location="/AttrChecker" template="attrChecker.html"
+                attributes="eppn" flushSession="true"/>
         </Sessions>
 
         <!--
@@ -206,6 +212,7 @@
         also add attributes with values that can be plugged into the templates.
         -->
         <Errors supportContact="root at localhost"
+            helpLocation="/about.html"
             logoLocation="/shibboleth-sp/logo.jpg"
             styleSheet="/shibboleth-sp/main.css"/>
         
@@ -237,7 +244,10 @@
 
         <!-- Map to extract attributes from SAML assertions. -->
         <AttributeExtractor type="XML" validate="true" path="attribute-map.xml"/>
-        
+
+        <!-- Extracts support information for IdP from its metadata. -->
+        <AttributeExtractor type="Metadata" errorURL="errorURL" DisplayName="displayName"/>
+
         <!-- Use a SAML query if no attributes are supplied during SSO. -->
         <AttributeResolver type="Query" subjectMatch="true"/>
 

Modified: branches/REL_2/configs/shibboleth2.xml
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibboleth2.xml?rev=3574&r1=3573&r2=3574&view=diff
==============================================================================
--- branches/REL_2/configs/shibboleth2.xml (original)
+++ branches/REL_2/configs/shibboleth2.xml Wed Feb  8 16:49:49 2012
@@ -66,6 +66,7 @@

[... 262 lines stripped ...]