Merge pull request #2187 from rsearls/ELY-2797-NullPointerException-r…

…equest_parameter_supported [ELY-2797] check for null Boolean and return boolean
wildfly-security · Aug 28, 2024 · d78b28d · d78b28d
2 parents 1eb5d16 + 882fae7
commit d78b28d
Show file tree

Hide file tree

Showing 2 changed files with 390 additions and 12 deletions.
diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcProviderMetadata.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcProviderMetadata.java
@@ -329,8 +329,8 @@ public void setClaimTypesSupported(List<String> claimTypesSupported) {
         this.claimTypesSupported = claimTypesSupported;
     }
 
-    public Boolean getClaimsParameterSupported() {
-        return claimsParameterSupported;
+    public boolean getClaimsParameterSupported() {
+        return claimsParameterSupported == null ? false : claimsParameterSupported;
     }
 
     public void setClaimsParameterSupported(Boolean claimsParameterSupported) {
@@ -345,16 +345,16 @@ public void setScopesSupported(List<String> scopesSupported) {
         this.scopesSupported = scopesSupported;
     }
 
-    public Boolean getRequestParameterSupported() {
-        return requestParameterSupported;
+    public boolean getRequestParameterSupported() {
+        return requestParameterSupported == null ? false : requestParameterSupported;
     }
 
     public void setRequestParameterSupported(Boolean requestParameterSupported) {
         this.requestParameterSupported = requestParameterSupported;
     }
 
-    public Boolean getRequestUriParameterSupported() {
-        return requestUriParameterSupported;
+    public boolean getRequestUriParameterSupported() {
+        return requestUriParameterSupported == null ? false : requestUriParameterSupported;
     }
 
     public void setRequestUriParameterSupported(Boolean requestUriParameterSupported) {
@@ -393,12 +393,12 @@ public void setRevocationEndpointAuthSigningAlgValuesSupported(List<String> revo
         this.revocationEndpointAuthSigningAlgValuesSupported = revocationEndpointAuthSigningAlgValuesSupported;
     }
 
-    public Boolean getBackchannelLogoutSupported() {
-        return backchannelLogoutSupported;
+    public boolean getBackchannelLogoutSupported() {
+        return backchannelLogoutSupported == null ? false : backchannelLogoutSupported;
     }
 
-    public Boolean getBackchannelLogoutSessionSupported() {
-        return backchannelLogoutSessionSupported;
+    public boolean getBackchannelLogoutSessionSupported() {
+        return backchannelLogoutSessionSupported == null ? false : backchannelLogoutSessionSupported;
     }
 
     public void setBackchannelLogoutSessionSupported(Boolean backchannelLogoutSessionSupported) {
@@ -416,8 +416,8 @@ public List<String> getCodeChallengeMethodsSupported() {
 
     // KEYCLOAK-6771 Certificate Bound Token
     // https://tools.ietf.org/html/draft-ietf-oauth-mtls-08#section-6.2
-    public Boolean getTlsClientCertificateBoundAccessTokens() {
-        return tlsClientCertificateBoundAccessTokens;
+    public boolean getTlsClientCertificateBoundAccessTokens() {
+        return tlsClientCertificateBoundAccessTokens == null ? false : tlsClientCertificateBoundAccessTokens;
     }
 
     public List<String> getRequestObjectEncryptionAlgValuesSupported() {