[java-idp-plugin-duo] branch master updated: Cleanup code format, cleanup POMs (replace plugin.base)
Phil Smart
philip.smart at jisc.ac.uk
Mon Aug 3 09:48:27 UTC 2020
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch master
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=e6b20a26c1911c92e52c128fbed2ae76793c96e8
The following commit(s) were added to refs/heads/master by this push:
new e6b20a2 Cleanup code format, cleanup POMs (replace plugin.base)
e6b20a2 is described below
commit e6b20a26c1911c92e52c128fbed2ae76793c96e8
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Aug 3 10:48:24 2020 +0100
Cleanup code format, cleanup POMs (replace plugin.base)
---
idp-duo-api/pom.xml | 4 ++--
idp-duo-distribution/pom.xml | 2 +-
idp-duo-impl/pom.xml | 4 ++--
.../idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java | 3 ++-
.../net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-flow.xml | 3 +--
.../net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java | 2 --
.../resources/conf/authn/duo-oidc-authn-config-custom-factory.xml | 2 +-
idp-duo-native-client-impl/pom.xml | 2 +-
pom.xml | 1 -
10 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/idp-duo-api/pom.xml b/idp-duo-api/pom.xml
index 8290e28..84e5abb 100644
--- a/idp-duo-api/pom.xml
+++ b/idp-duo-api/pom.xml
@@ -7,14 +7,14 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>idp-plugin-${plugin.base}-api</artifactId>
+ <artifactId>idp-plugin-duo-api</artifactId>
<name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow API</name>
<description>IdP Duo OIDC 2FA plugin API.</description>
<packaging>jar</packaging>
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.idp.plugin.${plugin.base}.api</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.plugin.duo.api</automatic.module.name>
</properties>
diff --git a/idp-duo-distribution/pom.xml b/idp-duo-distribution/pom.xml
index 3cb3eb5..d69edad 100644
--- a/idp-duo-distribution/pom.xml
+++ b/idp-duo-distribution/pom.xml
@@ -9,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>idp-plugin-${plugin.base}-dist</artifactId>
+ <artifactId>idp-plugin-duo-dist</artifactId>
<name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow Distribution</name>
<description>IdP Duo OIDC 2FA plugin packaging.</description>
<packaging>pom</packaging>
diff --git a/idp-duo-impl/pom.xml b/idp-duo-impl/pom.xml
index 78764c7..c843a57 100644
--- a/idp-duo-impl/pom.xml
+++ b/idp-duo-impl/pom.xml
@@ -10,12 +10,12 @@
<name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow Impl</name>
<description>IdP Duo OIDC 2FA plugin implementation.</description>
- <artifactId>idp-plugin-${plugin.base}-impl</artifactId>
+ <artifactId>idp-plugin-duo-impl</artifactId>
<packaging>jar</packaging>
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.idp.plugin.${plugin.base}.impl</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.plugin.duo.impl</automatic.module.name>
<apache.commons.lang.version>3.10</apache.commons.lang.version>
</properties>
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java
index 4eeda7f..a9e3213 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java
@@ -125,7 +125,8 @@ public class DefaultDuoOIDCClientRegistry extends AbstractIdentifiableInitializa
public DuoOIDCClient apply(@Nonnull final DuoOIDCIntegration integration){
try {
- log.debug("Creating a new Duo client for integration '{}'",integration);
+ log.debug("Creating a new Duo client for integration '{}', using factory type '{}'",integration
+ ,clientFactory.getClass().getTypeName());
return clientFactory.createInstance(integration);
} catch (final DuoClientException e) {
//wrap the exception in a runtime exception.
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 bce3e66..d4ad6ab 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
@@ -22,13 +22,13 @@
<bean id="shibboleth.authn.duo.OIDC.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
c:target-ref="shibboleth.authn.duo.OIDC.externalAuthnPath" />
+ <!-- Default Duo Integration -->
<bean id="shibboleth.authn.duo.OIDC.DuoIntegration"
class="net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration"
p:APIHost="%{idp.duo.oidc.apiHost:none}"
p:clientId="%{idp.duo.oidc.clientId:none}"
p:secretKey="%{idp.duo.oidc.secretKey:none}"
- p:redirectURI="%{idp.duo.oidc.redirectUri:none}" />
-
+ p:redirectURI="%{idp.duo.oidc.redirectUri:none}" />
<bean id="shibboleth.authn.duo.OIDC.DuoIntegrationStrategy" parent="shibboleth.Functions.Constant"
c:target-ref="shibboleth.authn.duo.OIDC.DuoIntegration" />
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 2e86855..74a3a03 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
@@ -26,8 +26,7 @@
<!-- match the response state to the request state, fail if error -->
<action-state id="ValidateDuoResponse">
- <evaluate expression="ValidateDuoResponseState"/>
- <!-- switch here if no match-->
+ <evaluate expression="ValidateDuoResponseState"/>
<evaluate expression="'proceed'" />
<transition on="proceed" to="ExchangeCodeForDuoToken" />
</action-state>
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 d405f62..5efa3c6 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
@@ -332,8 +332,6 @@ public class DuoAuthnFlowTest extends AbstractAuthnXmlFlowExecutionTests {
assertEquals(prc.getSubcontext(SubjectCanonicalizationContext.class).getPrincipalName(),"jdoe");
}
-
- //TODO: test each action, make sure the Invalid end states are tested.
}
diff --git a/idp-duo-impl/src/test/resources/conf/authn/duo-oidc-authn-config-custom-factory.xml b/idp-duo-impl/src/test/resources/conf/authn/duo-oidc-authn-config-custom-factory.xml
index 5a7a661..9654f72 100644
--- a/idp-duo-impl/src/test/resources/conf/authn/duo-oidc-authn-config-custom-factory.xml
+++ b/idp-duo-impl/src/test/resources/conf/authn/duo-oidc-authn-config-custom-factory.xml
@@ -8,7 +8,7 @@
default-init-method="initialize" default-destroy-method="destroy">
- <!-- Add a custom Duo client factory oin the same way a user would-->
+ <!-- Add a custom Duo client factory in the same way a user would-->
<bean id="shibboleth.authn.duo.OIDC.clientFactory"
class="net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClientFactory_OK_Client" scope="singleton">
diff --git a/idp-duo-native-client-impl/pom.xml b/idp-duo-native-client-impl/pom.xml
index 83a8e3e..691d798 100644
--- a/idp-duo-native-client-impl/pom.xml
+++ b/idp-duo-native-client-impl/pom.xml
@@ -9,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>idp-plugin-${plugin.base}-native-client-impl</artifactId>
+ <artifactId>idp-plugin-duo-native-client-impl</artifactId>
<name>Shibboleth IdP :: Plugins :: Native Duo SDK implementation</name>
<description>IdP Duo OIDC 2FA native Duo SDK implementation.</description>
<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index df37033..5b24d81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
</description>
<properties>
- <plugin.base>duo</plugin.base>
<idp.groupId>net.shibboleth.idp</idp.groupId>
<idp.version>4.1.0-SNAPSHOT</idp.version>
<duo.client.version>1.0-SNAPSHOT</duo.client.version>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list