[java-idp-plugin-oidc-rp] branch main updated: Switch specific crypto config lookup classes to generic in commons
Phil Smart
philip.smart at jisc.ac.uk
Mon Jan 9 14:55:43 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=0a03acb5e90aa80aad2d2665043795995fcfb23e
The following commit(s) were added to refs/heads/main by this push:
new 0a03acb Switch specific crypto config lookup classes to generic in commons
0a03acb is described below
commit 0a03acb5e90aa80aad2d2665043795995fcfb23e
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Jan 9 14:55:40 2023 +0000
Switch specific crypto config lookup classes to generic in commons
---
...TokenDecryptionConfigurationLookupFunction.java | 92 --------------------
...atureValidationConfigurationLookupFunction.java | 97 ----------------------
...bjectEncryptionConfigurationLookupFunction.java | 93 ---------------------
...ignatureSigningConfigurationLookupFunction.java | 92 --------------------
...rInfoDecryptionConfigurationLookupFunction.java | 92 --------------------
.../oidc-relying-party-authn-beans.xml | 24 ++++--
6 files changed, 16 insertions(+), 474 deletions(-)
diff --git a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/IDTokenDecryptionConfigurationLookupFunction.java b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/IDTokenDecryptionConfigurationLookupFunction.java
deleted file mode 100644
index 955d1e7..0000000
--- a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/IDTokenDecryptionConfigurationLookupFunction.java
+++ /dev/null
@@ -1,92 +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.oidc.rp.config.navigate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
-
-/**
- * A function that returns a {@link JWTDecryptionConfiguration} list for JWE decryption by way
- * of various lookup strategies.
- *
- * <p>
- * If a specific setting is unavailable, a null value is returned.
- * </p>
- */
-public class IDTokenDecryptionConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTDecryptionConfiguration>> {
-
- /** A resolver for default security configurations. */
- @Nullable
- private RelyingPartyConfigurationResolver rpResolver;
-
- /**
- * Set the resolver for default security configurations.
- *
- * @param resolver the resolver to use
- */
- public void setRelyingPartyConfigurationResolver(@Nullable final RelyingPartyConfigurationResolver resolver) {
- rpResolver = resolver;
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable
- public List<JWTDecryptionConfiguration> apply(@Nullable final ProfileRequestContext input) {
-
- final List<JWTDecryptionConfiguration> configs = new ArrayList<>();
-
- final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
- if (rpc != null) {
- final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc.getSecurityConfiguration(input) instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtDecryptionConfiguration() != null) {
- configs.add(((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtDecryptionConfiguration());
- }
- }
-
- // Check for a per-profile default (relying party independent) config.
- if (input != null && rpResolver != null) {
- final SecurityConfiguration defaultConfig =
- rpResolver.getDefaultSecurityConfiguration(input.getProfileId());
- if (defaultConfig instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) defaultConfig)
- .getJwtDecryptionConfiguration() != null) {
- configs.add(
- ((OIDCSecurityConfiguration) defaultConfig).getJwtDecryptionConfiguration());
- }
- }
- // TODO: Support for Global Default configuration?
- return configs;
- }
-}
-
diff --git a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/JWTSignatureValidationConfigurationLookupFunction.java b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/JWTSignatureValidationConfigurationLookupFunction.java
deleted file mode 100644
index 79076f7..0000000
--- a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/JWTSignatureValidationConfigurationLookupFunction.java
+++ /dev/null
@@ -1,97 +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.oidc.rp.config.navigate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.messaging.context.MessageContext;
-
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.messaging.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
-
-/**
- * A function that returns a {@link JWTSignatureValidationConfiguration} list for JWS validation by way
- * of various lookup strategies.
- *
- * <p>
- * If a specific setting is unavailable, a null value is returned.
- * </p>
- */
-public class JWTSignatureValidationConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTSignatureValidationConfiguration>> {
-
- /** A resolver for default security configurations. */
- @Nullable
- private RelyingPartyConfigurationResolver rpResolver;
-
- /**
- * Set the resolver for default security configurations.
- *
- * @param resolver the resolver to use
- */
- public void setRelyingPartyConfigurationResolver(@Nullable final RelyingPartyConfigurationResolver resolver) {
- rpResolver = resolver;
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable
- public List<JWTSignatureValidationConfiguration> apply(@Nullable final MessageContext input) {
-
- final List<JWTSignatureValidationConfiguration> configs = new ArrayList<>();
-
- final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
- if (rpc != null) {
- final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null &&
- pc.getSecurityConfiguration(getProfileRequestContextLookupStrategy().apply(input))
- instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) pc.getSecurityConfiguration(
- getProfileRequestContextLookupStrategy().apply(input)))
- .getJwtSignatureValidationConfiguration() != null) {
- configs.add(((OIDCSecurityConfiguration) pc.getSecurityConfiguration(
- getProfileRequestContextLookupStrategy().apply(input)))
- .getJwtSignatureValidationConfiguration());
- }
- }
-
- // Check for a per-profile default (relying party independent) config.
- if (input != null && rpResolver != null) {
- final SecurityConfiguration defaultConfig =
- rpResolver.getDefaultSecurityConfiguration(
- getProfileRequestContextLookupStrategy().apply(input).getProfileId());
- if (defaultConfig instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) defaultConfig)
- .getJwtSignatureValidationConfiguration() != null) {
- configs.add(
- ((OIDCSecurityConfiguration) defaultConfig).getJwtSignatureValidationConfiguration());
- }
- }
- // TODO: Support for Global Default configuration?
- return configs;
- }
-}
-
diff --git a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/RequestObjectEncryptionConfigurationLookupFunction.java b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/RequestObjectEncryptionConfigurationLookupFunction.java
deleted file mode 100644
index 33dd089..0000000
--- a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/RequestObjectEncryptionConfigurationLookupFunction.java
+++ /dev/null
@@ -1,93 +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.oidc.rp.config.navigate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.xmlsec.EncryptionConfiguration;
-
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
-
-/**
- * A function that returns an {@link JWTEncryptionConfiguration} list for request object encryption by way
- * of various lookup strategies.
- *
- * <p>
- * If a specific setting is unavailable, a null value is returned.
- * </p>
- */
-public class RequestObjectEncryptionConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTEncryptionConfiguration>> {
-
- /** A resolver for default security configurations. */
- @Nullable
- private RelyingPartyConfigurationResolver rpResolver;
-
- /**
- * Set the resolver for default security configurations.
- *
- * @param resolver the resolver to use
- */
- public void setRelyingPartyConfigurationResolver(@Nullable final RelyingPartyConfigurationResolver resolver) {
- rpResolver = resolver;
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable
- public List<JWTEncryptionConfiguration> apply(@Nullable final ProfileRequestContext input) {
-
- final List<JWTEncryptionConfiguration> configs = new ArrayList<>();
-
- final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
- if (rpc != null) {
- final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc.getSecurityConfiguration(input) instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtEncryptionConfiguration() != null) {
- configs.add(((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtEncryptionConfiguration());
- }
- }
-
- // Check for a per-profile default (relying party independent) config.
- if (input != null && rpResolver != null) {
- final SecurityConfiguration defaultConfig =
- rpResolver.getDefaultSecurityConfiguration(input.getProfileId());
- if (defaultConfig instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) defaultConfig)
- .getJwtEncryptionConfiguration() != null) {
- configs.add(
- ((OIDCSecurityConfiguration) defaultConfig).getJwtEncryptionConfiguration());
- }
- }
- // TODO: Support for Global Default configuration?
- return configs;
- }
-}
-
diff --git a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/RequestObjectSignatureSigningConfigurationLookupFunction.java b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/RequestObjectSignatureSigningConfigurationLookupFunction.java
deleted file mode 100644
index bc264e6..0000000
--- a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/RequestObjectSignatureSigningConfigurationLookupFunction.java
+++ /dev/null
@@ -1,92 +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.oidc.rp.config.navigate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
-
-/**
- * A function that returns a {@link JWTSignatureSigningConfiguration} list for request object signing by way
- * of various lookup strategies.
- *
- * <p>
- * If a specific setting is unavailable, a null value is returned.
- * </p>
- */
-public class RequestObjectSignatureSigningConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTSignatureSigningConfiguration>> {
-
- /** A resolver for default security configurations. */
- @Nullable
- private RelyingPartyConfigurationResolver rpResolver;
-
- /**
- * Set the resolver for default security configurations.
- *
- * @param resolver the resolver to use
- */
- public void setRelyingPartyConfigurationResolver(@Nullable final RelyingPartyConfigurationResolver resolver) {
- rpResolver = resolver;
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable
- public List<JWTSignatureSigningConfiguration> apply(@Nullable final ProfileRequestContext input) {
-
- final List<JWTSignatureSigningConfiguration> configs = new ArrayList<>();
-
- final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
- if (rpc != null) {
- final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc.getSecurityConfiguration(input) instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtSignatureSigningConfiguration() != null) {
- configs.add(((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtSignatureSigningConfiguration());
- }
- }
-
- // Check for a per-profile default (relying party independent) config.
- if (input != null && rpResolver != null) {
- final SecurityConfiguration defaultConfig =
- rpResolver.getDefaultSecurityConfiguration(input.getProfileId());
- if (defaultConfig instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) defaultConfig)
- .getJwtSignatureSigningConfiguration() != null) {
- configs.add(
- ((OIDCSecurityConfiguration) defaultConfig).getJwtSignatureSigningConfiguration());
- }
- }
- // TODO: Support for Global Default configuration?
- return configs;
- }
-}
-
diff --git a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/UserInfoDecryptionConfigurationLookupFunction.java b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/UserInfoDecryptionConfigurationLookupFunction.java
deleted file mode 100644
index 847c754..0000000
--- a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/config/navigate/UserInfoDecryptionConfigurationLookupFunction.java
+++ /dev/null
@@ -1,92 +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.oidc.rp.config.navigate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
-
-/**
- * A function that returns a {@link JWTDecryptionConfiguration} list for JWE decryption by way
- * of various lookup strategies.
- *
- * <p>
- * If a specific setting is unavailable, a null value is returned.
- * </p>
- */
-public class UserInfoDecryptionConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTDecryptionConfiguration>> {
-
- /** A resolver for default security configurations. */
- @Nullable
- private RelyingPartyConfigurationResolver rpResolver;
-
- /**
- * Set the resolver for default security configurations.
- *
- * @param resolver the resolver to use
- */
- public void setRelyingPartyConfigurationResolver(@Nullable final RelyingPartyConfigurationResolver resolver) {
- rpResolver = resolver;
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable
- public List<JWTDecryptionConfiguration> apply(@Nullable final ProfileRequestContext input) {
-
- final List<JWTDecryptionConfiguration> configs = new ArrayList<>();
-
- final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
- if (rpc != null) {
- final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc.getSecurityConfiguration(input) instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtDecryptionConfiguration() != null) {
- configs.add(((OIDCSecurityConfiguration) pc.getSecurityConfiguration(input))
- .getJwtDecryptionConfiguration());
- }
- }
-
- // Check for a per-profile default (relying party independent) config.
- if (input != null && rpResolver != null) {
- final SecurityConfiguration defaultConfig =
- rpResolver.getDefaultSecurityConfiguration(input.getProfileId());
- if (defaultConfig instanceof OIDCSecurityConfiguration
- && ((OIDCSecurityConfiguration) defaultConfig)
- .getJwtDecryptionConfiguration() != null) {
- configs.add(
- ((OIDCSecurityConfiguration) defaultConfig).getJwtDecryptionConfiguration());
- }
- }
- // TODO: Support for Global Default configuration?
- return configs;
- }
-}
-
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
index 17d7bc4..f9b65ec 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
@@ -182,7 +182,7 @@
class="net.shibboleth.idp.plugin.authn.oidc.rp.messaging.context.logic.RequestObjectSupportedSignatureSigningAlgorithms" />
<bean id="RequestObjectSignatureSigningConfigurationLookup" lazy-init="true"
- class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.RequestObjectSignatureSigningConfigurationLookupFunction"
+ class="net.shibboleth.oidc.profile.config.navigate.JWTSignatureSigningConfigurationLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<bean id="PopulateRequestObjectEncryptionParameters"
@@ -195,7 +195,7 @@
p:activationCondition-ref="EncryptRequestObjectCondition" />
<bean id="RequestObjectEncryptionConfigurationLookup" lazy-init="true"
- class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.RequestObjectEncryptionConfigurationLookupFunction"
+ class="net.shibboleth.oidc.profile.config.navigate.JWTEncryptionConfigurationLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<!-- TODO Should the resolvers move to the post-config as they are global singletons -->
@@ -438,7 +438,7 @@
class="net.shibboleth.oidc.security.impl.DefaultJWTDecryptionParametersResolver" />
<bean id="IDTokenDecryptionConfigurationLookup" lazy-init="true"
- class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.IDTokenDecryptionConfigurationLookupFunction"
+ class="net.shibboleth.oidc.profile.config.navigate.JWTDecryptionConfigurationLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<bean id="IDTokenInAccessTokenUpdateStrategy"
@@ -473,8 +473,12 @@
<bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationParametersResolver" />
</property>
<property name="configurationLookupStrategy">
- <bean class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.JWTSignatureValidationConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
+ <bean class="net.shibboleth.oidc.profile.config.navigate.MessageContextLookupFunctionAdaptor">
+ <constructor-arg>
+ <bean class="net.shibboleth.oidc.profile.config.navigate.JWTSignatureValidationConfigurationLookupFunction"
+ p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
+ </constructor-arg>
+ </bean>
</property>
</bean>
@@ -705,7 +709,7 @@
p:decryptionParametersResolver-ref="JWTDecryptionParametersResolver" />
<bean id="UserInfoTokenDecryptionConfigurationLookup" lazy-init="true"
- class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.UserInfoDecryptionConfigurationLookupFunction"
+ class="net.shibboleth.oidc.profile.config.navigate.JWTDecryptionConfigurationLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<bean id="UserInfoInUserInfoResponseContextUpdateStrategy"
@@ -741,8 +745,12 @@
<bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationParametersResolver" />
</property>
<property name="configurationLookupStrategy">
- <bean class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.JWTSignatureValidationConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
+ <bean class="net.shibboleth.oidc.profile.config.navigate.MessageContextLookupFunctionAdaptor">
+ <constructor-arg>
+ <bean class="net.shibboleth.oidc.profile.config.navigate.JWTSignatureValidationConfigurationLookupFunction"
+ p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
+ </constructor-arg>
+ </bean>
</property>
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list