[java-idp-plugin-duo] branch main updated: Move duplicated (empty) conf file up into impl module.

Scott Cantor cantor.2 at osu.edu
Thu Jan 4 20:16:00 UTC 2024


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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new c3944217 Move duplicated (empty) conf file up into impl module.
c3944217 is described below

commit c39442176f4fefa41e620d1678f01a16363a2474
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jan 4 15:15:57 2024 -0500

    Move duplicated (empty) conf file up into impl module.
---
 .../duo}/conf/authn/duo-oidc-authn-config.xml      |  0
 .../idp/plugin/authn/duo/nimbus/module.properties  |  2 +-
 .../duo/sdk/conf/authn/duo-oidc-authn-config.xml   | 28 ----------------------
 .../idp/plugin/authn/duo/sdk/module.properties     |  2 +-
 4 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc-authn-config.xml b/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/conf/authn/duo-oidc-authn-config.xml
similarity index 100%
rename from idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc-authn-config.xml
rename to idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/conf/authn/duo-oidc-authn-config.xml
diff --git a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/module.properties b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/module.properties
index 4c98e4f2..9e090a54 100644
--- a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/module.properties
+++ b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/module.properties
@@ -9,7 +9,7 @@ idp.authn.DuoOIDC.plugin = net.shibboleth.idp.plugin.authn.duo.nimbus
 idp.authn.DuoOIDC.name = Duo "Universal Prompt" OIDC-based Authentication
 idp.authn.DuoOIDC.desc = Login flow for Duo Security's second-factor authentication service using the OIDC-based Universal Prompt via native OIDC libraries
 idp.authn.DuoOIDC.url = /DuoOIDCAuthnConfiguration
-idp.authn.DuoOIDC.1.src = /net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc-authn-config.xml
+idp.authn.DuoOIDC.1.src = /net/shibboleth/idp/plugin/authn/duo/conf/authn/duo-oidc-authn-config.xml
 idp.authn.DuoOIDC.1.dest = conf/authn/duo-oidc-authn-config.xml
 idp.authn.DuoOIDC.2.src = /net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc.properties
 idp.authn.DuoOIDC.2.dest = conf/authn/duo-oidc.properties
diff --git a/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc-authn-config.xml b/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc-authn-config.xml
deleted file mode 100644
index 5aa4f3e1..00000000
--- a/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc-authn-config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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 DuoOIDC flow will use statically-defined integrations defined via
-    properties. If you need more flexibility, you can define a function bean
-    called "shibboleth.authn.DuoOIDC.DuoIntegrationStrategy" to return an instance of
-    net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration based on the state
-    of the request.
-
-    The Duo flow is designed to operate in conjunction with some other login flow,
-    usually orchestrated by the MFA login flow. It obtains the username to send to
-    Duo based on the output of the other login flow or a previous session with the
-    user. You can override that approach using a function bean called
-    "shibboleth.authn.DuoOIDC.UsernameLookupStrategy" to supply the username from a
-    different source.
-    
-    Various other beans are supported, per the documentation.
-    -->
-
-</beans>
diff --git a/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/module.properties b/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/module.properties
index e2ff44b0..96865df4 100644
--- a/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/module.properties
+++ b/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/module.properties
@@ -9,7 +9,7 @@ idp.authn.DuoOIDC.plugin = net.shibboleth.idp.plugin.authn.duo.sdk
 idp.authn.DuoOIDC.name = Duo "Universal Prompt" OIDC-based Authentication
 idp.authn.DuoOIDC.desc = Login flow for Duo Security's second-factor authentication service using the OIDC-based Universal Prompt via Duo's WebSDK
 idp.authn.DuoOIDC.url = /DuoOIDCAuthnConfiguration
-idp.authn.DuoOIDC.1.src = /net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc-authn-config.xml
+idp.authn.DuoOIDC.1.src = /net/shibboleth/idp/plugin/authn/duo/conf/authn/duo-oidc-authn-config.xml
 idp.authn.DuoOIDC.1.dest = conf/authn/duo-oidc-authn-config.xml
 idp.authn.DuoOIDC.2.src = /net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc.properties
 idp.authn.DuoOIDC.2.dest = conf/authn/duo-oidc.properties

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


More information about the commits mailing list