[java-plugin-shibd-oidc] branch main updated: Fix commons version and interface, improve tests
Codeberg
noreply at shibboleth.net
Thu Feb 19 16:04:41 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-plugin-shibd-oidc.
View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-oidc/commit/f1637ad31376562b94f39d37812fd527c2745faf
The following commit(s) were added to refs/heads/main by this push:
new f1637ad Fix commons version and interface, improve tests
f1637ad is described below
commit f1637ad31376562b94f39d37812fd527c2745faf
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Feb 19 16:04:34 2026 +0000
Fix commons version and interface, improve tests
---
pom.xml | 4 ++--
.../net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java | 7 +------
.../src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java | 5 +----
.../net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml | 2 +-
.../net/shibboleth/sp/oidc/profile/impl/ExtractOIDCClaims.java | 8 ++++----
5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index f9a418f..0429527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,9 +30,9 @@ copyright/license information. -->
<shib-profile.groupId>net.shibboleth</shib-profile.groupId>
<shib-profile.version>5.2.0</shib-profile.version>
<oidc-common.groupId>net.shibboleth.oidc</oidc-common.groupId>
- <oidc-common.version>3.3.1-SNAPSHOT</oidc-common.version>
+ <oidc-common.version>3.4.0-SNAPSHOT</oidc-common.version>
<oidc-config.groupId>net.shibboleth.idp.plugin.config.oidc</oidc-config.groupId>
- <oidc-config.version>3.0.0</oidc-config.version>
+ <oidc-config.version>3.0.0</oidc-config.version> <!-- TODO not sure we are using config -->
<idp.groupId>net.shibboleth.idp</idp.groupId>
<idp.version>5.2.0</idp.version>
<shibd.groupId>net.shibboleth.sp</shibd.groupId>
diff --git a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java
index 59dda68..49e9dbd 100644
--- a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java
+++ b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java
@@ -90,7 +90,6 @@ import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.DecodingException;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.security.IdentifierGenerationStrategy;
import net.shibboleth.shared.xml.XMLParserException;
import net.shibboleth.sp.context.AgentRequestContext;
import net.shibboleth.sp.ddf.DDF;
@@ -115,10 +114,6 @@ import net.shibboleth.sp.profile.ConsumerConstants;
@WebAppConfiguration
@SuppressWarnings({ "unchecked", "rawtypes", "null" })
public class OIDCTokenConsumerFlowTest extends AbstractSPFlowTest {
-
- @Autowired
- @Qualifier("shibboleth.SessionIDGenerator")
- protected IdentifierGenerationStrategy idGenerator;
/** Dummy signing key of the dummy OP we are testing against. */
@Autowired @Qualifier("dummy.op.signing.Credential") protected JWKCredential opSigningCredential;
@@ -727,7 +722,7 @@ public class OIDCTokenConsumerFlowTest extends AbstractSPFlowTest {
final JWTClaimsSet claimsSet = new JWTClaimsSet.Builder()
.subject("jdoe")
.issuer(TestConstants.ISSUER)
- .audience("mock-client-id")
+ .audience(TestConstants.CLIENT_ID)
.claim("name", "John Doe").build();
final JWT signedUserInfoToken =
diff --git a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java
index 693b694..27106c3 100644
--- a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java
+++ b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java
@@ -49,7 +49,7 @@ public final class TestConstants {
}
/** The client_id to use, must match the issuer in oidc-test-agents.xml.*/
- @Nonnull @NotEmpty public static final String CLIENT_ID = "testsp.example.org";
+ @Nonnull @NotEmpty public static final String CLIENT_ID = "testspclientid";
/** Flow ID. */
@Nonnull public static final String FLOW_ID = "sp/token-consumer";
@@ -57,9 +57,6 @@ public final class TestConstants {
/** Issuer. */
@Nonnull public static final String ISSUER = "https://op.example.org";
- /** Audience. */
- @Nonnull public static final String AUDIENCE = "https://testsp.example.org";
-
/** REDIRECT URI. */
@Nonnull public static final String RESPONSE_URL = "https://sp.example.org/Shibboleth.sso/callback";
diff --git a/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml b/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml
index e227f93..40fdf82 100644
--- a/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml
+++ b/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml
@@ -19,7 +19,7 @@
<import resource="oidc-credentials.xml" />
<bean id="testsp.example.org" parent="shibboleth.sp.Agent" p:credentials="#{ {null : 'foo'} }"
- p:issuer="testsp.example.org">
+ p:issuer="testspclientid">
<property name="applications">
<set>
<bean p:id="test-oidc-application-with-default-profile" parent="shibboleth.sp.Application"/>
diff --git a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ExtractOIDCClaims.java b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ExtractOIDCClaims.java
index dd5ae6d..3303346 100644
--- a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ExtractOIDCClaims.java
+++ b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ExtractOIDCClaims.java
@@ -53,7 +53,7 @@ import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.oidc.metadata.ProviderMetadataResolver;
-import net.shibboleth.oidc.profile.config.OIDCSSORelyingPartyConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCSSORelyingPartyConfigurationEx;
import net.shibboleth.oidc.profile.context.EndUserClaimsContext;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
@@ -96,7 +96,7 @@ public class ExtractOIDCClaims extends AbstractApplicationAction {
@NonnullBeforeExec private AttributeContext attributeContext;
/** Store off profile config. */
- @NonnullBeforeExec private OIDCSSORelyingPartyConfiguration profileConfiguration;
+ @NonnullBeforeExec private OIDCSSORelyingPartyConfigurationEx profileConfiguration;
/** The set of id_token claims before they are processed.*/
@NonnullBeforeExec private JWTClaimsSet unprocessedIdTokenClaims;
@@ -227,7 +227,7 @@ public class ExtractOIDCClaims extends AbstractApplicationAction {
log.error("{} Unable to locate profile configuration", getLogPrefix());
ActionSupport.buildEvent(profileRequestContext, IdPEventIds.INVALID_PROFILE_CONFIG);
return false;
- } else if (!(rpContext.getProfileConfig() instanceof OIDCSSORelyingPartyConfiguration)) {
+ } else if (!(rpContext.getProfileConfig() instanceof OIDCSSORelyingPartyConfigurationEx)) {
log.error("{} Not a OIDC RelyingParty profile configuration", getLogPrefix());
ActionSupport.buildEvent(profileRequestContext, IdPEventIds.INVALID_PROFILE_CONFIG);
return false;
@@ -240,7 +240,7 @@ public class ExtractOIDCClaims extends AbstractApplicationAction {
return false;
}
- profileConfiguration = (OIDCSSORelyingPartyConfiguration) rpContext.getProfileConfig();
+ profileConfiguration = (OIDCSSORelyingPartyConfigurationEx) rpContext.getProfileConfig();
return true;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list