Skip to content

Commit

Permalink
Rename classes, variables, methods to incorporate OpenSearch (opensea…
Browse files Browse the repository at this point in the history 
…rch-project#21)

Signed-off-by: Vacha Shah <vachshah@amazon.com>
  • Loading branch information
@VachaShah
VachaShah committed May 19, 2021
1 parent b3b0d4a commit ad015fd
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 56 deletions.
16 changes: 8 additions & 8 deletions ...lasticsearch/commons/ConfigConstants.java → ...g/opensearch/commons/ConfigConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ public class ConfigConstants {
public static final String AUTHORIZATION = "Authorization";

// These reside in security plugin.
public static final String OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH = "opendistro_security.ssl.http.pemcert_filepath";
public static final String OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH = "opendistro_security.ssl.http.keystore_filepath";
public static final String OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD = "opendistro_security.ssl.http.keystore_password";
public static final String OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD = "opendistro_security.ssl.http.keystore_keypassword";
public static final String OPENDISTRO_SECURITY_INJECTED_ROLES = "opendistro_security_injected_roles";
public static final String OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH = "opendistro_security.ssl.http.pemcert_filepath";
public static final String OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH = "opendistro_security.ssl.http.keystore_filepath";
public static final String OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD = "opendistro_security.ssl.http.keystore_password";
public static final String OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD = "opendistro_security.ssl.http.keystore_keypassword";
public static final String OPENSEARCH_SECURITY_INJECTED_ROLES = "opendistro_security_injected_roles";
public static final String INJECTED_USER = "injected_user";
public static final String OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS = "opendistro_security_use_injected_user_for_plugins";
public static final String OPENDISTRO_SECURITY_SSL_HTTP_ENABLED = "opendistro_security.ssl.http.enabled";
public static final String OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT = "_opendistro_security_user_info";
public static final String OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS = "opendistro_security_use_injected_user_for_plugins";
public static final String OPENSEARCH_SECURITY_SSL_HTTP_ENABLED = "opendistro_security.ssl.http.enabled";
public static final String OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT = "_opendistro_security_user_info";
}
10 changes: 5 additions & 5 deletions ...elasticsearch/commons/InjectSecurity.java → ...rg/opensearch/commons/InjectSecurity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
package org.opensearch.commons;

import static org.opensearch.commons.ConfigConstants.INJECTED_USER;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_INJECTED_ROLES;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_INJECTED_ROLES;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS;

import java.util.List;

Expand Down Expand Up @@ -116,7 +116,7 @@ public InjectSecurity(final String id, final Settings settings, final ThreadCont
* @param roles
*/
public void inject(final String user, final List<String> roles) {
boolean injectUser = settings.getAsBoolean(OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, false);
boolean injectUser = settings.getAsBoolean(OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, false);
if (injectUser)
injectUser(user);
else
Expand Down Expand Up @@ -152,8 +152,8 @@ public void injectRoles(final List<String> roles) {

final String rolesStr = String.join(",", roles);
String injectStr = "plugin|" + rolesStr;
if (threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES) == null) {
threadContext.putTransient(OPENDISTRO_SECURITY_INJECTED_ROLES, injectStr);
if (threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES) == null) {
threadContext.putTransient(OPENSEARCH_SECURITY_INJECTED_ROLES, injectStr);
log.debug("{}, InjectSecurity - inject roles: {}", Thread.currentThread().getName(), id);
} else {
log.error("{}, InjectSecurity- most likely thread context corruption : {}", Thread.currentThread().getName(), id);
Expand Down
0 ...mons/authuser/AuthUserRequestBuilder.java → ...mons/authuser/AuthUserRequestBuilder.java
View file
File renamed without changes.
0 ...relasticsearch/commons/authuser/User.java → ...org/opensearch/commons/authuser/User.java
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions ...commons/rest/SecureRestClientBuilder.java → ...commons/rest/SecureRestClientBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public SecureRestClientBuilder(HttpHost[] httpHosts, final boolean httpSSLEnable

public SecureRestClientBuilder(Settings settings, Path configPath) {

this.httpSSLEnabled = settings.getAsBoolean(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_ENABLED, false);
this.httpSSLEnabled = settings.getAsBoolean(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_ENABLED, false);
this.settings = settings;
this.configPath = configPath;
this.user = null;
Expand Down Expand Up @@ -285,17 +285,17 @@ private String resolve(final String originalFile, final Path configPath) {
}

private String getTrustPem() {
return settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, null);
return settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, null);
}

private String getKeystorePasswd() {
return settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, null);
return settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, null);
}

private KeyStore getKeyStore() throws IOException, GeneralSecurityException {
KeyStore keyStore = KeyStore.getInstance("jks");
String keyStoreFile = settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, null);
String passwd = settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, null);
String keyStoreFile = settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, null);
String passwd = settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, null);
if (Strings.isNullOrEmpty(keyStoreFile) || Strings.isNullOrEmpty(passwd)) {
return null;
}
Expand Down
0 ...lasticsearch/commons/rest/TrustStore.java → ...g/opensearch/commons/rest/TrustStore.java
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions ...ticsearch/commons/InjectSecurityTest.java → ...pensearch/commons/InjectSecurityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import static junit.framework.TestCase.assertNull;
import static org.junit.Assert.assertEquals;
import static org.opensearch.commons.ConfigConstants.INJECTED_USER;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_INJECTED_ROLES;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_INJECTED_ROLES;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS;

import java.util.Arrays;

Expand All @@ -48,7 +48,7 @@ public void testUsersRolesEmpty() {
try (InjectSecurity helper = new InjectSecurity("test-name", Settings.EMPTY, tc)) {
helper.inject("", null);
}
Assert.assertNull(tc.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES));
Assert.assertNull(tc.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES));
}

