[java-identity-provider] branch master updated: OSJ-238: Internal ParserPool built by Decrypter

[Brent Putman]

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

putmanb 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=86fe2762ab3400a58e01a4dd84d2357eddf589d5

The following commit(s) were added to refs/heads/master by this push:
       new  86fe276   OSJ-238: Internal ParserPool built by Decrypter
86fe276 is described below

commit 86fe2762ab3400a58e01a4dd84d2357eddf589d5
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Mon Sep 10 21:08:30 2018 -0400

    OSJ-238: Internal ParserPool built by Decrypter
    
    Enhance OpenSAMLConfigBean to accept a new 'decryptionParserPool'
    property.
---
 idp-core/pom.xml                                   |  4 ++++
 .../shibboleth/idp/spring/OpenSAMLConfigBean.java  | 28 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/idp-core/pom.xml b/idp-core/pom.xml
index 7f020df..3647ba9 100644
--- a/idp-core/pom.xml
+++ b/idp-core/pom.xml
@@ -74,6 +74,10 @@
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-security-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-xmlsec-api</artifactId>
+        </dependency>
         
         <!-- Provided Dependencies -->
 
diff --git a/idp-core/src/main/java/net/shibboleth/idp/spring/OpenSAMLConfigBean.java b/idp-core/src/main/java/net/shibboleth/idp/spring/OpenSAMLConfigBean.java
index 03fe326..835fd9d 100644
--- a/idp-core/src/main/java/net/shibboleth/idp/spring/OpenSAMLConfigBean.java
+++ b/idp-core/src/main/java/net/shibboleth/idp/spring/OpenSAMLConfigBean.java
@@ -25,6 +25,7 @@ import org.opensaml.core.config.ConfigurationService;
 import org.opensaml.core.config.InitializationException;
 import org.opensaml.core.config.InitializationService;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistry;
+import org.opensaml.xmlsec.config.DecryptionParserPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,6 +49,9 @@ public class OpenSAMLConfigBean extends AbstractInitializableComponent {
     /** Optional {@link ParserPool} to configure. */
     @Nullable private ParserPool parserPool;
     
+    /** Optional decryption {@link ParserPool} to configure. */
+    @Nullable private ParserPool decryptionParserPool;
+    
     /** Optional {@link MetricRegistry} to configure. */
     @Nullable private MetricRegistry metricRegistry;
     
@@ -72,6 +76,26 @@ public class OpenSAMLConfigBean extends AbstractInitializableComponent {
     }
     
     /**
+     * Get the global decryption {@link ParserPool} to configure.
+     * 
+     * @return the decryption parser pool
+     */
+    @Nullable public ParserPool getDecryptionParserPool() {
+        return decryptionParserPool;
+    }
+
+    /**
+     * Set the global decryption {@link ParserPool} to configure.
+     * 
+     * @param newParserPool the decryption parser pool to set
+     */
+    public void setDecryptionParserPool(@Nullable final ParserPool newParserPool) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        
+        decryptionParserPool = newParserPool;
+    }
+    
+    /**
      * Get the global {@link MetricRegistry} to configure.
      * 
      * @return the metric registry to use
@@ -120,6 +144,10 @@ public class OpenSAMLConfigBean extends AbstractInitializableComponent {
         if (parserPool != null) {
             registry.setParserPool(parserPool);
         }
+        
+        if (decryptionParserPool != null) {
+            ConfigurationService.register(DecryptionParserPool.class, new DecryptionParserPool(decryptionParserPool));
+        }
     }
     
 }
\ No newline at end of file

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