[java-idp-plugin-duo] branch main updated: Remove unnecessary property config from the Nimbus and WebSDK properties

Phil Smart philip.smart at jisc.ac.uk
Mon Feb 15 10:34:48 UTC 2021


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=6496537785088ac8af1613c002a7f928b1172c02

The following commit(s) were added to refs/heads/main by this push:
       new  6496537   Remove unnecessary property config from the Nimbus and WebSDK properties
6496537 is described below

commit 6496537785088ac8af1613c002a7f928b1172c02
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Feb 15 10:34:45 2021 +0000

    Remove unnecessary property config from the Nimbus and WebSDK properties
    
     - Includes minor Javadoc fixes.
---
 .../shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java  |  2 +-
 .../plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java  |  4 ++--
 .../authn/duo/nimbus/conf/authn/duo-oidc.properties       |  3 ---
 .../plugin/authn/duo/sdk/conf/authn/duo-oidc.properties   | 15 ---------------
 pom.xml                                                   |  2 +-
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java
index 1966ffb..827e438 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java
@@ -47,7 +47,7 @@ public final class DuoSupport {
      * @return the randomly generated nonce value.
      */
     @Nonnull static String generateNonce(@Nonnull final Integer length) {
-        Constraint.isGreaterThan(22, length, "State must be at least 22 characters");
+        Constraint.isGreaterThan(22, length, "Nonce must be at least 22 characters");
         final SecureRandom secureRandom = new SecureRandom();
         final StringBuilder sb = new StringBuilder();
         while(sb.length() < length){
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java
index 820d8bd..b37999d 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java
@@ -64,7 +64,7 @@ public class HealthCheckDuoOIDCAuthAPI extends AbstractDuoAuthenticationAction{
             if (client == null) {
                 throw new DuoClientException("Duo client is null, has the context been created correctly?");
             }
-            //Native duo SDK will throw an exception if anything other than OK is returned. 
+            //Native duo WebSDK v4 will throw an exception if anything other than OK is returned. 
             final DuoHealthCheck healthCheckResponse = client.healthCheck();            
             log.trace("{} Duo health check response '{}'",getLogPrefix(),healthCheckResponse);           
             
@@ -73,7 +73,7 @@ public class HealthCheckDuoOIDCAuthAPI extends AbstractDuoAuthenticationAction{
                 throw new DuoClientException("Duo 2FA is unavailable, null response from the "
                         + "health check endpoint");                
             }
-            //These checks are redundant if using the native Duo client as it throws an exception if not 'OK'.
+            //These checks are redundant if using the Duo WebSDK v4 client as it throws an exception if not 'OK'.
             //They are still included  to be compatible with other implementations which return the full response. 
             if (DuoOIDCAuthAPI.DUO_RESPONSE_STATUS_OK.equalsIgnoreCase(healthCheckResponse.getStatus())) {
                 log.trace("{} Duo 2FA endpoints are healthy!",getLogPrefix());
diff --git a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc.properties b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc.properties
index ced668f..8197251 100644
--- a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc.properties
+++ b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/conf/authn/duo-oidc.properties
@@ -31,9 +31,6 @@ idp.duo.oidc.redirectURL = https://<hostname>:<port>/idp/profile/Authn/Duo/2FA/d
 #idp.duo.oidc.endpoint.token = /oauth/v1/token
 #idp.duo.oidc.endpoint.authorize = /oauth/v1/authorize
 
-# Controls the "back-end" OIDC implementation.
-#   shibboleth.authn.DuoOIDC.sdk.clientFactory (Duo WebSDK-based)
-#   shibboleth.authn.DuoOIDC.nimbus.clientFactory (Shibboleth Nimbus-based)
 idp.duo.oidc.clientFactoryBean = shibboleth.authn.DuoOIDC.nimbus.clientFactory
 
 # With the Nimbus "client" impl, controls for HttpClient behavior
diff --git a/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc.properties b/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc.properties
index 2f85ccd..dedcefc 100644
--- a/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc.properties
+++ b/idp-duo-sdk-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/sdk/conf/authn/duo-oidc.properties
@@ -31,23 +31,8 @@ idp.duo.oidc.redirectURL = https://<hostname>:<port>/idp/profile/Authn/Duo/2FA/d
 #idp.duo.oidc.endpoint.token = /oauth/v1/token
 #idp.duo.oidc.endpoint.authorize = /oauth/v1/authorize
 
-# Controls the "back-end" OIDC implementation.
-#   shibboleth.authn.DuoOIDC.sdk.clientFactory (Duo WebSDK-based)
-#   shibboleth.authn.DuoOIDC.nimbus.clientFactory (Shibboleth Nimbus-based)
 idp.duo.oidc.clientFactoryBean = shibboleth.authn.DuoOIDC.sdk.clientFactory
 
-# With the Nimbus "client" impl, controls for HttpClient behavior
-# These default to the global HttpClient options in services.properties
-#idp.duo.oidc.connectionTimeout = PT1M
-#idp.duo.oidc.connectionRequestTimeout = PT1M
-#idp.duo.oidc.socketTimeout = PT1M
-#idp.duo.oidc.maxConnectionsTotal = 100
-#idp.duo.oidc.maxConnectionsPerRoute = 100
-# If you want to enable certificate revocation checking with the Nimbus "client",
-# you need to enable this property in addition to configuring a suitable means to 
-# locate a revocation response, see the plugin documentation.
-#idp.duo.oidc.nimbus.checkRevocation = false
-
 # Shouldn't need changing, controls the OIDC id_token claims verification
 #idp.duo.oidc.jwt.verifier.clockSkew = PT60S
 #idp.duo.oidc.jwt.verifier.iatWindow = PT60S
diff --git a/pom.xml b/pom.xml
index eecedbc..e5890db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <opensaml.groupId>org.opensaml</opensaml.groupId>
         <opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
         <java-support.version>8.2.0-SNAPSHOT</java-support.version>      
-        <oidc.common.version>0.0.1</oidc.common.version>
+        <oidc.common.version>0.0.2-SNAPSHOT</oidc.common.version>
         <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
     </properties>
 

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


More information about the commits mailing list