X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2Fattribute-map.xml;h=c163754d31b4c32b8746ef914f35054db3238c24;hb=HEAD;hp=8e479a3096efce6e8958d9be7176be02450dda6a;hpb=af7aef3a5b5a03cdd34180fa9df397ca8037d8e9;p=shibboleth%2Fcpp-sp.git

diff --git a/configs/attribute-map.xml b/configs/attribute-map.xml
index 8e479a3..c163754 100644
--- a/configs/attribute-map.xml
+++ b/configs/attribute-map.xml
@@ -1,5 +1,12 @@
 <Attributes xmlns="urn:mace:shibboleth:2.0:attribute-map" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
+    <!--
+    The mappings are a mix of SAML 1.1 and SAML 2.0 attribute names agreed to within the Shibboleth
+    community. The non-OID URNs are SAML 1.1 names and most of the OIDs are SAML 2.0 names, with a
+    few exceptions for newer attributes where the name is the same for both versions. You will
+    usually want to uncomment or map the names for both SAML versions as a unit.
+    -->
+    
     <!-- First some useful eduPerson attributes that many sites might use. -->
     
     <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="eppn">
@@ -26,17 +33,15 @@
     <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="entitlement"/>
 
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" id="assurance"/>
-    
     <!-- A persistent id attribute that supports personalized anonymous access. -->
     
-    <!-- First, the deprecated version, decoded as a scoped string: -->
+    <!-- First, the deprecated/incorrect version, decoded as a scoped string: -->
     <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="targeted-id">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
         <!-- <AttributeDecoder xsi:type="NameIDFromScopedAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/> -->
     </Attribute>
     
-    <!-- Second, an alternate decoder that will turn the deprecated form into the newer form. -->
+    <!-- Second, an alternate decoder that will decode the incorrect form into the newer form. -->
     <!--
     <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="persistent-id">
         <AttributeDecoder xsi:type="NameIDFromScopedAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
@@ -70,13 +75,22 @@
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" id="primary-orgunit-dn"/>
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" id="orgunit-dn"/>
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" id="org-dn"/>
+
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" id="assurance"/>
+    
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" id="member"/>
+    
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" id="eduCourseOffering"/>
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" id="eduCourseMember"/>
     -->
 
-    <!--Examples of LDAP-based attributes, uncomment to use these... -->
+    <!-- Examples of LDAP-based attributes, uncomment to use these... -->
     <!--
     <Attribute name="urn:mace:dir:attribute-def:cn" id="cn"/>
     <Attribute name="urn:mace:dir:attribute-def:sn" id="sn"/>
     <Attribute name="urn:mace:dir:attribute-def:givenName" id="givenName"/>
+    <Attribute name="urn:mace:dir:attribute-def:displayName" id="displayName"/>
+    <Attribute name="urn:mace:dir:attribute-def:uid" id="uid"/>
     <Attribute name="urn:mace:dir:attribute-def:mail" id="mail"/>
     <Attribute name="urn:mace:dir:attribute-def:telephoneNumber" id="telephoneNumber"/>
     <Attribute name="urn:mace:dir:attribute-def:title" id="title"/>
@@ -84,7 +98,6 @@
     <Attribute name="urn:mace:dir:attribute-def:description" id="description"/>
     <Attribute name="urn:mace:dir:attribute-def:carLicense" id="carLicense"/>
     <Attribute name="urn:mace:dir:attribute-def:departmentNumber" id="departmentNumber"/>
-    <Attribute name="urn:mace:dir:attribute-def:displayName" id="displayName"/>
     <Attribute name="urn:mace:dir:attribute-def:employeeNumber" id="employeeNumber"/>
     <Attribute name="urn:mace:dir:attribute-def:employeeType" id="employeeType"/>
     <Attribute name="urn:mace:dir:attribute-def:preferredLanguage" id="preferredLanguage"/>
@@ -104,6 +117,8 @@
     <Attribute name="urn:oid:2.5.4.3" id="cn"/>
     <Attribute name="urn:oid:2.5.4.4" id="sn"/>
     <Attribute name="urn:oid:2.5.4.42" id="givenName"/>
+    <Attribute name="urn:oid:2.16.840.1.113730.3.1.241" id="displayName"/>
+    <Attribute name="urn:oid:0.9.2342.19200300.100.1.1" id="uid"/>
     <Attribute name="urn:oid:0.9.2342.19200300.100.1.3" id="mail"/>
     <Attribute name="urn:oid:2.5.4.20" id="telephoneNumber"/>
     <Attribute name="urn:oid:2.5.4.12" id="title"/>
@@ -114,7 +129,6 @@
     <Attribute name="urn:oid:2.16.840.1.113730.3.1.3" id="employeeNumber"/>
     <Attribute name="urn:oid:2.16.840.1.113730.3.1.4" id="employeeType"/>
     <Attribute name="urn:oid:2.16.840.1.113730.3.1.39" id="preferredLanguage"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.241" id="displayName"/>
     <Attribute name="urn:oid:0.9.2342.19200300.100.1.10" id="manager"/>
     <Attribute name="urn:oid:2.5.4.34" id="seeAlso"/>
     <Attribute name="urn:oid:2.5.4.23" id="facsimileTelephoneNumber"/>