[java-identity-provider COMMIT] in /trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate: C...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Dec 10 17:03:56 2014
New Revision: 7066

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7066&view=rev
Log:
IDP-534: Security-related *ConfigurationLookupFunctions are returning configs in the wrong order

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java?rev=7066&r1=7065&r2=7066&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java Wed Dec 10 17:03:56 2014
@@ -59,7 +59,13 @@
         
         final List<ClientTLSValidationConfiguration> configs = Lists.newArrayList();
         
-        configs.add(ConfigurationService.get(ClientTLSValidationConfiguration.class));
+        final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
+        if (rpc != null) {
+            final ProfileConfiguration pc = rpc.getProfileConfig();
+            if (pc != null && pc.getSecurityConfiguration() != null) {
+                configs.add(pc.getSecurityConfiguration().getClientTLSValidationConfiguration());
+            }
+        }
         
         // Check for a per-profile default (relying party independent) config.
         if (input != null && rpResolver != null) {
@@ -70,13 +76,7 @@
             }
         }
 
-        final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
-        if (rpc != null) {
-            final ProfileConfiguration pc = rpc.getProfileConfig();
-            if (pc != null && pc.getSecurityConfiguration() != null) {
-                configs.add(pc.getSecurityConfiguration().getClientTLSValidationConfiguration());
-            }
-        }
+        configs.add(ConfigurationService.get(ClientTLSValidationConfiguration.class));
         
         return configs;
     }

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java?rev=7066&r1=7065&r2=7066&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java Wed Dec 10 17:03:56 2014
@@ -59,7 +59,13 @@
 
         final List<DecryptionConfiguration> configs = Lists.newArrayList();
         
-        configs.add(SecurityConfigurationSupport.getGlobalDecryptionConfiguration());
+        final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
+        if (rpc != null) {
+            final ProfileConfiguration pc = rpc.getProfileConfig();
+            if (pc != null && pc.getSecurityConfiguration() != null) {
+                configs.add(pc.getSecurityConfiguration().getDecryptionConfiguration());
+            }
+        }
         
         // Check for a per-profile default (relying party independent) config.
         if (input != null && rpResolver != null) {
@@ -70,13 +76,7 @@
             }
         }
 
-        final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
-        if (rpc != null) {
-            final ProfileConfiguration pc = rpc.getProfileConfig();
-            if (pc != null && pc.getSecurityConfiguration() != null) {
-                configs.add(pc.getSecurityConfiguration().getDecryptionConfiguration());
-            }
-        }
+        configs.add(SecurityConfigurationSupport.getGlobalDecryptionConfiguration());
         
         return configs;
     }

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

[... 107 lines stripped ...]