Handle the audit config being null (opensearch-project#4650)

Signed-off-by: Merlin <[email protected]>
cwperks · Aug 19, 2024 · d76bbfb · d76bbfb
1 parent 8fdc00d
commit d76bbfb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/opensearch/security/securityconf/DynamicConfigFactory.java b/src/main/java/org/opensearch/security/securityconf/DynamicConfigFactory.java
@@ -83,6 +83,7 @@ public class DynamicConfigFactory implements Initializable, ConfigurationChangeL
  private static SecurityDynamicConfiguration<TenantV7> staticTenants = SecurityDynamicConfiguration.empty();
  private static final WhitelistingSettings defaultWhitelistingSettings = new WhitelistingSettings();
  private static final AllowlistingSettings defaultAllowlistingSettings = new AllowlistingSettings();
+ private static final AuditConfig defaultAuditConfig = AuditConfig.from(Settings.EMPTY);
 
  static void resetStatics() {
  staticRoles = SecurityDynamicConfiguration.empty();
@@ -314,7 +315,7 @@ public void onChange(Map<CType, SecurityDynamicConfiguration<?>> typeToConfig) {
  eventBus.post(whitelist == null ? defaultWhitelistingSettings : whitelist);
  eventBus.post(allowlist == null ? defaultAllowlistingSettings : allowlist);
  if (cr.isAuditHotReloadingEnabled()) {
- eventBus.post(audit);
+ eventBus.post(audit == null ? defaultAuditConfig : audit);
  }
 
  initialized.set(true);