[java-idp-plugin-duo] branch main updated: Minor cleanup before release
Phil Smart
philip.smart at jisc.ac.uk
Tue Feb 9 13:38:45 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=29e958851f540ad5b44d7e807c9d9915bd6a7d5e
The following commit(s) were added to refs/heads/main by this push:
new 29e9588 Minor cleanup before release
29e9588 is described below
commit 29e958851f540ad5b44d7e807c9d9915bd6a7d5e
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Feb 9 13:38:42 2021 +0000
Minor cleanup before release
---
.../idp/plugin/authn/duo/model/DuoHealthCheck.java | 2 -
.../duo/impl/DefaultDuoOIDCClientRegistry.java | 4 +-
.../duo/impl/DuoNonceClaimLookupStrategy.java | 2 +-
.../duo/impl/ProfileRequestJWTSecurityContext.java | 54 ----------------------
.../impl/ValidateDuoTokenAuthenticationResult.java | 4 +-
.../authn/duo/impl/ValidateTokenSignature.java | 4 +-
.../duo/nimbus/impl/DuoHttpClientFactoryBean.java | 1 -
.../authn/duo/nimbus/impl/NimbusClientSupport.java | 1 -
.../authn/duo/sdk/impl/DuoSDKClientAdaptor.java | 1 -
9 files changed, 6 insertions(+), 67 deletions(-)
diff --git a/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
index 5965313..cb7a228 100644
--- a/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
@@ -11,8 +11,6 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-
/**
* <p>Represents a health check response from Duo's 2FA endpoint.</p>
*
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 417eb1e..933c6a2 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
@@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +37,7 @@ import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -62,7 +62,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* be created for the same integration.</p>
*
*/
- at ThreadSafe
+ at ThreadSafeAfterInit
public class DefaultDuoOIDCClientRegistry extends AbstractIdentifiableInitializableComponent
implements DuoOIDCClientRegistry {
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoNonceClaimLookupStrategy.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoNonceClaimLookupStrategy.java
index a138be9..e685384 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoNonceClaimLookupStrategy.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoNonceClaimLookupStrategy.java
@@ -1,4 +1,4 @@
-/*
+/*
* Licensed to the University Corporation for Advanced Internet Development,
* Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ProfileRequestJWTSecurityContext.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ProfileRequestJWTSecurityContext.java
deleted file mode 100644
index cfa8365..0000000
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ProfileRequestJWTSecurityContext.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.authn.duo.impl;
-
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.Immutable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import com.nimbusds.jose.proc.SecurityContext;
-
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
-/** Simple IdP Nimbus JWT Verification security context that holds the {@link ProfileRequestContext}.*/
- at Immutable
-public class ProfileRequestJWTSecurityContext implements SecurityContext{
-
- /** The profile request context.*/
- @Nonnull private final ProfileRequestContext prc;
-
- /**
- * Constructor.
- *
- * @param requestContext the profile request context
- */
- public ProfileRequestJWTSecurityContext(@Nonnull final ProfileRequestContext requestContext) {
- prc = Constraint.isNotNull(requestContext, "ProfileRequestContext can not be null");
- }
-
- /**
- * Get the profile request context.
- *
- * @return the profile request context.
- */
- @Nonnull public ProfileRequestContext getPrc() {
- return prc;
- }
-
-}
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
index 88b175b..755e4e2 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
@@ -42,7 +42,6 @@ import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
-import net.shibboleth.idp.authn.context.UsernamePasswordContext;
import net.shibboleth.idp.authn.duo.DuoPrincipal;
import net.shibboleth.idp.plugin.authn.duo.DuoException;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
@@ -257,7 +256,8 @@ public class ValidateDuoTokenAuthenticationResult extends AbstractValidationActi
if (input != null) {
final AuthenticationContext authnCtx = input.getSubcontext(AuthenticationContext.class);
if (authnCtx != null) {
- final DuoOIDCAuthenticationContext duoCtx = authnCtx.getSubcontext(DuoOIDCAuthenticationContext.class);
+ final DuoOIDCAuthenticationContext duoCtx =
+ authnCtx.getSubcontext(DuoOIDCAuthenticationContext.class);
if (duoCtx != null) {
authnCtx.removeSubcontext(duoCtx);
}
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java
index 5fd054b..7ca9d80 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java
@@ -30,14 +30,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nimbusds.jose.Algorithm;
-import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jwt.JWT;
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.PlainJWT;
import com.nimbusds.jwt.SignedJWT;
-import com.nimbusds.jose.JWSVerifier;
-import com.nimbusds.jose.crypto.MACVerifier;
+
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
diff --git a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/DuoHttpClientFactoryBean.java b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/DuoHttpClientFactoryBean.java
index e59cd2b..930c0b2 100644
--- a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/DuoHttpClientFactoryBean.java
+++ b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/DuoHttpClientFactoryBean.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package net.shibboleth.idp.plugin.authn.duo.nimbus.impl;
import net.shibboleth.idp.plugin.authn.duo.Version;
diff --git a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java
index 6bafefc..1526503 100644
--- a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java
+++ b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package net.shibboleth.idp.plugin.authn.duo.nimbus.impl;
import java.security.SecureRandom;
diff --git a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
index 8d6c1c9..e19f05f 100644
--- a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
+++ b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package net.shibboleth.idp.plugin.authn.duo.sdk.impl;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list