[java-identity-provider] 02/02: IDP-1764: SecurityConfiguration -LookupFunctions not doing null check...

[Brent Putman]

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

putmanb pushed a commit to branch main
in repository java-identity-provider.

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

commit 8ae8f3fa6f2586ff528dab3c6aaa2c340cc3e172
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Tue Mar 2 22:20:53 2021 -0500

    IDP-1764: SecurityConfiguration -LookupFunctions not doing null check...
    
    SecurityConfiguration -LookupFunctions not doing null check at RP level.
---
 .../config/navigate/ClientTLSValidationConfigurationLookupFunction.java | 2 +-
 .../profile/config/navigate/DecryptionConfigurationLookupFunction.java  | 2 +-
 .../profile/config/navigate/EncryptionConfigurationLookupFunction.java  | 2 +-
 .../config/navigate/SignatureValidationConfigurationLookupFunction.java | 2 +-
 .../messaging/HttpClientSecurityConfigurationLookupFunction.java        | 2 +-
 .../navigate/messaging/SignatureSigningConfigurationLookupFunction.java | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
index d8a298896..53c22f8e5 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
@@ -63,7 +63,7 @@ public class ClientTLSValidationConfigurationLookupFunction
             final ProfileConfiguration pc = rpc.getProfileConfig();
             if (pc != null) {
                 final SecurityConfiguration sc = pc.getSecurityConfiguration(input);
-                if (sc != null) {
+                if (sc != null && sc.getClientTLSValidationConfiguration() != null) {
                     configs.add(sc.getClientTLSValidationConfiguration());
                 }
             }
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
index bd11bc1bd..89fac7104 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
@@ -63,7 +63,7 @@ public class DecryptionConfigurationLookupFunction
             final ProfileConfiguration pc = rpc.getProfileConfig();
             if (pc != null) {
                 final SecurityConfiguration sc = pc.getSecurityConfiguration(input);
-                if (sc != null) {
+                if (sc != null && sc.getDecryptionConfiguration() != null) {
                     configs.add(sc.getDecryptionConfiguration());
                 }
             }
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
index ca6af0fab..4333735b0 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
@@ -63,7 +63,7 @@ public class EncryptionConfigurationLookupFunction
             final ProfileConfiguration pc = rpc.getProfileConfig();
             if (pc != null) {
                 final SecurityConfiguration sc = pc.getSecurityConfiguration(input);
-                if (sc != null) {
+                if (sc != null && sc.getEncryptionConfiguration() != null) {
                     configs.add(sc.getEncryptionConfiguration());
                 }
             }
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
index a54bb1987..e5e3778d5 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
@@ -63,7 +63,7 @@ public class SignatureValidationConfigurationLookupFunction
             final ProfileConfiguration pc = rpc.getProfileConfig();
             if (pc != null) {
                 final SecurityConfiguration sc = pc.getSecurityConfiguration(input);
-                if (sc != null) {
+                if (sc != null && sc.getSignatureValidationConfiguration() != null) {
                     configs.add(sc.getSignatureValidationConfiguration());
                 }
             }
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
index 10ed156ea..e80f1e8f4 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
@@ -65,7 +65,7 @@ public class HttpClientSecurityConfigurationLookupFunction
             if (pc != null) {
                 final SecurityConfiguration sc =
                         pc.getSecurityConfiguration(this.getProfileRequestContextLookupStrategy().apply(input));
-                if (sc != null) {
+                if (sc != null && sc.getHttpClientSecurityConfiguration() != null) {
                     configs.add(sc.getHttpClientSecurityConfiguration());
                 }
             }
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
index 447274484..fd9a177f5 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
@@ -65,7 +65,7 @@ public class SignatureSigningConfigurationLookupFunction
             if (pc != null) {
                 final SecurityConfiguration sc =
                         pc.getSecurityConfiguration(this.getProfileRequestContextLookupStrategy().apply(input));
-                if (sc != null) {
+                if (sc != null && sc.getSignatureSigningConfiguration() != null) {
                     configs.add(sc.getSignatureSigningConfiguration());
                 }
             }

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