[java-identity-provider] branch main updated: Rename responderId to issuer in RelyingPartyConfig.
Scott Cantor
cantor.2 at osu.edu
Thu Mar 2 16:56:43 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=564341a39731aa6d4cd427ebc486765aab389dea
The following commit(s) were added to refs/heads/main by this push:
new 564341a39 Rename responderId to issuer in RelyingPartyConfig.
564341a39 is described below
commit 564341a39731aa6d4cd427ebc486765aab389dea
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 2 11:56:40 2023 -0500
Rename responderId to issuer in RelyingPartyConfig.
---
.../idp/authn/AbstractValidationAction.java | 4 ++--
.../authn/impl/FinalizeMultiFactorAuthentication.java | 7 ++++---
.../proxy/impl/DiscoveryProfileRequestFunction.java | 2 +-
.../revocation/impl/AttributeRevocationCondition.java | 4 ++--
.../net/shibboleth/idp/conf/audit-system.xml | 2 +-
.../resources/net/shibboleth/idp/conf/functions.xml | 5 +++--
.../shibboleth/idp/conf/profile-intercept-system.xml | 2 +-
.../shibboleth/idp/conf/relying-party-mddriven.xml | 2 +-
.../net/shibboleth/idp/conf/relying-party-system.xml | 2 +-
.../shibboleth/idp/flows/admin/resolvertest-beans.xml | 2 +-
.../shibboleth/idp/flows/authn/saml-authn-beans.xml | 19 +++++++------------
.../idp/flows/saml/logout/saml2-logoutprop-beans.xml | 2 +-
.../shibboleth/idp/flows/saml/saml-abstract-beans.xml | 2 +-
.../flows/saml/saml1/artifact-resolution-beans.xml | 2 +-
.../flows/saml/saml2/artifact-resolution-beans.xml | 4 ++--
.../shibboleth/idp/flows/saml/saml2/common-beans.xml | 2 +-
.../idp/flows/saml/saml2/slo-back-beans.xml | 2 +-
.../idp/flows/saml/saml2/slo-front-abstract-beans.xml | 2 +-
.../idp/flows/saml/saml2/sso-abstract-beans.xml | 2 +-
.../test/flows/c14n/actions/SetupForSAML1C14N.java | 2 +-
.../test/flows/c14n/actions/SetupForSAML2C14N.java | 2 +-
.../shibboleth/idp/profile/impl/FilterAttributes.java | 4 ++--
.../idp/profile/impl/ResolveAttributes.java | 4 ++--
.../impl/SelectRelyingPartyConfigurationTest.java | 2 +-
.../idp/saml/audit/impl/WriteFTICKSLog.java | 4 ++--
.../AttributeSourcedSAML1NameIdentifierGenerator.java | 4 ++--
.../impl/AttributeSourcedSAML2NameIDGenerator.java | 4 ++--
.../nameid/impl/PersistentSAML2NameIDGenerator.java | 4 ++--
.../impl/TransientSAML1NameIdentifierGenerator.java | 4 ++--
.../nameid/impl/TransientSAML2NameIDGenerator.java | 4 ++--
.../impl/BaseAddAttributeStatementToAssertion.java | 4 ++--
.../BaseAddAuthenticationStatementToAssertion.java | 4 ++--
.../saml/profile/impl/ExtractSubjectFromRequest.java | 4 ++--
.../impl/InitializeOutboundMessageContext.java | 4 ++--
.../PopulateInboundMessageContextWithSAMLSelf.java | 4 ++--
.../profile/impl/UpdateSAMLSelfEntityContext.java | 4 ++--
.../impl/AddAuthenticationStatementToAssertion.java | 2 +-
.../profile/impl/AddAuthnStatementToAssertion.java | 2 +-
.../saml/saml2/profile/impl/ProcessLogoutRequest.java | 4 ++--
...ributeSourcedSAML1NameIdentifierGeneratorTest.java | 4 ++--
.../AttributeSourcedSAML2NameIDGeneratorTest.java | 4 ++--
...yptoTransientSAML1NameIdentifierGeneratorTest.java | 2 +-
.../impl/CryptoTransientSAML2NameIDGeneratorTest.java | 2 +-
...oredTransientSAML1NameIdentifierGeneratorTest.java | 2 +-
.../impl/StoredTransientSAML2NameIDGeneratorTest.java | 2 +-
.../profile/impl/ExtractSubjectFromRequestTest.java | 4 ++--
.../saml1/profile/impl/SAML1ActionSupportTest.java | 4 ++--
.../saml/saml2/profile/impl/AddAuthnRequestTest.java | 4 ++--
.../saml2/profile/impl/SAML2ActionSupportTest.java | 4 ++--
49 files changed, 84 insertions(+), 87 deletions(-)
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
index bd4b7d1c9..9b06c067f 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
@@ -51,7 +51,7 @@ import net.shibboleth.idp.authn.principal.PrincipalEvalPredicate;
import net.shibboleth.idp.authn.principal.PrincipalEvalPredicateFactory;
import net.shibboleth.idp.authn.principal.PrincipalSupportingComponent;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
@@ -113,7 +113,7 @@ public abstract class AbstractValidationAction extends AbstractAuthenticationAct
clearErrorContext = true;
classifiedMessages = CollectionSupport.emptyMap();
requesterLookupStrategy = new RelyingPartyIdLookupFunction();
- responderLookupStrategy = new ResponderIdLookupFunction();
+ responderLookupStrategy = new IssuerLookupFunction();
}
/**
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthentication.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthentication.java
index 66e1f3068..8b8fe28ca 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthentication.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthentication.java
@@ -42,7 +42,7 @@ import net.shibboleth.idp.authn.context.MultiFactorAuthenticationContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
import net.shibboleth.idp.authn.principal.AuthenticationResultPrincipal;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
@@ -93,7 +93,7 @@ public class FinalizeMultiFactorAuthentication extends AbstractAuthenticationAct
new ChildContextLookup<>(AuthenticationContext.class));
requesterLookupStrategy = new RelyingPartyIdLookupFunction();
- responderLookupStrategy = new ResponderIdLookupFunction();
+ responderLookupStrategy = new IssuerLookupFunction();
}
/**
@@ -194,7 +194,8 @@ public class FinalizeMultiFactorAuthentication extends AbstractAuthenticationAct
}
authenticationContext.setAuthenticationResult(result);
- final AuthenticationFlowDescriptor flow = Constraint.isNotNull(authenticationContext.getAttemptedFlow(), "Expected an attempted flow");
+ final AuthenticationFlowDescriptor flow =
+ Constraint.isNotNull(authenticationContext.getAttemptedFlow(), "Expected an attempted flow");
final BiConsumer<ProfileRequestContext,Subject> decorator = flow.getSubjectDecorator();
if (decorator != null) {
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunction.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunction.java
index 15fb95f58..5284da8aa 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunction.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunction.java
@@ -115,7 +115,7 @@ public class DiscoveryProfileRequestFunction extends AbstractInitializableCompon
assert rpConfig!=null;
Constraint.isTrue(rpConfig instanceof net.shibboleth.profile.relyingparty.RelyingPartyConfiguration,
"RelyingPartyConfiguration was not of expected subclass");
- final String entityID = ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpConfig).getResponderId(
+ final String entityID = ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpConfig).getIssuer(
input.getSecond());
final StringBuilder builder = new StringBuilder(baseURL);
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
index f3bca26a3..7d17c443d 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
@@ -40,7 +40,7 @@ import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
@@ -81,7 +81,7 @@ public class AttributeRevocationCondition extends AbstractInitializableComponent
/** Constructor. */
public AttributeRevocationCondition() {
- issuerLookupStrategy = new ResponderIdLookupFunction();
+ issuerLookupStrategy = new IssuerLookupFunction();
recipientLookupStrategy = new RelyingPartyIdLookupFunction();
}
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
index 3089e9b12..3b67d9dbf 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
@@ -538,7 +538,7 @@
<key>
<util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.IDENTITY_PROVIDER"/>
</key>
- <ref bean="shibboleth.ResponderIdLookup.Simple" />
+ <ref bean="shibboleth.IssuerLookup.Simple" />
</entry>
</map>
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml
index f1a23f237..c434123e7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml
@@ -179,8 +179,9 @@
</bean>
- <bean id="shibboleth.ResponderIdLookup.Simple"
- class="net.shibboleth.profile.context.navigate.ResponderIdLookupFunction" />
+ <bean id="shibboleth.IssuerLookup.Simple"
+ class="net.shibboleth.profile.context.navigate.IssuerLookupFunction" />
+ <alias alias="shibboleth.ResponderIdLookup.Simple" name="shibboleth.IssuerLookup.Simple" />
<bean id="shibboleth.RelyingPartyIdLookup.Simple"
class="net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
index f98dbd50d..6c9196af3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
@@ -114,7 +114,7 @@
<key>
<util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.IDENTITY_PROVIDER"/>
</key>
- <ref bean="shibboleth.ResponderIdLookup.Simple" />
+ <ref bean="shibboleth.IssuerLookup.Simple" />
</entry>
</map>
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
index e2a28d63c..7bb1f1d98 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
@@ -24,7 +24,7 @@
<!-- Parent beans for defining metadata-driven config lookup strategies. -->
<bean id="RelyingParty.MDDriven" abstract="true" parent="RelyingParty">
- <property name="responderIdLookupStrategy">
+ <property name="issuerLookupStrategy">
<bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="responderId" p:defaultValue="#{getObject('entityID')}" />
</property>
<property name="profileConfigurationsLookupStrategy">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
index 7f311fa6e..3993260a2 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
@@ -39,7 +39,7 @@
<!-- Parent bean for generic RelyingParty overrides that establishes defaults. -->
<bean id="RelyingParty" abstract="true" class="net.shibboleth.profile.relyingparty.RelyingPartyConfiguration"
- p:responderId="#{getObject('entityID')}"
+ p:issuer="#{getObject('entityID')}"
p:detailedErrorsPredicate="%{idp.errors.detailed:false}" />
<!-- Parent bean for RelyingParty overrides based on activation by name(s). -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
index 41b73a599..8aae1a768 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
@@ -180,7 +180,7 @@
<property name="nameIDPolicyPredicate">
<bean class="org.opensaml.saml.common.profile.logic.AffiliationNameIDPolicyPredicate"
p:metadataResolver-ref="shibboleth.MetadataResolver"
- p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:responderIdLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
<property name="objectLookupStrategy">
<bean class="org.opensaml.saml.saml2.profile.impl.AddNameIDToSubjects.NameIDPolicyLookupFunction" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
index cf9e7b2fa..9154abf42 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
@@ -154,7 +154,8 @@
class="net.shibboleth.idp.saml.saml2.profile.impl.AddAuthnRequest" scope="prototype"
p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
p:overwriteExisting="true"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple">
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple
+">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService"
@@ -179,12 +180,9 @@
<property name="handlers">
<list>
<bean class="org.opensaml.saml.common.binding.impl.SAMLOutboundDestinationHandler" scope="prototype"/>
- <bean class="org.opensaml.messaging.handler.impl.FunctionMessageHandler" scope="prototype">
- <property name="functionLookupStrategy">
- <bean class="net.shibboleth.saml.profile.config.navigate.messaging.MessageHandlerLookupFunction" />
- </property>
- </bean>
<bean class="org.opensaml.saml.common.binding.security.impl.EndpointURLSchemeSecurityHandler" scope="prototype"/>
+ <bean class="org.opensaml.messaging.handler.impl.FunctionMessageHandler" scope="prototype"
+ p:function="#{getObject('%{idp.authn.SAML.outboundMessageHandlerFunction:}'.trim())}" />
<bean class="org.opensaml.saml.common.binding.security.impl.SAMLOutboundProtocolMessageSigningHandler" scope="prototype"
p:signErrorResponses="%{idp.errors.signed:true}">
<property name="activationCondition">
@@ -308,11 +306,6 @@
<bean class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype"
p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
p:copyContextStrategy-ref="OutboundSAMLMetadataContextLookup" />
- <bean class="org.opensaml.messaging.handler.impl.FunctionMessageHandler" scope="prototype">
- <property name="functionLookupStrategy">
- <bean class="net.shibboleth.saml.profile.config.navigate.messaging.MessageHandlerLookupFunction" />
- </property>
- </bean>
<bean class="org.opensaml.saml.common.binding.security.impl.ReceivedEndpointSecurityHandler" scope="prototype"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean class="org.opensaml.saml.common.binding.security.impl.MessageReplaySecurityHandler" scope="prototype"
@@ -331,6 +324,8 @@
<bean class="org.opensaml.messaging.handler.impl.CheckExpectedIssuer" scope="prototype"
p:issuerLookupStrategy-ref="InboundEntityIDLookup"
p:expectedIssuerLookupStrategy-ref="OutboundEntityIDLookup" />
+ <bean class="org.opensaml.messaging.handler.impl.FunctionMessageHandler" scope="prototype"
+ p:function="#{getObject('%{idp.authn.SAML.inboundMessageHandlerFunction:}'.trim())}" />
</list>
</property>
</bean>
@@ -454,7 +449,7 @@
p:authenticationContextLookupStrategy-ref="ParentAuthenticiationContextLookup"
p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
p:responderLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple"
- p:requesterLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:requesterLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService"
p:attributeFilter-ref="shibboleth.AttributeFilterService"
p:metadataResolver-ref="shibboleth.MetadataResolver"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
index 8e9b4ad73..0a6906860 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
@@ -61,7 +61,7 @@
<bean id="AddLogoutRequest" class="net.shibboleth.idp.saml.session.impl.AddLogoutRequest" scope="prototype"
p:overwriteExisting="true"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple">
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
index c092dcacc..89bbe5e70 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
@@ -178,7 +178,7 @@
<property name="nameIDPolicyPredicate">
<bean class="org.opensaml.saml.common.profile.logic.AffiliationNameIDPolicyPredicate"
p:metadataResolver-ref="shibboleth.MetadataResolver"
- p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:responderIdLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
<property name="objectLookupStrategy">
<bean class="net.shibboleth.idp.saml.profile.impl.ExtractSubjectFromRequest.SubjectNameLookupFunction" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
index 296b56570..65cd8995f 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
@@ -42,7 +42,7 @@
<bean id="ResolveArtifacts"
class="org.opensaml.saml.saml1.profile.impl.ResolveArtifacts" scope="prototype"
p:artifactMap-ref="shibboleth.SAMLArtifactMap"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple" />
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple" />
<bean id="shibboleth.PreEncodeMessageHandler"
class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
index 9b537ee82..15014d5da 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
@@ -40,7 +40,7 @@
c:_0-ref="shibboleth.OutgoingSOAPBindings" />
<bean id="AddArtifactResponseShell" class="org.opensaml.saml.saml2.profile.impl.AddStatusResponseShell" scope="prototype"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:messageType="#{T(org.opensaml.saml.saml2.core.ArtifactResponse).DEFAULT_ELEMENT_NAME}">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
@@ -51,7 +51,7 @@
<bean id="ResolveArtifact"
class="org.opensaml.saml.saml2.profile.impl.ResolveArtifact" scope="prototype"
p:artifactMap-ref="shibboleth.SAMLArtifactMap"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple" />
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple" />
<bean id="shibboleth.PreEncodeMessageHandler"
class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
index b9418ebe7..6eb67e094 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
@@ -20,7 +20,7 @@
<bean id="AddResponseShell" class="org.opensaml.saml.saml2.profile.impl.AddStatusResponseShell" scope="prototype"
p:overwriteExisting="true"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:messageType="#{T(org.opensaml.saml.saml2.core.Response).DEFAULT_ELEMENT_NAME}">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
index 3349f7637..d76ae38a1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
@@ -78,7 +78,7 @@
<bean id="AddLogoutResponse" class="org.opensaml.saml.saml2.profile.impl.AddStatusResponseShell" scope="prototype"
p:overwriteExisting="true"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:messageType="#{T(org.opensaml.saml.saml2.core.LogoutResponse).DEFAULT_ELEMENT_NAME}">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
index cf461d266..8492edb90 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
@@ -119,7 +119,7 @@
<bean id="AddLogoutResponse" class="org.opensaml.saml.saml2.profile.impl.AddStatusResponseShell" scope="prototype"
p:overwriteExisting="true"
- p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:messageType="#{T(org.opensaml.saml.saml2.core.LogoutResponse).DEFAULT_ELEMENT_NAME}">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
index 8d4dde4e0..d2fb76362 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
@@ -77,7 +77,7 @@
<property name="nameIDPolicyPredicate">
<bean class="org.opensaml.saml.common.profile.logic.AffiliationNameIDPolicyPredicate"
p:metadataResolver-ref="shibboleth.MetadataResolver"
- p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+ p:responderIdLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
<property name="objectLookupStrategy">
<bean class="org.opensaml.saml.saml2.profile.impl.AddNameIDToSubjects.NameIDPolicyLookupFunction" />
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
index 661bc8dd8..fc96cafe0 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
@@ -122,7 +122,7 @@ public class SetupForSAML1C14N extends AbstractProfileAction {
scc.setSubject(sub);
scc.setRequesterId(rpc.getRelyingPartyId());
final RelyingPartyConfiguration rpConfig = (RelyingPartyConfiguration) rpc.getConfiguration();
- scc.setResponderId(rpConfig.getResponderId(profileRequestContext));
+ scc.setResponderId(rpConfig.getIssuer(profileRequestContext));
}
}
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
index f179ac7bb..eb936aa6b 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
@@ -121,7 +121,7 @@ public class SetupForSAML2C14N extends AbstractProfileAction {
scc.setSubject(sub);
scc.setRequesterId(rpc.getRelyingPartyId());
final RelyingPartyConfiguration rpConfig = (RelyingPartyConfiguration) rpc.getConfiguration();
- scc.setResponderId(rpConfig.getResponderId(profileRequestContext));
+ scc.setResponderId(rpConfig.getIssuer(profileRequestContext));
}
}
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
index c4d6b0c0d..8dccd7c80 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
@@ -46,7 +46,7 @@ import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.service.ReloadableService;
@@ -154,7 +154,7 @@ public class FilterAttributes extends AbstractProfileAction {
public FilterAttributes(@Nonnull final ReloadableService<AttributeFilter> filterService) {
attributeFilterService = Constraint.isNotNull(filterService, "Service cannot be null");
- issuerLookupStrategy = new ResponderIdLookupFunction();
+ issuerLookupStrategy = new IssuerLookupFunction();
recipientLookupStrategy = new RelyingPartyIdLookupFunction();
attributeContextLookupStrategy = new ChildContextLookup<>(AttributeContext.class).compose(
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
index 74bc450d6..c91b82826 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
@@ -42,7 +42,7 @@ import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.SpringRequestContext;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.FunctionSupport;
@@ -103,7 +103,7 @@ public final class ResolveAttributes extends AbstractProfileAction {
public ResolveAttributes(@Nonnull final ReloadableService<AttributeResolver> resolverService) {
attributeResolverService = Constraint.isNotNull(resolverService, "AttributeResolver cannot be null");
- issuerLookupStrategy = new ResponderIdLookupFunction();
+ issuerLookupStrategy = new IssuerLookupFunction();
recipientLookupStrategy = new RelyingPartyIdLookupFunction();
principalNameLookupStrategy =
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
index c87e341de..1b94ef45a 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
@@ -161,7 +161,7 @@ public class SelectRelyingPartyConfigurationTest {
final RelyingPartyConfiguration resolvedConfig = (RelyingPartyConfiguration) rpCtx.getConfiguration();
assert resolvedConfig != null;
Assert.assertEquals(resolvedConfig.getId(), config.getId());
- Assert.assertEquals(resolvedConfig.getResponderId(prc), config.getResponderId(prc));
+ Assert.assertEquals(resolvedConfig.getIssuer(prc), config.getIssuer(prc));
Assert.assertEquals(resolvedConfig.getProfileConfigurations(prc), config.getProfileConfigurations(prc));
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java
index 37b6306cc..6deb877f2 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java
@@ -34,7 +34,7 @@ import net.shibboleth.idp.authn.context.navigate.SubjectContextPrincipalLookupFu
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.codec.StringDigester;
@@ -86,7 +86,7 @@ public class WriteFTICKSLog extends AbstractProfileAction {
/** Constructor. */
public WriteFTICKSLog() {
relyingPartyLookupStrategy = new RelyingPartyIdLookupFunction();
- responderLookupStrategy = new ResponderIdLookupFunction();
+ responderLookupStrategy = new IssuerLookupFunction();
usernameLookupStrategy = new SubjectContextPrincipalLookupFunction().compose(
new ChildContextLookup<>(SubjectContext.class));
authenticationMethodLookupStrategy = new AuthnContextAuditExtractor(
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGenerator.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGenerator.java
index e3303ce41..3dc840adc 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGenerator.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGenerator.java
@@ -42,7 +42,7 @@ import net.shibboleth.idp.attribute.XMLObjectAttributeValue;
import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.shared.collection.CollectionSupport;
@@ -79,7 +79,7 @@ public class AttributeSourcedSAML1NameIdentifierGenerator extends AbstractSAML1N
new ChildContextLookup<>(RelyingPartyContext.class));
delimiter = '@';
attributeSourceIds = CollectionSupport.emptyList();
- setDefaultIdPNameQualifierLookupStrategy(new ResponderIdLookupFunction());
+ setDefaultIdPNameQualifierLookupStrategy(new IssuerLookupFunction());
setDefaultSPNameQualifierLookupStrategy(new RelyingPartyIdLookupFunction());
useUnfilteredAttributes = false;
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGenerator.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGenerator.java
index 7fba8068e..8ed792b67 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGenerator.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGenerator.java
@@ -41,7 +41,7 @@ import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.saml.nameid.AbstractSAML2NameIDGenerator;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.shared.collection.CollectionSupport;
@@ -78,7 +78,7 @@ public class AttributeSourcedSAML2NameIDGenerator extends AbstractSAML2NameIDGen
new ChildContextLookup<>(RelyingPartyContext.class));
delimiter = '@';
attributeSourceIds = CollectionSupport.emptyList();
- setDefaultIdPNameQualifierLookupStrategy(new ResponderIdLookupFunction());
+ setDefaultIdPNameQualifierLookupStrategy(new IssuerLookupFunction());
setDefaultSPNameQualifierLookupStrategy(new RelyingPartyIdLookupFunction());
useUnfilteredAttributes = false;
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGenerator.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGenerator.java
index ba53084d3..2fef52cc7 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGenerator.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGenerator.java
@@ -44,7 +44,7 @@ import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.saml.nameid.AbstractSAML2NameIDGenerator;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.ThreadSafeAfterInit;
@@ -90,7 +90,7 @@ public class PersistentSAML2NameIDGenerator extends AbstractSAML2NameIDGenerator
new ChildContextLookup<>(AttributeContext.class).compose(
new ChildContextLookup<>(RelyingPartyContext.class));
attributeSourceIds = CollectionSupport.emptyList();
- setDefaultIdPNameQualifierLookupStrategy(new ResponderIdLookupFunction());
+ setDefaultIdPNameQualifierLookupStrategy(new IssuerLookupFunction());
setDefaultSPNameQualifierLookupStrategy(new RelyingPartyIdLookupFunction());
useUnfilteredAttributes = true;
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML1NameIdentifierGenerator.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML1NameIdentifierGenerator.java
index 2b794d35f..874d69507 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML1NameIdentifierGenerator.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML1NameIdentifierGenerator.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.saml.xml.SAMLConstants;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -57,7 +57,7 @@ public class TransientSAML1NameIdentifierGenerator extends AbstractSAML1NameIden
public TransientSAML1NameIdentifierGenerator() {
setFormat(SAMLConstants.SAML1_NAMEID_TRANSIENT);
subjectContextLookupStrategy = new ChildContextLookup<>(SubjectContext.class);
- setDefaultIdPNameQualifierLookupStrategy(new ResponderIdLookupFunction());
+ setDefaultIdPNameQualifierLookupStrategy(new IssuerLookupFunction());
setDefaultSPNameQualifierLookupStrategy(new RelyingPartyIdLookupFunction());
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML2NameIDGenerator.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML2NameIDGenerator.java
index 40f24c0d6..e6527da00 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML2NameIDGenerator.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransientSAML2NameIDGenerator.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.saml.nameid.AbstractSAML2NameIDGenerator;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -57,7 +57,7 @@ public class TransientSAML2NameIDGenerator extends AbstractSAML2NameIDGenerator
public TransientSAML2NameIDGenerator() {
setFormat(NameID.TRANSIENT);
subjectContextLookupStrategy = new ChildContextLookup<>(SubjectContext.class);
- setDefaultIdPNameQualifierLookupStrategy(new ResponderIdLookupFunction());
+ setDefaultIdPNameQualifierLookupStrategy(new IssuerLookupFunction());
setDefaultSPNameQualifierLookupStrategy(new RelyingPartyIdLookupFunction());
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
index 78a2d6b75..ab0c28db1 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
@@ -41,7 +41,7 @@ import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction;
import net.shibboleth.profile.context.RelyingPartyContext;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.Live;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
@@ -110,7 +110,7 @@ public abstract class BaseAddAttributeStatementToAssertion<T extends SAMLObject>
attributeContextLookupStrategy = new ChildContextLookup<>(AttributeContext.class).compose(
new ChildContextLookup<>(RelyingPartyContext.class));
idGeneratorLookupStrategy = new IdentifierGenerationStrategyLookupFunction();
- issuerLookupStrategy = new ResponderIdLookupFunction();
+ issuerLookupStrategy = new IssuerLookupFunction();
}
/**
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAuthenticationStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAuthenticationStatementToAssertion.java
index f4c9700a2..a698321f0 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAuthenticationStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAuthenticationStatementToAssertion.java
@@ -35,7 +35,7 @@ import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
@@ -84,7 +84,7 @@ public abstract class BaseAddAuthenticationStatementToAssertion extends Abstract
statementInOwnAssertion = false;
idGeneratorLookupStrategy = new IdentifierGenerationStrategyLookupFunction();
- issuerLookupStrategy = new ResponderIdLookupFunction();
+ issuerLookupStrategy = new IssuerLookupFunction();
}
/**
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequest.java
index 457f7bd3b..d3ec02938 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequest.java
@@ -41,7 +41,7 @@ import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -91,7 +91,7 @@ public class ExtractSubjectFromRequest extends AbstractProfileAction {
*/
public ExtractSubjectFromRequest() throws ComponentInitializationException {
requesterLookupStrategy = new RelyingPartyIdLookupFunction();
- responderLookupStrategy = new ResponderIdLookupFunction();
+ responderLookupStrategy = new IssuerLookupFunction();
}
/**
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContext.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContext.java
index 57757179e..aad68496f 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContext.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContext.java
@@ -37,7 +37,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.profile.context.RelyingPartyContext;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.logic.Constraint;
/**
@@ -71,7 +71,7 @@ public class InitializeOutboundMessageContext extends AbstractProfileAction {
/** Constructor. */
public InitializeOutboundMessageContext() {
relyingPartyContextLookupStrategy = new ChildContextLookup<>(RelyingPartyContext.class);
- selfIdentityLookupStrategy = new ResponderIdLookupFunction();
+ selfIdentityLookupStrategy = new IssuerLookupFunction();
}
/**
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateInboundMessageContextWithSAMLSelf.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateInboundMessageContextWithSAMLSelf.java
index 6b929ceb3..281a36914 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateInboundMessageContextWithSAMLSelf.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateInboundMessageContextWithSAMLSelf.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.logic.Constraint;
/**
@@ -54,7 +54,7 @@ public class PopulateInboundMessageContextWithSAMLSelf extends AbstractProfileAc
/** Constructor. */
public PopulateInboundMessageContextWithSAMLSelf() {
- selfIdentityLookupStrategy = new ResponderIdLookupFunction();
+ selfIdentityLookupStrategy = new IssuerLookupFunction();
}
/**
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/UpdateSAMLSelfEntityContext.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/UpdateSAMLSelfEntityContext.java
index a752c1c76..1631746a9 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/UpdateSAMLSelfEntityContext.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/UpdateSAMLSelfEntityContext.java
@@ -29,7 +29,7 @@ import org.opensaml.saml.common.messaging.context.SAMLSelfEntityContext;
import org.slf4j.Logger;
import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
@@ -57,7 +57,7 @@ public class UpdateSAMLSelfEntityContext extends AbstractProfileAction {
/** Constructor. */
public UpdateSAMLSelfEntityContext() {
- selfIdentityLookupStrategy = new ResponderIdLookupFunction();
+ selfIdentityLookupStrategy = new IssuerLookupFunction();
}
/**
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
index 30e038b31..19cac8d48 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
@@ -57,7 +57,7 @@ import net.shibboleth.shared.security.IdentifierGenerationStrategy;
*
* <p>A constructed {@link Assertion} will have its ID, IssueInstant, Issuer, and Version properties set.
* The issuer is based on
- * {@link net.shibboleth.profile.relyingparty.RelyingPartyConfiguration#getResponderId(ProfileRequestContext)}.</p>
+ * {@link net.shibboleth.profile.relyingparty.RelyingPartyConfiguration#getIssuer(ProfileRequestContext)}.</p>
*
* <p>The {@link AuthenticationStatement} will have its authentication instant set, based on
* {@link net.shibboleth.idp.authn.AuthenticationResult#getAuthenticationInstant()}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
index c1ed67416..462641109 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
@@ -66,7 +66,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
*
* <p>A constructed {@link Assertion} will have its ID, IssueInstant, Issuer, and Version properties set.
* The issuer is based on
- * {@link net.shibboleth.profile.relyingparty.RelyingPartyConfiguration#getResponderId(ProfileRequestContext)}.</p>
+ * {@link net.shibboleth.profile.relyingparty.RelyingPartyConfiguration#getIssuer(ProfileRequestContext)}.</p>
*
* <p>The {@link AuthnStatement} will have its authentication instant set, based on
* {@link net.shibboleth.idp.authn.AuthenticationResult#getAuthenticationInstant()}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
index f7eb943bb..d069947f8 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
@@ -54,7 +54,7 @@ import net.shibboleth.idp.session.context.LogoutContext;
import net.shibboleth.idp.session.context.SessionContext;
import net.shibboleth.idp.session.criterion.SPSessionCriterion;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.saml.saml2.profile.config.navigate.QualifiedNameIDFormatsLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -154,7 +154,7 @@ public class ProcessLogoutRequest extends AbstractProfileAction {
qualifiedNameIDFormats = Collections.emptySet();
- setAssertingPartyLookupStrategy(new ResponderIdLookupFunction());
+ setAssertingPartyLookupStrategy(new IssuerLookupFunction());
setRelyingPartyLookupStrategy(new RelyingPartyIdLookupFunction());
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
index 8d17b9e99..2bcc99d81 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
@@ -188,7 +188,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
Assert.assertEquals(outputNameId.getValue(), NAME_1);
Assert.assertEquals(outputNameId.getFormat(), NameIdentifier.X509_SUBJECT);
Assert.assertEquals(outputNameId.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getIssuer(prc));
}
@Test public void testScopeValued() throws Exception {
@@ -205,6 +205,6 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
Assert.assertEquals(outputNameId.getValue(), NAME_1 + '@' + QUALIFIER);
Assert.assertEquals(outputNameId.getFormat(), NameIdentifier.X509_SUBJECT);
Assert.assertEquals(outputNameId.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getIssuer(prc));
}
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
index 3c3a1d46a..7b620035f 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
@@ -187,7 +187,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
Assert.assertEquals(outputNameId.getValue(), NAME_1);
Assert.assertEquals(outputNameId.getFormat(), NameID.X509_SUBJECT);
Assert.assertEquals(outputNameId.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getIssuer(prc));
}
@Test public void testScopeValued() throws Exception {
@@ -204,7 +204,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
Assert.assertEquals(outputNameId.getValue(), NAME_1 + '@' + QUALIFIER);
Assert.assertEquals(outputNameId.getFormat(), NameID.X509_SUBJECT);
Assert.assertEquals(outputNameId.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) prc.getSubcontext(RelyingPartyContext.class).getConfiguration()).getIssuer(prc));
Assert.assertEquals(outputNameId.getSPNameQualifier(),
prc.getSubcontext(RelyingPartyContext.class).getRelyingPartyId());
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
index ccfaddb7b..42c535f42 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
@@ -121,7 +121,7 @@ public class CryptoTransientSAML1NameIdentifierGeneratorTest extends OpenSAMLIni
Assert.assertNotNull(name);
Assert.assertEquals(name.getFormat(), generator.getFormat());
Assert.assertEquals(name.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getIssuer(prc));
final String val = name.getValue();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
index c6ffe3128..42005b666 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
@@ -122,7 +122,7 @@ public class CryptoTransientSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTes
Assert.assertNotNull(name);
Assert.assertEquals(name.getFormat(), generator.getFormat());
Assert.assertEquals(name.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getIssuer(prc));
final String val = name.getValue();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML1NameIdentifierGeneratorTest.java
index a44ce44b5..bb132c64d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML1NameIdentifierGeneratorTest.java
@@ -96,7 +96,7 @@ public class StoredTransientSAML1NameIdentifierGeneratorTest extends OpenSAMLIni
Assert.assertNotNull(name);
Assert.assertEquals(name.getFormat(), generator.getFormat());
Assert.assertEquals(name.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getIssuer(prc));
String val = name.getValue();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML2NameIDGeneratorTest.java
index 53d762f03..76417a8bd 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredTransientSAML2NameIDGeneratorTest.java
@@ -97,7 +97,7 @@ public class StoredTransientSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTes
Assert.assertNotNull(name);
Assert.assertEquals(name.getFormat(), generator.getFormat());
Assert.assertEquals(name.getNameQualifier(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getResponderId(prc));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) rpc.getConfiguration()).getIssuer(prc));
Assert.assertEquals(name.getSPNameQualifier(), rpc.getRelyingPartyId());
String val = name.getValue();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequestTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequestTest.java
index e091c8ae7..8637bddf0 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequestTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/ExtractSubjectFromRequestTest.java
@@ -26,7 +26,7 @@ import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
import net.shibboleth.idp.saml.profile.impl.ExtractSubjectFromRequest.SubjectNameLookupFunction;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.shared.component.ComponentInitializationException;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -60,7 +60,7 @@ public class ExtractSubjectFromRequestTest extends XMLObjectBaseTestCase {
final DefaultNameIDPolicyPredicate nameIDPolicyPredicate = new DefaultNameIDPolicyPredicate();
nameIDPolicyPredicate.setRequesterIdLookupStrategy(new RelyingPartyIdLookupFunction());
- nameIDPolicyPredicate.setResponderIdLookupStrategy(new ResponderIdLookupFunction());
+ nameIDPolicyPredicate.setResponderIdLookupStrategy(new IssuerLookupFunction());
nameIDPolicyPredicate.setObjectLookupStrategy(new SubjectNameLookupFunction());
nameIDPolicyPredicate.initialize();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionSupportTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionSupportTest.java
index 5f2f716cd..4e76b4515 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionSupportTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionSupportTest.java
@@ -68,12 +68,12 @@ public class SAML1ActionSupportTest extends OpenSAMLInitBaseTestCase {
Assert.assertEquals(response.getAssertions().size(), 0, "Expected zarro assertions before insert");
final Assertion assertion = SAML1ActionSupport.addAssertionToResponse(action, response,
relyingPartyCtx.getProfileConfig().getSecurityConfiguration(profileRequestContext).getIdGenerator(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getResponderId(profileRequestContext));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getIssuer(profileRequestContext));
Assert.assertEquals(response.getAssertions().size(), 1, "Expected but one assertion after insert");
Assert.assertTrue(response.getAssertions().contains(assertion), "Inserted assertion should be there");
final Assertion second = SAML1ActionSupport.addAssertionToResponse(action, response,
relyingPartyCtx.getProfileConfig().getSecurityConfiguration(profileRequestContext).getIdGenerator(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getResponderId(profileRequestContext));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getIssuer(profileRequestContext));
Assert.assertEquals(response.getAssertions().size(), 2, "Expected two assertions after two inserts");
Assert.assertTrue(response.getAssertions().contains(assertion), "Inserted assertion should be there");
Assert.assertNotSame(second, assertion, "Two separate assertions should have been added");
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
index f12b530ed..0a8073ee9 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
@@ -37,7 +37,7 @@ import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
import net.shibboleth.idp.saml.saml2.profile.config.impl.BrowserSSOProfileConfiguration;
import net.shibboleth.profile.context.RelyingPartyContext;
-import net.shibboleth.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
import net.shibboleth.profile.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -105,7 +105,7 @@ public class AddAuthnRequestTest extends OpenSAMLInitBaseTestCase {
new ChildContextLookup<>(AuthenticationContext.class).compose(
new WebflowRequestContextProfileRequestContextLookup())));
action.setAuthenticationContextLookupStrategy(new ParentContextLookup<>(AuthenticationContext.class));
- action.setIssuerLookupStrategy(new ResponderIdLookupFunction());
+ action.setIssuerLookupStrategy(new IssuerLookupFunction());
action.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionSupportTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionSupportTest.java
index 5d82f55e3..7ff43603e 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionSupportTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionSupportTest.java
@@ -68,12 +68,12 @@ public class SAML2ActionSupportTest extends OpenSAMLInitBaseTestCase {
Assert.assertEquals(response.getAssertions().size(), 0, "Expected zarro assertions before insert");
Assertion assertion = SAML2ActionSupport.addAssertionToResponse(action, response,
relyingPartyCtx.getProfileConfig().getSecurityConfiguration(profileRequestContext).getIdGenerator(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getResponderId(profileRequestContext));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getIssuer(profileRequestContext));
Assert.assertEquals(response.getAssertions().size(), 1, "Expected but one assertion after insert");
Assert.assertTrue(response.getAssertions().contains(assertion), "Inserted assertion should be there");
Assertion second = SAML2ActionSupport.addAssertionToResponse(action, response,
relyingPartyCtx.getProfileConfig().getSecurityConfiguration(profileRequestContext).getIdGenerator(),
- ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getResponderId(profileRequestContext));
+ ((net.shibboleth.profile.relyingparty.RelyingPartyConfiguration) relyingPartyCtx.getConfiguration()).getIssuer(profileRequestContext));
Assert.assertEquals(response.getAssertions().size(), 2, "Expected two assertions after two inserts");
Assert.assertTrue(response.getAssertions().contains(assertion), "Inserted assertion should be there");
Assert.assertNotSame(second, assertion, "Two separate assertions should have been added");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list