Modify the getDynamicOnBehalfOfSettings() to return settings.Empty if…

… there is no changes Signed-off-by: Ryan Liang <[email protected]>
opensearch-project · Aug 16, 2023 · 9b57e1b · 9b57e1b
1 parent b64f7e1
commit 9b57e1b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java b/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java
@@ -61,16 +61,13 @@ public void onDynamicConfigModelChanged(DynamicConfigModel dcm) {
         this.dcm = dcm;
 
         Settings settings = dcm.getDynamicOnBehalfOfSettings();
-        if (settings != null) {
-            Boolean enabled = Boolean.parseBoolean(settings.get("enabled"));
-            String signingKey = settings.get("signing_key");
-            String encryptionKey = settings.get("encryption_key");
-
-            if (!Boolean.FALSE.equals(enabled) && signingKey != null && encryptionKey != null) {
-                this.vendor = new JwtVendor(settings, Optional.empty());
-            } else {
-                this.vendor = null;
-            }
+
+        Boolean enabled = Boolean.parseBoolean(settings.get("enabled"));
+        String signingKey = settings.get("signing_key");
+        String encryptionKey = settings.get("encryption_key");
+
+        if (!Boolean.FALSE.equals(enabled) && signingKey != null && encryptionKey != null) {
+            this.vendor = new JwtVendor(settings, Optional.empty());
         } else {
             this.vendor = null;
         }

diff --git a/src/main/java/org/opensearch/security/securityconf/DynamicConfigModelV7.java b/src/main/java/org/opensearch/security/securityconf/DynamicConfigModelV7.java
@@ -214,9 +214,10 @@ public Multimap<String, ClientBlockRegistry<String>> getAuthBackendClientBlockRe
 
     @Override
     public Settings getDynamicOnBehalfOfSettings() {
-        return Settings.builder()
+        Settings settings = Settings.builder()
             .put(Settings.builder().loadFromSource(config.dynamic.on_behalf_of.configAsJson(), XContentType.JSON).build())
             .build();
+        return settings != null ? settings : Settings.EMPTY;
     }
 
     private void buildAAA() {