From e6da580ea85ea1615663c39abfea5b6caccd5ded Mon Sep 17 00:00:00 2001
From: Andy Lin <ndylin@amazon.com>
Date: Fri, 21 May 2021 11:20:04 -0700
Subject: [PATCH] Add test

---
 .../security/OpenSearchSecurityPlugin.java    |  9 +++-
 .../security/SecuritySettingsTests.java       | 53 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/opensearch/security/SecuritySettingsTests.java

diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
index bf30633238..c3715d7498 100644
--- a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
+++ b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -62,7 +62,6 @@
 import org.opensearch.security.ssl.rest.SecuritySSLCertsInfoAction;
 
 import org.opensearch.security.ssl.transport.DefaultPrincipalExtractor;
-import org.opensearch.security.support.*;
 import org.opensearch.security.transport.SecurityInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -167,6 +166,14 @@
 import org.opensearch.security.configuration.ConfigurationRepository;
 import org.opensearch.security.configuration.DlsFlsRequestValve;
 import org.opensearch.security.ssl.http.netty.ValidatingDispatcher;
+import org.opensearch.security.support.ConfigConstants;
+import org.opensearch.security.support.HeaderHelper;
+import org.opensearch.security.support.ModuleInfo;
+import org.opensearch.security.support.ReflectionHelper;
+import org.opensearch.security.support.WildcardMatcher;
+import org.opensearch.security.support.SecurityUtils;
+import org.opensearch.security.support.LegacyOpenDistroSecuritySettings;
+import org.opensearch.security.support.SecuritySettings;
 import com.google.common.collect.Lists;
 
 public final class OpenSearchSecurityPlugin extends OpenSearchSecuritySSLPlugin implements ClusterPlugin, MapperPlugin {
diff --git a/src/test/java/org/opensearch/security/SecuritySettingsTests.java b/src/test/java/org/opensearch/security/SecuritySettingsTests.java
new file mode 100644
index 0000000000..7c2120b8a8
--- /dev/null
+++ b/src/test/java/org/opensearch/security/SecuritySettingsTests.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+package org.opensearch.security;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.opensearch.common.settings.Setting;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.security.support.LegacyOpenDistroSecuritySettings;
+import org.opensearch.security.support.SecuritySettings;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+public class SecuritySettingsTests {
+    
+    @Test
+    public void testLegacyOpenDistroSettingsFallback() {
+        Assert.assertEquals(
+                SecuritySettings.SECURITY_ADVANCED_MODULES_ENABLED.get(Settings.EMPTY),
+                LegacyOpenDistroSecuritySettings.SECURITY_ADVANCED_MODULES_ENABLED.get(Settings.EMPTY)
+        );
+    }
+    
+    @Test
+    public void testSettingsGetValue() {
+        Settings settings = Settings.builder().put("plugins.security.disabled", false).build();
+        Assert.assertEquals(SecuritySettings.SECURITY_DISABLED.get(settings), false);
+        Assert.assertEquals(LegacyOpenDistroSecuritySettings.SECURITY_DISABLED.get(settings), false);
+    }
+    
+    @Test
+    public void testSettingsGetValueWithLegacyFallback() {
+        Settings settings = Settings.builder()
+                .put("opendistro_security.disabled", false)
+                .put("opendistro_security.config_index_name", "test")
+        .build();
+
+        Assert.assertEquals(SecuritySettings.SECURITY_DISABLED.get(settings), false);
+        Assert.assertEquals(SecuritySettings.SECURITY_CONFIG_INDEX_NAME.get(settings), "test");
+        
+    }
+}