Merge pull request #191 from knaw-huc/master

extra attribute uid requested
clarin-eric · Feb 10, 2020 · 3bcd6d2 · 3bcd6d2
2 parents 05600c8 + 0c3f674
commit 3bcd6d2
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 56 deletions.
diff --git a/metadata/authentication.clariah.nl%2FSaml2%2Fproxy_saml2_backend.xml.xml b/metadata/authentication.clariah.nl%2FSaml2%2Fproxy_saml2_backend.xml.xml
@@ -73,46 +73,56 @@ OYSIi1eUuz0X3foVRGo1iOJPjflIptl/+F4sGG52Um1Fb29CMjSltECiZoNq0Jq2
       <md:AttributeConsumingService index="1">
          <md:ServiceName xml:lang="en">CLARIAH Identity Service</md:ServiceName>
          <md:ServiceDescription xml:lang="en">The application that you're logging into is part of the CLARIAH infrastructure and has delegated authentication to the CLARIAH Identity Service</md:ServiceDescription>
+         <!-- SAML1 -->
          <md:RequestedAttribute FriendlyName="eduPersonTargetedID"
                                 Name="urn:mace:dir:attribute-def:eduPersonTargetedID"
                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
                                 isRequired="false"/>
-         <md:RequestedAttribute FriendlyName="eduPersonTargetedID"
-                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="false"/>
          <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
                                 Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
                                 isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
          <md:RequestedAttribute FriendlyName="displayName"
                                 Name="urn:mace:dir:attribute-def:displayName"
                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
                                 isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="displayName"
-                                Name="urn:oid:2.16.840.1.113730.3.1.241"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
          <md:RequestedAttribute FriendlyName="schacHomeOrganization"
                                 Name="urn:mace:terena.org:attribute-def:schacHomeOrganization"
                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
                                 isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="schacHomeOrganization"
-                                Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
          <md:RequestedAttribute FriendlyName="mail"
                                 Name="urn:mace:dir:attribute-def:mail"
                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
                                 isRequired="true"/>
+         <md:RequestedAttribute FriendlyName="uid"
+                                Name="urn:mace:dir:attribute-def:uid"
+                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                isRequired="false"/>
+         <!-- SAML2 -->
+         <md:RequestedAttribute FriendlyName="eduPersonTargetedID"
+                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                isRequired="false"/>
+         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
+                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                isRequired="true"/>
+         <md:RequestedAttribute FriendlyName="displayName"
+                                Name="urn:oid:2.16.840.1.113730.3.1.241"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                isRequired="true"/>
+         <md:RequestedAttribute FriendlyName="schacHomeOrganization"
+                                Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                isRequired="true"/>
          <md:RequestedAttribute FriendlyName="mail"
                                 Name="urn:oid:0.9.2342.19200300.100.1.3"
                                 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
                                 isRequired="true"/>
+         <md:RequestedAttribute FriendlyName="uid"
+                                Name="urn:oid:0.9.2342.19200300.100.1.1"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                isRequired="false"/>
       </md:AttributeConsumingService>
    </md:SPSSODescriptor>
    <md:Organization>

diff --git a/metadata/testauthentication.di.huc.knaw.nl%2FSaml2%2Fproxy_saml2_backend.xml.xml b/metadata/testauthentication.di.huc.knaw.nl%2FSaml2%2Fproxy_saml2_backend.xml.xml
@@ -73,46 +73,56 @@
       <md:AttributeConsumingService index="1">
          <md:ServiceName xml:lang="en">KNAW HuC Digital Infrastructure Identity Service</md:ServiceName>
          <md:ServiceDescription xml:lang="en">This identity service should only be used for testing and development purposes. Availability is not guaranteed.</md:ServiceDescription>
-         <md:RequestedAttribute FriendlyName="eduPersonTargetedID"
-                                Name="urn:mace:dir:attribute-def:eduPersonTargetedID"
-                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                                isRequired="false"/>
-         <md:RequestedAttribute FriendlyName="eduPersonTargetedID"
-                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="false"/>
-         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                                Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
-                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                                isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="displayName"
-                                Name="urn:mace:dir:attribute-def:displayName"
-                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                                isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="displayName"
-                                Name="urn:oid:2.16.840.1.113730.3.1.241"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="schacHomeOrganization"
-                                Name="urn:mace:terena.org:attribute-def:schacHomeOrganization"
-                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                                isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="schacHomeOrganization"
-                                Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="mail"
-                                Name="urn:mace:dir:attribute-def:mail"
-                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                                isRequired="true"/>
-         <md:RequestedAttribute FriendlyName="mail"
-                                Name="urn:oid:0.9.2342.19200300.100.1.3"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
+          <!-- SAML1 -->
+          <md:RequestedAttribute FriendlyName="eduPersonTargetedID"
+                                 Name="urn:mace:dir:attribute-def:eduPersonTargetedID"
+                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                 isRequired="false"/>
+          <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
+                                 Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
+                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="displayName"
+                                 Name="urn:mace:dir:attribute-def:displayName"
+                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="schacHomeOrganization"
+                                 Name="urn:mace:terena.org:attribute-def:schacHomeOrganization"
+                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="mail"
+                                 Name="urn:mace:dir:attribute-def:mail"
+                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="uid"
+                                 Name="urn:mace:dir:attribute-def:uid"
+                                 NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                 isRequired="false"/>
+          <!-- SAML2 -->
+          <md:RequestedAttribute FriendlyName="eduPersonTargetedID"
+                                 Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"
+                                 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                 isRequired="false"/>
+          <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
+                                 Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
+                                 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="displayName"
+                                 Name="urn:oid:2.16.840.1.113730.3.1.241"
+                                 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="schacHomeOrganization"
+                                 Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
+                                 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="mail"
+                                 Name="urn:oid:0.9.2342.19200300.100.1.3"
+                                 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                 isRequired="true"/>
+          <md:RequestedAttribute FriendlyName="uid"
+                                 Name="urn:oid:0.9.2342.19200300.100.1.1"
+                                 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                 isRequired="false"/>
       </md:AttributeConsumingService>
    </md:SPSSODescriptor>
    <md:Organization>