[java-idp-plugin-duo] branch main updated: Fix issue with external (user space) config file

[Phil Smart]

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

philsmart 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=4cff97a52e131ca82feac528e4d7890a4c91d292

The following commit(s) were added to refs/heads/main by this push:
       new  4cff97a   Fix issue with external (user space) config file
4cff97a is described below

commit 4cff97a52e131ca82feac528e4d7890a4c91d292
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Dec 21 15:29:59 2020 +0000

    Fix issue with external (user space) config file
---
 .../net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml | 2 +-
 .../net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
index 555812d..7cbcaf8 100644
--- a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
+++ b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
@@ -50,7 +50,7 @@
 
     <!-- Can override one or more of the beans above. Note, the property override is mostly to allow tests
     to change the location of the user config file. -->
-    <import resource="conditional:%{idp.home}%{idp.duo.oidc.user.config.home:/conf/authn/duo-oidc-authn-config.xml}" />
+    <import resource="conditional:%{idp.home}/conf/authn/%{idp.duo.oidc.user.config:duo-oidc-authn-config.xml}" />
 
     <!-- Prototype per conversation beans -->
     <bean id="PopulateDuoAuthenticationContext" scope="prototype"
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java
index 7711eae..47823f6 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java
@@ -174,7 +174,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
         
        final Map<String,String> mockProperties = Map.of(                
                 "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
-                "idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config-multiple-integrations.xml");
+                "idp.duo.oidc.user.config","duo-oidc-authn-config-multiple-integrations.xml");
         
         setMockProperties(mockProperties);
         
@@ -214,7 +214,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
         
        final Map<String,String> mockProperties = Map.of(
                 "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
-                "idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config-multiple-integrations.xml");
+                "idp.duo.oidc.user.config","duo-oidc-authn-config-multiple-integrations.xml");
         
         setMockProperties(mockProperties);
         
@@ -259,7 +259,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
                 "idp.duo.oidc.clientId","DIU6GEFWG5LIUBVV2M3P",
                 "idp.duo.oidc.secretKey","rFvDfPul27v3Wew2zb6xRPzAJewJ34MP2w8UitPh",
                 "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
-                "idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config-custom-factory.xml");
+                "idp.duo.oidc.user.config","duo-oidc-authn-config-custom-factory.xml");
         
         setMockProperties(mockProperties);
         

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