[java-identity-provider COMMIT] /trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfig...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Aug 15 20:35:11 2014
New Revision: 6430

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6430&view=rev
Log:
Initial refactoring for:
OSJ-84: Refactor security MessageHandlers to support TrustEngine from SignatureValidationParameters 
OSJ-85: Support configuration and resolution of client cert TLS trust eval via new security components 
IdP changes still pending. 

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java?rev=6430&r1=6429&r2=6430&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java Fri Aug 15 20:35:11 2014
@@ -28,6 +28,7 @@
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 import net.shibboleth.utilities.java.support.security.RandomIdentifierGenerationStrategy;
 
+import org.opensaml.security.x509.X509CredentialValidationConfiguration;
 import org.opensaml.xmlsec.DecryptionConfiguration;
 import org.opensaml.xmlsec.EncryptionConfiguration;
 import org.opensaml.xmlsec.SignatureSigningConfiguration;
@@ -53,6 +54,9 @@
 
     /** Configuration used when encrypting protocol message information. */
     @Nullable private EncryptionConfiguration encryptConfig;
+    
+    /** Configuration used when validating X509Credentials. */
+    @Nullable private X509CredentialValidationConfiguration x509Config;
 
     /**
      * Constructor.
@@ -166,4 +170,22 @@
     public void setEncryptionConfiguration(@Nullable final EncryptionConfiguration config) {
         encryptConfig = config;
     }
+
+    /**
+     * Get the configuration used when validating X509Credentials.
+     * 
+     * @return configuration used when validating X509Credentials, or null
+     */
+    public X509CredentialValidationConfiguration getX509Config() {
+        return x509Config;
+    }
+
+    /**
+     * Set the configuration used when validating X509Credentials.
+     * 
+     * @param config configuration used when validating X509Credentials, or null
+     */
+    public void setX509Config(X509CredentialValidationConfiguration config) {
+        x509Config = config;
+    }
 }