[JENKINS-71322] NPE on non existing SAML Attribute (#345)

* fix: NPE processing custom attributes * Update src/main/java/org/jenkinsci/plugins/saml/SamlSecurityRealm.java
jenkinsci · May 31, 2023 · dfa7489 · dfa7489
1 parent 51bd50a
commit dfa7489
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/saml/SamlSecurityRealm.java b/src/main/java/org/jenkinsci/plugins/saml/SamlSecurityRealm.java
@@ -399,9 +399,12 @@ private boolean modifyUserSamlCustomAttributes(User user, SAML2Profile profile)
             for (AttributeEntry attributeEntry : getSamlCustomAttributes()) {
                 if(attributeEntry instanceof Attribute){
                     Attribute attr =  (Attribute) attributeEntry;
-                    SamlCustomProperty.Attribute item = new SamlCustomProperty.Attribute(attr.getName(),attr.getDisplayName());
-                    item.setValue(profile.getAttribute(attr.getName()).toString());
-                    userProperty.getAttributes().add(item);
+                    Object attrValue = profile.getAttribute(attr.getName());
+                    if (attrValue != null) {
+                        SamlCustomProperty.Attribute item = new SamlCustomProperty.Attribute(attr.getName(),attr.getDisplayName());
+                        item.setValue(attrValue.toString());
+                        userProperty.getAttributes().add(item);
+                    }
                 }
             }
             try {