From d76bbfb4404e32c1bfcae46b026e93b447b8deb9 Mon Sep 17 00:00:00 2001
From: Merlin <merlin@offlinesoftware.solutions>
Date: Mon, 19 Aug 2024 09:33:28 -0400
Subject: [PATCH] Handle the audit config being null (#4650)

Signed-off-by: Merlin <na@notaccessible.xyz>
---
 .../opensearch/security/securityconf/DynamicConfigFactory.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opensearch/security/securityconf/DynamicConfigFactory.java b/src/main/java/org/opensearch/security/securityconf/DynamicConfigFactory.java
index 56415ec1bf..335e5283ba 100644
--- 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);