Revert some unintended whitespace changes, add some missing javadoc f…

…or new initTestCluster params Signed-off-by: Paris Larkins <[email protected]>
opensearch-project · Sep 24, 2024 · ff40ae2 · ff40ae2
1 parent 9f90129
commit ff40ae2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/org/opensearch/security/ssl/DefaultSecurityKeyStore.java b/src/main/java/org/opensearch/security/ssl/DefaultSecurityKeyStore.java
@@ -642,7 +642,6 @@ public void initHttpSSLConfig() {
  * If the current and new certificates are same, skip remaining checks.
  * For new X509 cert to be valid Issuer, Subject DN must be the same and
  * new certificates should expire after current ones.
- *
  * @param currentX509Certs Array of current x509 certificates
  * @param newX509Certs Array of x509 certificates which will replace our current cert
  * @param verifyValidDNs Whether to verify that new certs have valid IssuerDN, SubjectDN and SAN

diff --git a/src/main/java/org/opensearch/security/ssl/util/SSLConfigConstants.java b/src/main/java/org/opensearch/security/ssl/util/SSLConfigConstants.java
@@ -48,6 +48,7 @@ public final class SSLConfigConstants {
  "plugins.security.ssl.transport.enforce_hostname_verification";
  public static final String SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION_RESOLVE_HOST_NAME =
  "plugins.security.ssl.transport.resolve_hostname";
+
  public static final String SECURITY_SSL_TRANSPORT_ENFORCE_CERT_RELOAD_DN_VERIFICATION = "plugins.security.ssl.transport.enforce_cert_reload_dn_verification";
  public static final Boolean SECURITY_SSL_TRANSPORT_ENFORCE_CERT_RELOAD_DN_VERIFICATION_DEFAULT = true;
  public static final String SECURITY_SSL_TRANSPORT_KEYSTORE_ALIAS = "plugins.security.ssl.transport.keystore_alias";

diff --git a/src/test/java/org/opensearch/security/ssl/SecuritySSLReloadCertsActionTests.java b/src/test/java/org/opensearch/security/ssl/SecuritySSLReloadCertsActionTests.java
@@ -386,22 +386,22 @@ private void initClusterWithTestCerts() throws Exception {
 
  /**
  * Helper method to initialize test cluster for SSL Certificate Reload Tests
- *
- * @param transportPemCertFilePath Absolute Path to transport pem cert file
- * @param transportPemKeyFilePath Absolute Path to transport pem key file
- * @param httpPemCertFilePath Absolute Path to transport pem cert file
- * @param httpPemKeyFilePath Absolute Path to transport pem key file
- * @param sslCertReload  Sets the ssl cert reload flag
- * @param httpEnforceReloadDnVerification
+ * @param transportPemCertFilePath Absolute Path to transport pem cert file
+ * @param transportPemKeyFilePath  Absolute Path to transport pem key file
+ * @param httpPemCertFilePath  Absolute Path to transport pem cert file
+ * @param httpPemKeyFilePath  Absolute Path to transport pem key file
+ * @param sslCertReload  Sets the ssl cert reload flag
+ * @param httpEnforceReloadDnVerification Sets the http enforce reload dn verification flag
+ * @param transportEnforceReloadDnVerification Sets the transport enforce reload dn verification flag
  */
  private void initTestCluster(
-  final String transportPemCertFilePath,
-  final String transportPemKeyFilePath,
-  final String httpPemCertFilePath,
-  final String httpPemKeyFilePath,
-  final boolean sslCertReload,
-  final boolean httpEnforceReloadDnVerification,
-  final boolean transportEnforceReloadDnVerification
+ final String transportPemCertFilePath,
+ final String transportPemKeyFilePath,
+ final String httpPemCertFilePath,
+ final String httpPemKeyFilePath,
+ final boolean sslCertReload,
+ final boolean httpEnforceReloadDnVerification,
+ final boolean transportEnforceReloadDnVerification
  ) throws Exception {
  final Settings settings = Settings.builder()
  .putList(ConfigConstants.SECURITY_AUTHCZ_ADMIN_DN, "CN=kirk,OU=client,O=client,L=Test,C=DE")