@Test
Expand All @@ -68,18 +68,18 @@ public void testInjectRoles() {
assertEquals("1", threadContext.getHeader("default"));
assertEquals("opendistro", threadContext.getHeader("name"));
assertEquals("plugin", threadContext.getTransient("ctx.name"));
assertNotNull(threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES));
assertEquals("plugin|ops-role,logs-role", threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES));
assertNotNull(threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES));
assertEquals("plugin|ops-role,logs-role", threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES));
}
assertEquals("1", threadContext.getHeader("default"));
assertEquals("opendistro", threadContext.getHeader("name"));
assertEquals("plugin", threadContext.getTransient("ctx.name"));
assertNull(threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES));
assertNull(threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES));
}

@Test
public void testInjectUser() {
Settings settings = Settings.builder().put(OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, true).build();
Settings settings = Settings.builder().put(OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, true).build();
Settings headerSettings = Settings.builder().put("request.headers.default", "1").build();
ThreadContext threadContext = new ThreadContext(headerSettings);
threadContext.putHeader("name", "opendistro");
Expand All @@ -94,7 +94,7 @@ public void testInjectUser() {
assertEquals("1", threadContext.getHeader("default"));
assertEquals("opendistro", threadContext.getHeader("name"));
assertEquals("plugin", threadContext.getTransient("ctx.name"));
assertNull(threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES));
assertNull(threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES));
assertNotNull(threadContext.getTransient(INJECTED_USER));
assertEquals("joe", threadContext.getTransient(INJECTED_USER));
}
Expand Down
32 changes: 16 additions & 16 deletions ...sticsearch/commons/authuser/UserTest.java → ...opensearch/commons/authuser/UserTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT;

import java.io.IOException;
import java.util.Arrays;
Expand Down Expand Up @@ -133,8 +133,8 @@ public void testStreamConstForTenantUser() throws IOException {
@Test
public void testParseUserString() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|bckrole1,bckrol2|role1,role2|myTenant");
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|bckrole1,bckrol2|role1,role2|myTenant");
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);

assertEquals("myuser", user.getName());
Expand All @@ -148,16 +148,16 @@ public void testParseUserString() {
@Test
public void testParseUserStringEmpty() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);
assertEquals(null, user);
}

@Test
public void testParseUserStringName() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||");
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||");
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);

assertEquals("myuser", user.getName());
Expand All @@ -168,8 +168,8 @@ public void testParseUserStringName() {
@Test
public void testParseUserStringNameWithTenant() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|||myTenant");
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|||myTenant");
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);

assertEquals("myuser", user.getName());
Expand All @@ -181,8 +181,8 @@ public void testParseUserStringNameWithTenant() {
@Test
public void testParseUserStringNobackendRoles() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||role1,role2");
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||role1,role2");
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);

assertEquals("myuser", user.getName());
Expand All @@ -193,8 +193,8 @@ public void testParseUserStringNobackendRoles() {
@Test
public void testParseUserStringNoRoles() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2|");
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2|");
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);

assertEquals("myuser", user.getName());
Expand All @@ -205,8 +205,8 @@ public void testParseUserStringNoRoles() {
@Test
public void testParseUserStringNoRolesWithTenant() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2||myTenant");
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2||myTenant");
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);

assertEquals("myuser", user.getName());
Expand All @@ -218,8 +218,8 @@ public void testParseUserStringNoRolesWithTenant() {
@Test
public void testParseUserStringMalformed() {
ThreadContext tc = new ThreadContext(Settings.EMPTY);
tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "|backendrole1,backendrole2|role1,role2");
String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT);
tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "|backendrole1,backendrole2|role1,role2");
String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
User user = User.parse(str);
assertEquals(null, user);
}
Expand Down
28 changes: 14 additions & 14 deletions ...search/commons/rest/IntegrationTests.java → ...search/commons/rest/IntegrationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_ENABLED;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD;
import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_ENABLED;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD;
import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH;

import java.io.File;
import java.nio.file.Path;
Expand Down Expand Up @@ -74,11 +74,11 @@ public void testCreateRestClientWithCerts() throws Exception {
Settings settings = Settings
.builder()
.put("http.port", 9200)
.put(OPENDISTRO_SECURITY_SSL_HTTP_ENABLED, true)
.put(OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, "sample.pem")
.put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks")
.put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit")
.put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit")
.put(OPENSEARCH_SECURITY_SSL_HTTP_ENABLED, true)
.put(OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, "sample.pem")
.put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks")
.put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit")
.put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit")
.build();

RestClient client = new SecureRestClientBuilder(settings, configPath).build();
Expand All @@ -96,10 +96,10 @@ public void testCreateRestClientWithoutPem() throws Exception {
Settings settings = Settings
.builder()
.put("http.port", 9200)
.put(OPENDISTRO_SECURITY_SSL_HTTP_ENABLED, true)
.put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks")
.put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit")
.put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit")
.put(OPENSEARCH_SECURITY_SSL_HTTP_ENABLED, true)
.put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks")
.put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit")
.put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit")
.build();

RestClient client = new SecureRestClientBuilder(settings, configPath).build();
Expand Down
0 ...ons/rest/SecureRestClientBuilderTest.java → ...ons/rest/SecureRestClientBuilderTest.java
View file
File renamed without changes.
0 ...icsearch/commons/rest/TrustStoreTest.java → ...ensearch/commons/rest/TrustStoreTest.java
View file
File renamed without changes.

0 comments on commit ad015fd

Please sign in to comment.