[java-identity-provider] branch main updated: 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=48e48aa4c2e2cf9cf2c0a611f90b2b997af37885

The following commit(s) were added to refs/heads/main by this push:
       new  48e48aa4c IDP-1764: SecurityConfiguration -LookupFunctions not doing null check...
48e48aa4c is described below

commit 48e48aa4c2e2cf9cf2c0a611f90b2b997af37885
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Tue Mar 2 22:58:57 2021 -0500

    IDP-1764: SecurityConfiguration -LookupFunctions not doing null check...
    
    Missed a couple of function impls, due to similar names but different
    packages.
---
 .../config/navigate/SignatureSigningConfigurationLookupFunction.java    | 2 +-
 .../messaging/SignatureValidationConfigurationLookupFunction.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
index 78dce1981..fde97bb0b 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
@@ -63,7 +63,7 @@ public class SignatureSigningConfigurationLookupFunction
             final ProfileConfiguration pc = rpc.getProfileConfig();
             if (pc != null) {
                 final SecurityConfiguration sc = pc.getSecurityConfiguration(input);
-                if (sc != null) {
+                if (sc != null && sc.getSignatureSigningConfiguration() != null) {
                     configs.add(sc.getSignatureSigningConfiguration());
                 }
             }
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
index c5c1fa816..4a35980ce 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
@@ -65,7 +65,7 @@ public class SignatureValidationConfigurationLookupFunction
             if (pc != null) {
                 final SecurityConfiguration sc =
                         pc.getSecurityConfiguration(this.getProfileRequestContextLookupStrategy().apply(input));
-                if (sc != null) {
+                if (sc != null && sc.getSignatureValidationConfiguration() != null) {
                     configs.add(sc.getSignatureValidationConfiguration());
                 }
             }

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