Skip to content

Commit

Permalink
Add test
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Lin committed May 21, 2021
1 parent 27df4a3 commit b8d59ac
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
53 changes: 53 additions & 0 deletions src/test/java/org/opensearch/security/SecuritySettingsTests.java
Original file line number Diff line number Diff line change
@@ -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");

}
}

0 comments on commit b8d59ac

Please sign in to comment.