[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/conf/attribute-filter.xml main/resources/conf/...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 18 11:06:55 2014
New Revision: 7161

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7161&view=rev
Log:
IDP-546 - new default resolver/filter, an LDAP example version, and test changes

Added:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java

Modified: trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-filter.xml?rev=7161&r1=7160&r2=7161&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-filter.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-filter.xml Thu Dec 18 11:06:55 2014
@@ -7,18 +7,22 @@
 -->
 <afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
         xmlns:afp="urn:mace:shibboleth:2.0:afp"
-        xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" 
+        xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
         xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
                             urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
                             urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
 
-    <!-- TODO: Example policy for testbed and unit tests, remove before final -->
-    <afp:AttributeFilterPolicy id="releaseSomeAttributes">
+    <!-- Release some attributes to an SP. -->
+    <afp:AttributeFilterPolicy id="example1">
         <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://sp.example.org" />
 
-        <afp:AttributeRule attributeID="eduPersonAffiliation">
+        <afp:AttributeRule attributeID="eduPersonPrincipalName">
+            <afp:PermitValueRule xsi:type="basic:ANY" />
+        </afp:AttributeRule>
+
+        <afp:AttributeRule attributeID="uid">
             <afp:PermitValueRule xsi:type="basic:ANY" />
         </afp:AttributeRule>
 
@@ -28,45 +32,17 @@
 
     </afp:AttributeFilterPolicy>
 
-    <!-- 
-        Release eduPersonEntitlement and the permissible values of eduPersonAffiliation
-        to three specific SPs
-    -->
-    <!--
-    <afp:AttributeFilterPolicy>
+    <!-- Release eduPersonAffiliation to two specific SPs. -->
+    <afp:AttributeFilterPolicy id="example2">
         <afp:PolicyRequirementRule xsi:type="basic:OR">
-            <basic:Rule xsi:type="basic:AttributeRequesterString" value="urn:example.org:sp:Portal" />
-            <basic:Rule xsi:type="basic:AttributeRequesterString" value="urn:example.org:sp:SIS" />
-            <basic:Rule xsi:type="basic:AttributeRequesterString" value="urn:example.org:sp:LMS" />
+            <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://sp.example.org" />
+            <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://another.example.org" />
         </afp:PolicyRequirementRule>
 
-        <afp:AttributeRule attributeID="eduPersonAffiliation">
-            <afp:PermitValueRule xsi:type="basic:OR">
-                <basic:Rule xsi:type="basic:AttributeValueString" value="faculty" ignoreCase="true" />
-                <basic:Rule xsi:type="basic:AttributeValueString" value="student" ignoreCase="true" />
-                <basic:Rule xsi:type="basic:AttributeValueString" value="staff" ignoreCase="true" />
-                <basic:Rule xsi:type="basic:AttributeValueString" value="alum" ignoreCase="true" />
-                <basic:Rule xsi:type="basic:AttributeValueString" value="member" ignoreCase="true" />
-                <basic:Rule xsi:type="basic:AttributeValueString" value="affiliate" ignoreCase="true" />
-                <basic:Rule xsi:type="basic:AttributeValueString" value="employee" ignoreCase="true" />
-                <basic:Rule xsi:type="basic:AttributeValueString" value="library-walk-in" ignoreCase="true" />
-            </afp:PermitValueRule>
+        <afp:AttributeRule attributeID="eduPersonScopedAffiliation">
+            <afp:PermitValueRule xsi:type="basic:ANY" />
         </afp:AttributeRule>
 
     </afp:AttributeFilterPolicy>
-    -->
-
-    <!-- 

[... 533 lines stripped ...]