[java-idp-oidc] branch main updated: JOIDC-94 - Missing oauth2-authn-config.xml breaks on Windows

Wed Apr 20 20:05:32 UTC 2022

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=e1a4edc5f0e9b0e14c5db9f5de700834e089fe52

The following commit(s) were added to refs/heads/main by this push:
     new e1a4edc5 JOIDC-94 - Missing oauth2-authn-config.xml breaks on Windows
e1a4edc5 is described below

commit e1a4edc5f0e9b0e14c5db9f5de700834e089fe52
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Apr 20 16:05:29 2022 -0400

    JOIDC-94 - Missing oauth2-authn-config.xml breaks on Windows
    
    https://shibboleth.atlassian.net/browse/JOIDC-94
    
    Expedient workaround to add the missing file as a module resource.
---
 .../op/conf/authn/oauth2client-authn-config.xml    | 30 +++++++++++++
 .../idp/plugin/oidc/op/module.properties           | 52 ++++++++++++----------
 2 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/authn/oauth2client-authn-config.xml b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/authn/oauth2client-authn-config.xml
new file mode 100644
index 00000000..e00b9c85
--- /dev/null
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/authn/oauth2client-authn-config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:c="http://www.springframework.org/schema/c"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+                           
+       default-init-method="initialize"
+       default-destroy-method="destroy">
+    
+    <!--
+    By default, the system will implement support for client secret validation against client metadata
+    and signed JWT methods.
+    
+    You may uncomment and adjust this bean to define other "back-ends" for client secret validation
+    such as LDAP.
+    -->
+    
+    <!--
+    <util:list id="shibboleth.authn.OAuth2Client.Validators">
+        <ref bean="shibboleth.OIDCClientInfoValidator" />
+        <ref bean="shibboleth.JWTValidator" />
+    </util:list>
+    -->
+        
+</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/module.properties b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/module.properties
index ca79da12..4b672519 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/module.properties
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/module.properties
@@ -23,41 +23,45 @@ idp.oidc.OP.4.src = /net/shibboleth/idp/plugin/oidc/op/conf/attributes/oidc-clai
 idp.oidc.OP.4.dest = conf/attributes/oidc-claim-rules.xml
 idp.oidc.OP.4.optional = true
 
-idp.oidc.OP.5.src = /net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-filter.xml
-idp.oidc.OP.5.dest = conf/examples/oidc-attribute-filter.xml
-idp.oidc.OP.5.replace = true
+idp.oidc.OP.5.src = /net/shibboleth/idp/plugin/oidc/op/conf/authn/oauth2client-authn-config.xml
+idp.oidc.OP.5.dest = conf/authn/oauth2client-authn-config.xml
 idp.oidc.OP.5.optional = true
 
-idp.oidc.OP.6.src = /net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-resolver.xml
-idp.oidc.OP.6.dest = conf/examples/oidc-attribute-resolver.xml
+idp.oidc.OP.6.src = /net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-filter.xml
+idp.oidc.OP.6.dest = conf/examples/oidc-attribute-filter.xml
 idp.oidc.OP.6.replace = true
 idp.oidc.OP.6.optional = true
 
-idp.oidc.OP.7.src = /net/shibboleth/idp/plugin/oidc/op/static/openid-configuration.json
-idp.oidc.OP.7.dest = static/openid-configuration.json
+idp.oidc.OP.7.src = /net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-resolver.xml
+idp.oidc.OP.7.dest = conf/examples/oidc-attribute-resolver.xml
+idp.oidc.OP.7.replace = true
+idp.oidc.OP.7.optional = true
 
-idp.oidc.OP.8.src = /net/shibboleth/idp/plugin/oidc/op/bin/jwtgen.sh
-idp.oidc.OP.8.dest = bin/jwtgen.sh
-idp.oidc.OP.8.exec = true
+idp.oidc.OP.8.src = /net/shibboleth/idp/plugin/oidc/op/static/openid-configuration.json
+idp.oidc.OP.8.dest = static/openid-configuration.json
 
-idp.oidc.OP.9.src = /net/shibboleth/idp/plugin/oidc/op/bin/jwtgen.bat
-idp.oidc.OP.9.dest = bin/jwtgen.bat
+idp.oidc.OP.9.src = /net/shibboleth/idp/plugin/oidc/op/bin/jwtgen.sh
+idp.oidc.OP.9.dest = bin/jwtgen.sh
+idp.oidc.OP.9.exec = true
 
-idp.oidc.OP.10.src = /net/shibboleth/idp/plugin/oidc/op/bin/lib/json-web-key-generator-0.8.2-jar-with-dependencies.jar
-idp.oidc.OP.10.dest = bin/lib/json-web-key-generator-0.8.2-jar-with-dependencies.jar
+idp.oidc.OP.10.src = /net/shibboleth/idp/plugin/oidc/op/bin/jwtgen.bat
+idp.oidc.OP.10.dest = bin/jwtgen.bat
 
-idp.oidc.OP.11.src = /net/shibboleth/idp/plugin/oidc/op/bin/issue-access-token.sh
-idp.oidc.OP.11.dest = bin/issue-access-token.sh
-idp.oidc.OP.11.exec = true
+idp.oidc.OP.11.src = /net/shibboleth/idp/plugin/oidc/op/bin/lib/json-web-key-generator-0.8.2-jar-with-dependencies.jar
+idp.oidc.OP.11.dest = bin/lib/json-web-key-generator-0.8.2-jar-with-dependencies.jar
 
-idp.oidc.OP.12.src = /net/shibboleth/idp/plugin/oidc/op/bin/issue-access-token.bat
-idp.oidc.OP.12.dest = bin/issue-access-token.bat
+idp.oidc.OP.12.src = /net/shibboleth/idp/plugin/oidc/op/bin/issue-access-token.sh
+idp.oidc.OP.12.dest = bin/issue-access-token.sh
+idp.oidc.OP.12.exec = true
 
-idp.oidc.OP.13.src = /net/shibboleth/idp/plugin/oidc/op/bin/oidc-clients.sh
-idp.oidc.OP.13.dest = bin/oidc-clients.sh
-idp.oidc.OP.13.exec = true
+idp.oidc.OP.13.src = /net/shibboleth/idp/plugin/oidc/op/bin/issue-access-token.bat
+idp.oidc.OP.13.dest = bin/issue-access-token.bat
 
-idp.oidc.OP.14.src = /net/shibboleth/idp/plugin/oidc/op/bin/oidc-clients.bat
-idp.oidc.OP.14.dest = bin/oidc-clients.bat
+idp.oidc.OP.14.src = /net/shibboleth/idp/plugin/oidc/op/bin/oidc-clients.sh
+idp.oidc.OP.14.dest = bin/oidc-clients.sh
+idp.oidc.OP.14.exec = true
+
+idp.oidc.OP.15.src = /net/shibboleth/idp/plugin/oidc/op/bin/oidc-clients.bat
+idp.oidc.OP.15.dest = bin/oidc-clients.bat
 
 idp.oidc.OP.postenable = See documentation for additional instructions to enable the OP module.
\ No newline at end of file

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