[java-idp-plugin-duo] branch main updated: Assembly cleanup. Javadoc fixes
Phil Smart
philip.smart at jisc.ac.uk
Tue Jan 19 10:35:05 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=159996d6dfcfab0604716d91f67a7deb5c791300
The following commit(s) were added to refs/heads/main by this push:
new 159996d Assembly cleanup. Javadoc fixes
159996d is described below
commit 159996d6dfcfab0604716d91f67a7deb5c791300
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Jan 19 10:35:03 2021 +0000
Assembly cleanup. Javadoc fixes
---
.../idp/plugin/authn/duo/impl/BasicJWTClaimsVerifier.java | 3 ++-
.../idp/plugin/authn/duo/impl/ValidateTokenClaims.java | 3 ++-
.../src/main/assembly/duo-nimbus-assembly.xml | 15 ++++++++-------
.../src/main/assembly/duo-native-sdk-assembly.xml | 11 ++++++-----
pom.xml | 3 ---
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/BasicJWTClaimsVerifier.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/BasicJWTClaimsVerifier.java
index f5e15b4..206a4a7 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/BasicJWTClaimsVerifier.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/BasicJWTClaimsVerifier.java
@@ -253,7 +253,8 @@ public class BasicJWTClaimsVerifier<ContextType extends SecurityContext> extends
if (iatWindow.compareTo(iatDifference) < 0) {
throw new BadJWTException("JWT issued-at time is too far away from the current time. "
- + "Token issued at '"+iat+"' was too far away from the current time '"+now+"' with acceptable deviation of "
+ + "Token issued at '"+iat+"' was too far away from the current time '"+now+"' "
+ + "with acceptable deviation of "
+ "'"+iatWindow+"', difference is '"+iatDifference+"'");
}
}
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java
index a01dfa8..5178c10 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java
@@ -192,7 +192,8 @@ public class ValidateTokenClaims extends AbstractDuoAuthenticationAction {
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) {
duoCtx.setNonce(null);
}
diff --git a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml b/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml
index fb065f3..3f0aadb 100644
--- a/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml
+++ b/idp-duo-nimbus-distribution/src/main/assembly/duo-nimbus-assembly.xml
@@ -21,12 +21,11 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
- <!-- Our dependencies -->
- <fileSet>
- <directory>../idp-duo-api/target</directory>
+ <fileSet>
+ <directory>../idp-duo-nimbus-client-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>idp-plugin-duo-api-*.jar</include>
+ <include>idp-plugin-duo-nimbus-client-impl-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
@@ -34,18 +33,20 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <!-- Our API -->
<fileSet>
- <directory>../idp-duo-nimbus-client-impl/target</directory>
+ <directory>../idp-duo-api/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>idp-plugin-duo-nimbus-client-impl-*.jar</include>
+ <include>idp-plugin-duo-api-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
<exclude>*javadoc.jar</exclude>
<exclude>*sources.jar</exclude>
</excludes>
- </fileSet>
+ </fileSet>
+ <!-- Our dependencies -->
<fileSet>
<directory>../idp-duo-nimbus-client-impl/target/dependency</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
diff --git a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml b/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml
index 3a131db..6da5dd7 100644
--- a/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml
+++ b/idp-duo-sdk-distribution/src/main/assembly/duo-native-sdk-assembly.xml
@@ -21,12 +21,11 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
- <!-- Our dependencies -->
<fileSet>
- <directory>../idp-duo-api/target</directory>
+ <directory>../idp-duo-sdk-client-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>idp-plugin-duo-api-*.jar</include>
+ <include>idp-plugin-duo-sdk-client-impl-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
@@ -34,11 +33,12 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <!-- Our API -->
<fileSet>
- <directory>../idp-duo-sdk-client-impl/target</directory>
+ <directory>../idp-duo-api/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>idp-plugin-duo-sdk-client-impl-*.jar</include>
+ <include>idp-plugin-duo-api-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
@@ -46,6 +46,7 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <!-- Our dependencies -->
<fileSet>
<directory>../idp-duo-sdk-client-impl/target/dependency</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
diff --git a/pom.xml b/pom.xml
index d4363c9..62d15ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,9 +81,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
-
-
-
</dependencies>
<dependencyManagement>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list