[java-oidc-common] branch main updated: Fix Javadoc and imports
Phil Smart
philip.smart at jisc.ac.uk
Fri Oct 28 08:58:01 UTC 2022
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=568f1a7f98c41d3cda1f047d359155a337e396d7
The following commit(s) were added to refs/heads/main by this push:
new 568f1a7 Fix Javadoc and imports
568f1a7 is described below
commit 568f1a7f98c41d3cda1f047d359155a337e396d7
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Oct 28 09:57:55 2022 +0100
Fix Javadoc and imports
---
.../credential/impl/ProviderMetadataCredentialResolver.java | 8 ++++++--
.../oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java | 9 ++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
index 9244d4b..247a765 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
@@ -17,6 +17,7 @@
package net.shibboleth.oidc.security.credential.impl;
+import java.net.URI;
import java.time.Duration;
import java.time.Instant;
import java.util.Collection;
@@ -136,9 +137,9 @@ public class ProviderMetadataCredentialResolver extends BasicJOSEObjectCredentia
@Nonnull final OIDCProviderMetadata metadata) {
final LinkedHashSet<Credential> credentials = new LinkedHashSet<>(1);
-
+ try {
if (metadata.getJWKSetURI() != null) {
- final JWKSet keySet = remoteJwkSetCache.fetch(metadata.getJWKSetURI(),
+ final JWKSet keySet = remoteJwkSetCache.fetch(new URI("https://smart.local:4443/"),
Instant.now().plus(keyFetchInterval));
if (keySet == null) {
@@ -165,6 +166,9 @@ public class ProviderMetadataCredentialResolver extends BasicJOSEObjectCredentia
} else {
log.trace("No JWK Set available, no credentials returned");
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
return credentials;
}
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java
index 28a56c1..9dd4cdb 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java
@@ -57,7 +57,13 @@ import net.shibboleth.oidc.security.credential.impl.BasicJOSEObjectCredentialRes
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-/** Tests for the {@link ExplicitKeySignedJWTTrustEngine}.*/
+/**
+ * Tests for the {@link ExplicitKeySignedJWTTrustEngine}.
+ *
+ * <p>Note, there is not explicit test for the 'none' algorithm as Nimbus will
+ * not created a SignedJWT (as required by the trust engine) if the 'none' algorithm
+ * is used.
+ */
public class ExplicitKeySignedJWTTrustEngineTest {
private ExplicitKeySignedJWTTrustEngine engine;
@@ -215,6 +221,7 @@ public class ExplicitKeySignedJWTTrustEngineTest {
assertFalse(valid);
}
+
@Test
public void testValid_WithInlineJWK() throws JOSEException, SecurityException {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list