[java-idp-oidc] branch main updated: Collapse property files, and default to BASE32 to match IdP.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=dc632da5ea9a3cc69e8536b88481dc7261a13b5c

The following commit(s) were added to refs/heads/main by this push:
       new  dc632da5  Collapse property files, and default to BASE32 to match IdP.
dc632da5 is described below

commit dc632da5ea9a3cc69e8536b88481dc7261a13b5c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Nov 13 11:20:25 2020 -0500

    Collapse property files, and default to BASE32 to match IdP.
---
 .../src/main/resources/conf/attribute-resolver-oidc.xml      |  2 +-
 .../src/main/resources/conf/idp-oidc.properties              | 10 ++++++++++
 .../src/main/resources/conf/oidc-subject.properties          | 12 ------------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml b/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml
index 2124167d..f3ada7da 100644
--- a/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml
+++ b/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml
@@ -209,7 +209,7 @@
             generatedAttributeID="subjectId"
             salt="%{idp.oidc.subject.salt}"
             algorithm="%{idp.oidc.subject.algorithm:SHA}"
-            encoding="%{idp.oidc.subject.encoding:BASE32}">
+            encoding="BASE32">
             <InputAttributeDefinition ref="%{idp.oidc.subject.sourceAttribute}"/>
     </DataConnector>
     
diff --git a/idp-oidc-extension-distribution/src/main/resources/conf/idp-oidc.properties b/idp-oidc-extension-distribution/src/main/resources/conf/idp-oidc.properties
index 4a2957a3..db1d2c29 100644
--- a/idp-oidc-extension-distribution/src/main/resources/conf/idp-oidc.properties
+++ b/idp-oidc-extension-distribution/src/main/resources/conf/idp-oidc.properties
@@ -45,3 +45,13 @@ idp.signing.oidc.rsa.enc.key = %{idp.home}/credentials/idp-encryption-rsa.jwk
 
 # Reference to a global bean defining the dynamic contents for the openid-configuration
 #idp.oidc.discovery.resolver = shibboleth.oidc.DefaultOpenIdConfigurationResolver
+
+# The source attribute used in generating the sub claim
+idp.oidc.subject.sourceAttribute = uid
+
+# The digest algorithm used in generating the sub claim
+#idp.oidc.subject.algorithm = SHA
+
+# The salt used in generating the subject
+# Do *NOT* share the salt with other people, it's like divulging your private key.
+idp.oidc.subject.salt = this_too_should_be_ch4ng3d
diff --git a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-subject.properties b/idp-oidc-extension-distribution/src/main/resources/conf/oidc-subject.properties
deleted file mode 100644
index 0933bf7a..00000000
--- a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-subject.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# The source attribute used in generating the subject
-idp.oidc.subject.sourceAttribute = uid
-
-# The digest algorithm used in generating the subject
-#idp.oidc.subject.algorithm = SHA
-
-# The encoding used in generating the subject
-#idp.oidc.subject.encoding = BASE32
-
-# The salt used in generating the subject
-# Do *NOT* share the salt with other people, it's like divulging your private key.
-idp.oidc.subject.salt = this_too_should_be_ch4ng3d

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