[java-idp-plugin-duo] branch main updated: Fix tests and flow to use the new duo property name
Phil Smart
philip.smart at jisc.ac.uk
Tue Oct 6 16:10:55 UTC 2020
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=8785bbe58ec098b3b4ad3f6c7cca45301f683b81
The following commit(s) were added to refs/heads/main by this push:
new 8785bbe Fix tests and flow to use the new duo property name
8785bbe is described below
commit 8785bbe58ec098b3b4ad3f6c7cca45301f683b81
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Oct 6 17:10:49 2020 +0100
Fix tests and flow to use the new duo property name
---
.../plugin/authn/duo/impl/DuoOIDCAuthnController.java | 2 +-
.../idp/flows/authn/DuoOIDC/duo-oidc-authn-flow.xml | 2 +-
.../duo/impl/AbstractAuthnXmlFlowExecutionTests.java | 2 +-
.../idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java | 16 ++++++++--------
idp-duo-nimbus-client-impl/pom.xml | 2 +-
.../idp/plugin/authn/duo/duo-client-factory-bean.xml | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java
index c223526..3226279 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java
@@ -56,7 +56,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
*
*/
@Controller
- at RequestMapping("%{idp.authn.duo.OIDC.externalAuthnPath:/Authn/Duo/2FA}")
+ at RequestMapping("%{idp.authn.DuoOIDC.externalAuthnPath:/Authn/Duo/2FA}")
public class DuoOIDCAuthnController extends AbstractInitializableComponent{
/** The name of the Http parameter that stores the authorisation code.*/
diff --git a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-flow.xml b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-flow.xml
index c4cc3f3..9fdb8f1 100644
--- a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-flow.xml
+++ b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-flow.xml
@@ -14,7 +14,7 @@
<view-state id="Duo2FAAuthorizationRequest"
- view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.duo.OIDC.externalAuthnPathStrategy').apply(opensamlProfileRequestContext) + '/authorize', flowExecutionContext.getKey().toString())}">
+ view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.DuoOIDC.externalAuthnPathStrategy').apply(opensamlProfileRequestContext) + '/authorize', flowExecutionContext.getKey().toString())}">
<attribute name="csrf_excluded" value="true" type="boolean" />
<on-render>
<evaluate
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
index 2637f8c..8f49e1a 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
@@ -282,7 +282,7 @@ public abstract class AbstractAuthnXmlFlowExecutionTests extends CustomAbstractX
if (clientFactory != null) {
//register the client factory
- builderContext.registerBean("shibboleth.authn.duo.OIDC.test.clientFactory", clientFactory);
+ builderContext.registerBean("shibboleth.authn.DuoOIDC.test.clientFactory", clientFactory);
}
}
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 e0a1ac4..7711eae 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
@@ -114,7 +114,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
"idp.duo.oidc.clientId","DIU6GEFWG5LIUBVV2M3P",
"idp.duo.oidc.secretKey","rFvDfPul27v3Wew2zb6xRPzAJewJ34MP2w8UitPh",
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config.xml",
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory");
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory");
setMockProperties(mockProperties);
@@ -146,7 +146,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
"idp.duo.oidc.clientId","DIU6GEFWG5LIUBVV2M3P",
"idp.duo.oidc.secretKey","rFvDfPul27v3Wew2zb6xRPzAJewJ34MP2w8UitPh",
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config.xml",
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory");
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory");
setMockProperties(mockProperties);
@@ -173,7 +173,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
setClientFactory(new MockDuoOIDCClientFactory_OK_Client());
final Map<String,String> mockProperties = Map.of(
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory",
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config-multiple-integrations.xml");
setMockProperties(mockProperties);
@@ -213,7 +213,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
setClientFactory(new MockDuoOIDCClientFactory_OK_Client());
final Map<String,String> mockProperties = Map.of(
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory",
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config-multiple-integrations.xml");
setMockProperties(mockProperties);
@@ -258,7 +258,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
"idp.duo.oidc.apiHost","api-c9f24c5a.duosecurity.com",
"idp.duo.oidc.clientId","DIU6GEFWG5LIUBVV2M3P",
"idp.duo.oidc.secretKey","rFvDfPul27v3Wew2zb6xRPzAJewJ34MP2w8UitPh",
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory",
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config-custom-factory.xml");
setMockProperties(mockProperties);
@@ -290,7 +290,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
final Map<String,String> mockProperties = Map.of(
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config.xml",
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory");
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory");
setMockProperties(mockProperties);
@@ -353,7 +353,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
final Map<String,String> mockProperties = Map.of(
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory",
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config.xml");
setMockProperties(mockProperties);
@@ -432,7 +432,7 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
final Map<String,String> mockProperties = Map.of(
- "idp.duo.oidc.clientFactoryBean","shibboleth.authn.duo.OIDC.test.clientFactory",
+ "idp.duo.oidc.clientFactoryBean","shibboleth.authn.DuoOIDC.test.clientFactory",
"idp.duo.oidc.user.config.home","/conf/authn/duo-oidc-authn-config.xml");
setMockProperties(mockProperties);
diff --git a/idp-duo-nimbus-client-impl/pom.xml b/idp-duo-nimbus-client-impl/pom.xml
index 7967987..99a2bd3 100644
--- a/idp-duo-nimbus-client-impl/pom.xml
+++ b/idp-duo-nimbus-client-impl/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
- <version>3.10.3</version>
+ <version>3.3.0</version>
</dependency>
<!-- DONE -->
diff --git a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml
index 51b0e14..f9fef6c 100644
--- a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml
+++ b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml
@@ -13,7 +13,7 @@
class="net.shibboleth.idp.plugin.authn.duo.nimbus.NimbusClientFactory" scope="singleton"
p:httpClient="#{getObject('shibboleth.authn.DuoOIDC.HttpClient') ?: getObject('shibboleth.authn.DuoOIDC.InternalHttpClient')}"
p:httpClientSecurityParameters="#{getObject('shibboleth.authn.DuoOIDC.HttpClientSecurityParameters')}"
- p:objectMapper-ref="shibboleth.authn.duo.OIDC.JSONObjectMapper">
+ p:objectMapper-ref="shibboleth.authn.DuoOIDC.JSONObjectMapper">
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list