[pull] main from zaproxy:main

zap/gradle/japicmp.yaml

@@ -12,6 +12,8 @@ packageExcludes:
  - "org.zaproxy.zap.spider.parser"
 fieldExcludes: []
 classExcludes:
+ - "org.zaproxy.zap.httputils.HtmlContext"
+ - "org.zaproxy.zap.httputils.HtmlContextAnalyser"
  - "org.parosproxy.paros.extension.option.OptionsCertificatePanel"
  - "org.parosproxy.paros.extension.option.OptionsParamCertificate"
  - "org.parosproxy.paros.network.SSLConnector"

zap/src/main/java/org/zaproxy/zap/extension/users/DialogAddUser.java

@@ -130,6 +130,9 @@ public void clear() {
 
     @Override
     protected boolean validateFields() {
+        if (credentialsPanel == null) {
+            return true;
+        }
         return credentialsPanel.validateFields();
     }
 
@@ -143,9 +146,10 @@ protected void performAction() {
                             this.user.getId());
         else this.user = new User(workingContext.getId(), getNameTextField().getText());
         this.user.setEnabled(getEnabledCheckBox().isSelected());
-        // Make sure the credentials panel saves its changes first
-        credentialsPanel.saveCredentials();
-        this.user.setAuthenticationCredentials(credentialsPanel.getCredentials());
+        if (credentialsPanel != null) {
+            credentialsPanel.saveCredentials();
+            this.user.setAuthenticationCredentials(credentialsPanel.getCredentials());
+        }
     }
 
     @Override