[java-identity-provider] branch maint-4 updated: IDP-2054 - Add per-SP salt for computedId connector

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch maint-4
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=784f8e893ce0c934513a65ef0cfbac9af0411835

The following commit(s) were added to refs/heads/maint-4 by this push:
     new 784f8e893 IDP-2054 - Add per-SP salt for computedId connector
784f8e893 is described below

commit 784f8e893ce0c934513a65ef0cfbac9af0411835
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Dec 14 13:53:21 2022 -0500

    IDP-2054 - Add per-SP salt for computedId connector
    
    https://shibboleth.atlassian.net/browse/IDP-2054
    
    Fix data connector parser by injecting supplier bean.
---
 idp-attribute-resolver-spring/pom.xml                                | 5 +++++
 .../resolver/spring/dc/impl/ComputedIdDataConnectorParser.java       | 5 +++++
 .../net/shibboleth/idp/attribute/resolver/spring/customBean.xml      | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/idp-attribute-resolver-spring/pom.xml b/idp-attribute-resolver-spring/pom.xml
index d2e69e3f0..0d4534ad1 100644
--- a/idp-attribute-resolver-spring/pom.xml
+++ b/idp-attribute-resolver-spring/pom.xml
@@ -140,6 +140,11 @@
         </dependency>
 
         <!-- Provided Dependencies -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Runtime Dependencies -->
         <dependency>
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
index f45cc256a..1cee408dc 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
@@ -22,6 +22,7 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.idp.attribute.impl.ComputedPairwiseIdStore;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +40,9 @@ public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser
     @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE, 
             "ComputedId");
 
+    /** ID of system bean used to access servlet request. */
+    @Nonnull @NotEmpty public static final String SERVLET_SUPPLIER_ID = "shibboleth.HttpServletRequestSupplier";
+    
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(ComputedIdDataConnectorParser.class);
     
@@ -79,6 +83,7 @@ public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser
         
         if (config.hasAttributeNS(null, "saltLookupStrategyRef")) {
             builder.addPropertyReference("saltLookupStrategy", config.getAttributeNS(null, "saltLookupStrategyRef"));
+            builder.addPropertyReference("httpServletRequestSupplier", SERVLET_SUPPLIER_ID);
         }
 
         final String salt;
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
index ed7728213..3aa2bc61c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
@@ -69,4 +69,7 @@
         </constructor-arg>
     </bean>
 
+    <bean id="shibboleth.HttpServletRequestSupplier"
+        class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestSupplier" />
+
 </beans>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.