[java-identity-provider] branch master updated: IDP-1306 - Add SAML pairwise and subject ids

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=e6e83de7893adb57dc073f7f180ea0b61fd24086

The following commit(s) were added to refs/heads/master by this push:
       new  e6e83de   IDP-1306 - Add SAML pairwise and subject ids
e6e83de is described below

commit e6e83de7893adb57dc073f7f180ea0b61fd24086
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 20 10:52:39 2018 -0400

    IDP-1306 - Add SAML pairwise and subject ids
    
    https://issues.shibboleth.net/jira/browse/IDP-1306
    
    Rename internally to avoid hyphens in the names.
---
 idp-conf/src/main/resources/conf/attribute-filter.xml        | 4 ++--
 idp-conf/src/main/resources/conf/attribute-resolver-full.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/attribute-filter.xml b/idp-conf/src/main/resources/conf/attribute-filter.xml
index 888a8a7..92195b1 100644
--- a/idp-conf/src/main/resources/conf/attribute-filter.xml
+++ b/idp-conf/src/main/resources/conf/attribute-filter.xml
@@ -20,7 +20,7 @@
     <AttributeFilterPolicy id="subject-identifiers">
         <PolicyRequirementRule xsi:type="ANY" />
 
-        <AttributeRule attributeID="pairwise-id">
+        <AttributeRule attributeID="samlPairwiseID">
             <PermitValueRule xsi:type="OR">
                 <Rule xsi:type="EntityAttributeExactMatch"
                     attributeName="urn:oasis:names:tc:SAML:profiles:subject-id:req"
@@ -33,7 +33,7 @@
             </PermitValueRule>
         </AttributeRule>
 
-        <AttributeRule attributeID="subject-id">
+        <AttributeRule attributeID="samlSubjectID">
             <PermitValueRule xsi:type="EntityAttributeExactMatch"
                 attributeName="urn:oasis:names:tc:SAML:profiles:subject-id:req"
                 attributeNameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
diff --git a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
index 02ea7e8..e44ffbc 100644
--- a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
+++ b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
@@ -240,12 +240,12 @@
 
     <!-- Schema: SAML Subject ID Attributes -->
 <!--
-    <AttributeDefinition xsi:type="Scoped" id="subject-id" scope="%{idp.scope}">
+    <AttributeDefinition xsi:type="Scoped" id="samlSubjectID" scope="%{idp.scope}">
         <InputDataConnector ref="myLDAP" attributeNames="%{idp.persistentId.sourceAttribute}"/>
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oasis:names:tc:SAML:attribute:subject-id" friendlyName="subject-id" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Scoped" id="pairwise-id" scope="%{idp.scope}">
+    <AttributeDefinition xsi:type="Scoped" id="samlPairwiseID" scope="%{idp.scope}">
         <InputDataConnector ref="computed" attributeNames="computedId"/>
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oasis:names:tc:SAML:attribute:pairwise-id" friendlyName="pairwise-id" encodeType="false" />
     </AttributeDefinition>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.