diff --git a/libs/ssl-config/build.gradle b/libs/ssl-config/build.gradle index b6c637a9db5f5..2c0f7f994b637 100644 --- a/libs/ssl-config/build.gradle +++ b/libs/ssl-config/build.gradle @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: "elasticsearch.publish" +apply plugin: "opensearch.publish" dependencies { - api project(':libs:elasticsearch-core') + api project(':libs:opensearch-core') testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-ssl-config' + exclude group: 'org.opensearch', module: 'opensearch-ssl-config' } testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DefaultJdkTrustConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DefaultJdkTrustConfig.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DefaultJdkTrustConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/DefaultJdkTrustConfig.java index 5a1fbe72c3f49..f6b6240d105c8 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DefaultJdkTrustConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DefaultJdkTrustConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.common.Nullable; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DerParser.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DerParser.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DerParser.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/DerParser.java index 827548813f558..ad66fe1ba4334 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DerParser.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DerParser.java @@ -15,7 +15,7 @@ */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import java.io.ByteArrayInputStream; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DiagnosticTrustManager.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DiagnosticTrustManager.java similarity index 98% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DiagnosticTrustManager.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/DiagnosticTrustManager.java index df358dbb02e45..6ab1368b79122 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DiagnosticTrustManager.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DiagnosticTrustManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLSession; @@ -35,7 +35,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.elasticsearch.common.ssl.SslDiagnostics.getTrustDiagnosticFailure; +import static org.opensearch.common.ssl.SslDiagnostics.getTrustDiagnosticFailure; public final class DiagnosticTrustManager extends X509ExtendedTrustManager { diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/EmptyKeyConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/EmptyKeyConfig.java similarity index 97% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/EmptyKeyConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/EmptyKeyConfig.java index 0844ffb7ee952..3a14699181866 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/EmptyKeyConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/EmptyKeyConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.X509ExtendedKeyManager; import java.nio.file.Path; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/KeyStoreUtil.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/KeyStoreUtil.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/KeyStoreUtil.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/KeyStoreUtil.java index 0a2526c7f7cfa..e44cffaec8d03 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/KeyStoreUtil.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/KeyStoreUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.common.Nullable; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemKeyConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemKeyConfig.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemKeyConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemKeyConfig.java index dd091e0a22218..136c25d64a749 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemKeyConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemKeyConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.X509ExtendedKeyManager; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemTrustConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemTrustConfig.java similarity index 96% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemTrustConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemTrustConfig.java index f3cf8cd8bd7aa..fc9becf4c6301 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemTrustConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemTrustConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509ExtendedTrustManager; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; /** - * A {@link org.elasticsearch.common.ssl.SslTrustConfig} that reads a list of PEM encoded trusted certificates (CAs) from the file + * A {@link org.opensearch.common.ssl.SslTrustConfig} that reads a list of PEM encoded trusted certificates (CAs) from the file * system. * Strictly speaking, this class does not require PEM certificates, and will load any file that can be read by * {@link java.security.cert.CertificateFactory#generateCertificate(InputStream)}. diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemUtils.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemUtils.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemUtils.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemUtils.java index 17046b89c376c..728d378bd7512 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemUtils.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.common.CharArrays; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslClientAuthenticationMode.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslClientAuthenticationMode.java similarity index 98% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslClientAuthenticationMode.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslClientAuthenticationMode.java index 8a972b6c78826..98d74ba6e7589 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslClientAuthenticationMode.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslClientAuthenticationMode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.SSLParameters; import java.util.Collections; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigException.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigException.java similarity index 96% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigException.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigException.java index ae5d332e0a1e7..21c53d5fd077a 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigException.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; /** * A base exception for problems that occur while trying to configure SSL. diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfiguration.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfiguration.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfiguration.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfiguration.java index 1213b7829e5d0..99281b284c751 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfiguration.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfiguration.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.SSLContext; import javax.net.ssl.X509ExtendedKeyManager; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationKeys.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationKeys.java similarity index 98% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationKeys.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationKeys.java index 6e717f1c4cd11..ddb6be31d9434 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationKeys.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationKeys.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.TrustManagerFactory; import java.security.KeyStore; @@ -164,7 +164,7 @@ public static List getListKeys() { } /** - * The list of keys that are used to load a secure setting (such as a password) that would typically be stored in the elasticsearch + * The list of keys that are used to load a secure setting (such as a password) that would typically be stored in the opensearch * keystore. */ public static List getSecureStringKeys() { diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationLoader.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationLoader.java similarity index 89% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationLoader.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationLoader.java index e53600c251424..fa275959357b0 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationLoader.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.bootstrap.JavaVersion; @@ -34,29 +34,29 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static org.elasticsearch.common.ssl.KeyStoreUtil.inferKeyStoreType; -import static org.elasticsearch.common.ssl.SslConfiguration.ORDERED_PROTOCOL_ALGORITHM_MAP; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.CERTIFICATE; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.CERTIFICATE_AUTHORITIES; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.CIPHERS; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.CLIENT_AUTH; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEY; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_ALGORITHM; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_KEY_PASSWORD; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_PASSWORD; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_PATH; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_KEY_PASSWORD; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_PASSWORD; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_TYPE; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEY_LEGACY_PASSPHRASE; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEY_SECURE_PASSPHRASE; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.PROTOCOLS; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_ALGORITHM; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_LEGACY_PASSWORD; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_PATH; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_SECURE_PASSWORD; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_TYPE; -import static org.elasticsearch.common.ssl.SslConfigurationKeys.VERIFICATION_MODE; +import static org.opensearch.common.ssl.KeyStoreUtil.inferKeyStoreType; +import static org.opensearch.common.ssl.SslConfiguration.ORDERED_PROTOCOL_ALGORITHM_MAP; +import static org.opensearch.common.ssl.SslConfigurationKeys.CERTIFICATE; +import static org.opensearch.common.ssl.SslConfigurationKeys.CERTIFICATE_AUTHORITIES; +import static org.opensearch.common.ssl.SslConfigurationKeys.CIPHERS; +import static org.opensearch.common.ssl.SslConfigurationKeys.CLIENT_AUTH; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEY; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_ALGORITHM; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_KEY_PASSWORD; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_PASSWORD; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_PATH; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_KEY_PASSWORD; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_PASSWORD; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_TYPE; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEY_LEGACY_PASSPHRASE; +import static org.opensearch.common.ssl.SslConfigurationKeys.KEY_SECURE_PASSPHRASE; +import static org.opensearch.common.ssl.SslConfigurationKeys.PROTOCOLS; +import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_ALGORITHM; +import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_LEGACY_PASSWORD; +import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_PATH; +import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_SECURE_PASSWORD; +import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_TYPE; +import static org.opensearch.common.ssl.SslConfigurationKeys.VERIFICATION_MODE; /** * Loads {@link SslConfiguration} from settings. @@ -194,7 +194,7 @@ public void setDefaultProtocols(List defaultProtocols) { /** * Resolve all necessary configuration settings, and load a {@link SslConfiguration}. * - * @param basePath The base path to use for any settings that represent file paths. Typically points to the Elasticsearch + * @param basePath The base path to use for any settings that represent file paths. Typically points to the OpenSearch * configuration directory. * @throws SslConfigException For any problems with the configuration, or with loading the required SSL classes. */ diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslDiagnostics.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslDiagnostics.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslDiagnostics.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslDiagnostics.java index 29ee19e6c0b1f..0d8f6cd809137 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslDiagnostics.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslDiagnostics.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.common.Nullable; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslKeyConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslKeyConfig.java similarity index 97% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslKeyConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslKeyConfig.java index 4f5e6b8669310..fb72f047af78c 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslKeyConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslKeyConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.X509ExtendedKeyManager; import java.nio.file.Path; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslTrustConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslTrustConfig.java similarity index 97% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslTrustConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslTrustConfig.java index 2cd61218e6bb7..f7db75f6479da 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslTrustConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslTrustConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.X509ExtendedTrustManager; import java.nio.file.Path; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslUtil.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslUtil.java similarity index 98% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslUtil.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslUtil.java index d6d8330a85ba1..7ef00d8cf0d59 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslUtil.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslVerificationMode.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslVerificationMode.java similarity index 98% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslVerificationMode.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslVerificationMode.java index eee6e9cb2d6a1..ae5cc0cafded4 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslVerificationMode.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslVerificationMode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/StoreKeyConfig.java similarity index 99% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/StoreKeyConfig.java index 683aaaaa06cb4..349d607e42736 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/StoreKeyConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.X509ExtendedKeyManager; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/StoreTrustConfig.java similarity index 98% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/StoreTrustConfig.java index 0dc0a3818c8ed..f438fc87a03c6 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/StoreTrustConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.X509ExtendedTrustManager; import java.nio.file.Path; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/TrustEverythingConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/TrustEverythingConfig.java similarity index 98% rename from libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/TrustEverythingConfig.java rename to libs/ssl-config/src/main/java/org/opensearch/common/ssl/TrustEverythingConfig.java index f3ed83a7e7d7b..e0ef11bbffab4 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/TrustEverythingConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/TrustEverythingConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import javax.net.ssl.SSLEngine; import javax.net.ssl.X509ExtendedTrustManager; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/DefaultJdkTrustConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/DefaultJdkTrustConfigTests.java similarity index 98% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/DefaultJdkTrustConfigTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/DefaultJdkTrustConfigTests.java index b1aad439e47e1..d21536f8c4b1d 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/DefaultJdkTrustConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/DefaultJdkTrustConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.test.ESTestCase; import org.junit.Assert; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemKeyConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java similarity index 99% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemKeyConfigTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java index e0862321ca79a..cd4cb3134340d 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemKeyConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemTrustConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java similarity index 99% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemTrustConfigTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java index 8d87c1599352b..241563b77e738 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemTrustConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemUtilsTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java similarity index 99% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemUtilsTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java index 711bbfed22d36..dd1962fb7414a 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/PemUtilsTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.test.ESTestCase; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslConfigurationLoaderTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java similarity index 99% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslConfigurationLoaderTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java index 20a161b78fd5f..6c2662fc65da6 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslConfigurationLoaderTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.common.settings.MockSecureSettings; import org.elasticsearch.common.settings.SecureString; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslConfigurationTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationTests.java similarity index 98% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslConfigurationTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationTests.java index b8986462ebe47..3fac556ae3ba1 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslConfigurationTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; @@ -30,7 +30,7 @@ import java.util.Collections; import java.util.List; -import static org.elasticsearch.common.ssl.SslConfigurationLoader.DEFAULT_CIPHERS; +import static org.opensearch.common.ssl.SslConfigurationLoader.DEFAULT_CIPHERS; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslDiagnosticsTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java similarity index 99% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslDiagnosticsTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java index fcc39463549f6..ca0b095a4bd66 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslDiagnosticsTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.common.Nullable; import org.elasticsearch.test.ESTestCase; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/StoreKeyConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreKeyConfigTests.java similarity index 99% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/StoreKeyConfigTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreKeyConfigTests.java index f5fcc16c6a023..f10fa9bf6c439 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/StoreKeyConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreKeyConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/StoreTrustConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreTrustConfigTests.java similarity index 99% rename from libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/StoreTrustConfigTests.java rename to libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreTrustConfigTests.java index 207bf9179415f..a69d6ec07b7cc 100644 --- a/libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/StoreTrustConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreTrustConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.ssl; +package org.opensearch.common.ssl; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/libs/ssl-config/src/test/resources/certs/README.txt b/libs/ssl-config/src/test/resources/certs/README.txt index 5f40a858a96e4..882df228c520e 100644 --- a/libs/ssl-config/src/test/resources/certs/README.txt +++ b/libs/ssl-config/src/test/resources/certs/README.txt @@ -6,57 +6,57 @@ # 1. Create first CA PEM ("ca1") -elasticsearch-certutil ca --pem --out ca1.zip --days 9999 --ca-dn "CN=Test CA 1" -unzip ca1.zip +opensearch-certutil ca --pem --out ca1.zip --days 9999 --ca-dn "CN=Test CA 1" +unzip ca1.zip mv ca ca1 # 2. Create first CA PEM ("ca2") -elasticsearch-certutil ca --pem --out ca2.zip --days 9999 --ca-dn "CN=Test CA 2" -unzip ca2.zip +opensearch-certutil ca --pem --out ca2.zip --days 9999 --ca-dn "CN=Test CA 2" +unzip ca2.zip mv ca ca2 # 3. Create first CA PEM ("ca3") -elasticsearch-certutil ca --pem --out ca3.zip --days 9999 --ca-dn "CN=Test CA 3" -unzip ca3.zip +opensearch-certutil ca --pem --out ca3.zip --days 9999 --ca-dn "CN=Test CA 3" +unzip ca3.zip mv ca ca3 # 4. Create "cert1" PEM -elasticsearch-certutil cert --pem --out cert1.zip --name cert1 --ip 127.0.0.1 --dns localhost --days 9999 --ca-key ca1/ca.key --ca-cert ca1/ca.crt +opensearch-certutil cert --pem --out cert1.zip --name cert1 --ip 127.0.0.1 --dns localhost --days 9999 --ca-key ca1/ca.key --ca-cert ca1/ca.crt unzip cert1.zip # 5. Create "cert2" PEM (same as cert1, but with a password) -elasticsearch-certutil cert --pem --out cert2.zip --name cert2 --ip 127.0.0.1 --dns localhost --days 9999 --ca-key ca1/ca.key --ca-cert ca1/ca.crt --pass "c2-pass" +opensearch-certutil cert --pem --out cert2.zip --name cert2 --ip 127.0.0.1 --dns localhost --days 9999 --ca-key ca1/ca.key --ca-cert ca1/ca.crt --pass "c2-pass" unzip cert2.zip # 6. Convert CAs to PKCS#12 for n in 1 2 3 do - keytool -importcert -file ca${n}/ca.crt -alias ca -keystore ca${n}/ca.p12 -storetype PKCS12 -storepass p12-pass -v - keytool -importcert -file ca${n}/ca.crt -alias ca${n} -keystore ca-all/ca.p12 -storetype PKCS12 -storepass p12-pass -v + keytool -importcert -file ca${n}/ca.crt -alias ca -keystore ca${n}/ca.p12 -storetype PKCS12 -storepass p12-pass -v + keytool -importcert -file ca${n}/ca.crt -alias ca${n} -keystore ca-all/ca.p12 -storetype PKCS12 -storepass p12-pass -v done # 7. Convert CAs to JKS for n in 1 2 3 do - keytool -importcert -file ca${n}/ca.crt -alias ca${n} -keystore ca-all/ca.jks -storetype jks -storepass jks-pass -v + keytool -importcert -file ca${n}/ca.crt -alias ca${n} -keystore ca-all/ca.jks -storetype jks -storepass jks-pass -v done # 8. Convert Certs to PKCS#12 -for Cert in cert1 cert2 +for Cert in cert1 cert2 do - openssl pkcs12 -export -out $Cert/$Cert.p12 -inkey $Cert/$Cert.key -in $Cert/$Cert.crt -name $Cert -passout pass:p12-pass + openssl pkcs12 -export -out $Cert/$Cert.p12 -inkey $Cert/$Cert.key -in $Cert/$Cert.crt -name $Cert -passout pass:p12-pass done # 9. Import Certs into single PKCS#12 keystore -for Cert in cert1 cert2 +for Cert in cert1 cert2 do keytool -importkeystore -noprompt \ -srckeystore $Cert/$Cert.p12 -srcstoretype PKCS12 -srcstorepass p12-pass \ @@ -65,7 +65,7 @@ done # 10. Import Certs into single JKS keystore with separate key-password -for Cert in cert1 cert2 +for Cert in cert1 cert2 do keytool -importkeystore -noprompt \ -srckeystore $Cert/$Cert.p12 -srcstoretype PKCS12 -srcstorepass p12-pass \ @@ -75,7 +75,7 @@ done # 11. Create a mimic of the first CA ("ca1b") for testing certificates with the same name but different keys -elasticsearch-certutil ca --pem --out ${PWD}/ca1-b.zip --days 9999 --ca-dn "CN=Test CA 1" +opensearch-certutil ca --pem --out ${PWD}/ca1-b.zip --days 9999 --ca-dn "CN=Test CA 1" unzip ca1-b.zip mv ca ca1-b diff --git a/libs/ssl-config/src/test/resources/certs/pem-utils/README.asciidoc b/libs/ssl-config/src/test/resources/certs/pem-utils/README.asciidoc index f7fbd2ad69c0d..6fdbc170992e2 100644 --- a/libs/ssl-config/src/test/resources/certs/pem-utils/README.asciidoc +++ b/libs/ssl-config/src/test/resources/certs/pem-utils/README.asciidoc @@ -67,13 +67,13 @@ Adding `DSA` and `EC` Keys to the Keystore [source,shell] ------ keytool -genkeypair -keyalg DSA -alias testnode_dsa -keystore testnode.jks -storepass testnode \ - -keypass testnode -validity 10000 -keysize 1024 -dname "CN=Elasticsearch Test Node" \ + -keypass testnode -validity 10000 -keysize 1024 -dname "CN=OpenSearch Test Node" \ -ext SAN=dns:localhost,dns:localhost.localdomain,dns:localhost4,dns:localhost4.localdomain4,dns:localhost6,dns:localhost6.localdomain6,ip:127.0.0.1,ip:0:0:0:0:0:0:0:1 ------ [source,shell] ------ keytool -genkeypair -keyalg EC -alias testnode_ec -keystore testnode.jks -storepass testnode \ - -keypass testnode -validity 10000 -keysize 256 -dname "CN=Elasticsearch Test Node" \ + -keypass testnode -validity 10000 -keysize 256 -dname "CN=OpenSearch Test Node" \ -ext SAN=dns:localhost,dns:localhost.localdomain,dns:localhost4,dns:localhost4.localdomain4,dns:localhost6,dns:localhost6.localdomain6,ip:127.0.0.1,ip:0:0:0:0:0:0:0:1 ------ diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java index 29a0d26f997cc..de18ac72078bd 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java @@ -27,9 +27,9 @@ import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.ssl.SslConfiguration; -import org.elasticsearch.common.ssl.SslConfigurationKeys; -import org.elasticsearch.common.ssl.SslConfigurationLoader; +import org.opensearch.common.ssl.SslConfiguration; +import org.opensearch.common.ssl.SslConfigurationKeys; +import org.opensearch.common.ssl.SslConfigurationLoader; import org.elasticsearch.env.Environment; import org.elasticsearch.watcher.FileChangesListener; import org.elasticsearch.watcher.FileWatcher; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index 05c1d7904c599..386bfd9d4a69f 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -30,8 +30,8 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.ssl.PemKeyConfig; -import org.elasticsearch.common.ssl.PemTrustConfig; +import org.opensearch.common.ssl.PemKeyConfig; +import org.opensearch.common.ssl.PemTrustConfig; import org.elasticsearch.env.Environment; import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.index.reindex.RemoteInfo;