[java-identity-provider] branch master updated: Remove HttpServletRequest property from profile configurations.
Scott Cantor
cantor.2 at osu.edu
Fri Mar 29 11:02:39 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=87d0b847e432e637c1efc963ba555d7efae419ad
The following commit(s) were added to refs/heads/master by this push:
new 87d0b84 Remove HttpServletRequest property from profile configurations.
87d0b84 is described below
commit 87d0b847e432e637c1efc963ba555d7efae419ad
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Mar 29 11:02:34 2019 -0400
Remove HttpServletRequest property from profile configurations.
---
.../resources/system/conf/general-admin-system.xml | 2 --
.../system/conf/relying-party-mddriven.xml | 2 +-
.../resources/system/conf/relying-party-system.xml | 27 ++++++++++------------
.../config/AbstractProfileConfiguration.java | 17 --------------
4 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/idp-conf/src/main/resources/system/conf/general-admin-system.xml b/idp-conf/src/main/resources/system/conf/general-admin-system.xml
index efb8295..14e973a 100644
--- a/idp-conf/src/main/resources/system/conf/general-admin-system.xml
+++ b/idp-conf/src/main/resources/system/conf/general-admin-system.xml
@@ -20,12 +20,10 @@
<bean id="shibboleth.AdminFlow" abstract="true"
class="net.shibboleth.idp.admin.BasicAdministrativeFlowDescriptor"
- p:servletRequest-ref="shibboleth.HttpServletRequest"
p:nonBrowserSupported="false" />
<bean id="shibboleth.OneTimeAdminFlow" abstract="true"
class="net.shibboleth.idp.admin.OneTimeAdministrativeFlowDescriptor"
- p:servletRequest-ref="shibboleth.HttpServletRequest"
p:nonBrowserSupported="false" />
<!-- Function for returning custom access control policies for access to metrics. -->
diff --git a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
index e289c56..f1377c0 100644
--- a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
+++ b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
@@ -89,7 +89,7 @@
<!-- Wiring lookup strategies into the actual profile configurations of various types. -->
- <bean id="AbstractMDDrivenProfile" parent="AbstractProfileConfig" abstract="true">
+ <bean id="AbstractMDDrivenProfile" abstract="true">
<property name="securityConfigurationLookupStrategy">
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="securityConfiguration"
p:propertyType="#{T(net.shibboleth.idp.profile.config.SecurityConfiguration)}" />
diff --git a/idp-conf/src/main/resources/system/conf/relying-party-system.xml b/idp-conf/src/main/resources/system/conf/relying-party-system.xml
index 5c2e186..6695ec7 100644
--- a/idp-conf/src/main/resources/system/conf/relying-party-system.xml
+++ b/idp-conf/src/main/resources/system/conf/relying-party-system.xml
@@ -46,9 +46,6 @@
<bean id="TagCandidate" abstract="true"
class="org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate" />
- <bean id="AbstractProfileConfig" abstract="true"
- p:servletRequest-ref="shibboleth.HttpServletRequest" />
-
<!-- Import parent beans for metadata-driven configuration approach. -->
<import resource="relying-party-mddriven.xml" />
@@ -59,20 +56,20 @@
a suite of metadata-driven lookup strategies pre-injected.
-->
- <bean id="Shibboleth.SSO" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="Shibboleth.SSO" lazy-init="true"
class="net.shibboleth.idp.saml.saml1.profile.config.BrowserSSOProfileConfiguration"
p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
p:inboundInterceptorFlows="security-policy/shibboleth-sso" />
- <bean id="SAML1.AttributeQuery" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="SAML1.AttributeQuery" lazy-init="true"
class="net.shibboleth.idp.saml.saml1.profile.config.AttributeQueryProfileConfiguration"
p:inboundInterceptorFlows="security-policy/saml-soap" />
- <bean id="SAML1.ArtifactResolution" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="SAML1.ArtifactResolution" lazy-init="true"
class="net.shibboleth.idp.saml.saml1.profile.config.ArtifactResolutionProfileConfiguration"
p:inboundInterceptorFlows="security-policy/saml-soap" />
- <bean id="SAML2.SSO" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="SAML2.SSO" lazy-init="true"
class="net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration"
p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
p:inboundInterceptorFlows="security-policy/saml2-sso"
@@ -81,40 +78,40 @@
<util:constant id="SAML2.SSO.FEATURE_AUTHNCONTEXT"
static-field="net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration.FEATURE_AUTHNCONTEXT"/>
- <bean id="SAML2.ECP" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="SAML2.ECP" lazy-init="true"
class="net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration"
p:inboundInterceptorFlows="security-policy/saml2-ecp"
p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
- <bean id="SAML2.Logout" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="SAML2.Logout" lazy-init="true"
class="net.shibboleth.idp.saml.saml2.profile.config.SingleLogoutProfileConfiguration"
p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
p:inboundInterceptorFlows="security-policy/saml2-slo"
p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
- <bean id="SAML2.AttributeQuery" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="SAML2.AttributeQuery" lazy-init="true"
class="net.shibboleth.idp.saml.saml2.profile.config.AttributeQueryProfileConfiguration"
p:inboundInterceptorFlows="security-policy/saml-soap"
p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
- <bean id="SAML2.ArtifactResolution" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="SAML2.ArtifactResolution" lazy-init="true"
class="net.shibboleth.idp.saml.saml2.profile.config.ArtifactResolutionProfileConfiguration"
p:inboundInterceptorFlows="security-policy/saml-soap"
p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
- <bean id="Liberty.SSOS" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="Liberty.SSOS" lazy-init="true"
class="net.shibboleth.idp.saml.idwsf.profile.config.SSOSProfileConfiguration"
p:inboundInterceptorFlows="security-policy/saml2-idwsf-ssos"
p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
- <bean id="CAS.LoginConfiguration" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="CAS.LoginConfiguration" lazy-init="true"
class="net.shibboleth.idp.cas.config.impl.LoginConfiguration" />
- <bean id="CAS.ProxyConfiguration" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="CAS.ProxyConfiguration" lazy-init="true"
class="net.shibboleth.idp.cas.config.impl.ProxyConfiguration" />
<!-- Ticket validity period applies to proxy-granting tickets created upon successful proxy callback validation -->
- <bean id="CAS.ValidateConfiguration" parent="AbstractProfileConfig" lazy-init="true"
+ <bean id="CAS.ValidateConfiguration" lazy-init="true"
class="net.shibboleth.idp.cas.config.impl.ValidateConfiguration"
p:serviceComparator="#{getObject('shibboleth.CASServiceComparator') ?: getObject('shibboleth.DefaultCASServiceComparator')}" />
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
index 097cd17..316c1a9 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
@@ -25,7 +25,6 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.ServletRequest;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -51,9 +50,6 @@ public abstract class AbstractProfileConfiguration extends AbstractIdentifiableI
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(AbstractProfileConfiguration.class);
- /** Access to servlet request. */
- @Nullable private ServletRequest servletRequest;
-
/** Lookup function to supply {@link #inboundFlows} property. */
@Nonnull private Function<ProfileRequestContext,List<String>> inboundFlowsLookupStrategy;
@@ -79,19 +75,6 @@ public abstract class AbstractProfileConfiguration extends AbstractIdentifiableI
disallowedFeaturesLookupStrategy = FunctionSupport.constant(DEFAULT_DISALLOWED_FEATURES);
}
- /**
- * Set the {@link ServletRequest} from which to obtain a reference to the current {@link ProfileRequestContext}.
- *
- * <p>Generally this would be expected to be a proxy to the actual object.</p>
- *
- * @param request servlet request
- *
- * @since 3.3.0
- */
- public void setServletRequest(@Nullable final ServletRequest request) {
- servletRequest = request;
- }
-
/** {@inheritDoc} */
@Nullable public SecurityConfiguration getSecurityConfiguration(
@Nullable final ProfileRequestContext profileRequestContext) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list