Merge branch 'main' into depr-constants

Author: DarshitChanpura

src/main/java/org/opensearch/security/rest/DashboardsInfoAction.java

@@ -51,13 +51,15 @@
 import static org.opensearch.rest.RestRequest.Method.GET;
 import static org.opensearch.rest.RestRequest.Method.POST;
 import static org.opensearch.security.dlic.rest.support.Utils.LEGACY_PLUGIN_ROUTE_PREFIX;
-import static org.opensearch.security.dlic.rest.support.Utils.OPENDISTRO_API_DEPRECATION_MESSAGE;
 import static org.opensearch.security.dlic.rest.support.Utils.PLUGIN_ROUTE_PREFIX;
 import static org.opensearch.security.dlic.rest.support.Utils.addDeprecatedRoutesPrefix;
 import static org.opensearch.security.dlic.rest.support.Utils.addRoutesPrefix;
 
 public class DashboardsInfoAction extends BaseRestHandler {
 
+    private static final String KIBANAINFO_ROUTE_DEPRECATION_MESSAGE =
+        "[_opendistro/_security/kibanainfo] is a deprecated endpoint path. Please use _plugins/_security/dashboardsinfo instead.";;
+
     private static final List<Route> routes = ImmutableList.<Route>builder()
         .addAll(
             addRoutesPrefix(ImmutableList.of(new Route(GET, "/dashboardsinfo"), new Route(POST, "/dashboardsinfo")), PLUGIN_ROUTE_PREFIX)
@@ -68,8 +70,8 @@ public class DashboardsInfoAction extends BaseRestHandler {
         .addAll(
             addDeprecatedRoutesPrefix(
                 ImmutableList.of(
-                    new DeprecatedRoute(GET, "/kibanainfo", OPENDISTRO_API_DEPRECATION_MESSAGE),
-                    new DeprecatedRoute(POST, "/kibanainfo", OPENDISTRO_API_DEPRECATION_MESSAGE)
+                    new DeprecatedRoute(GET, "/kibanainfo", KIBANAINFO_ROUTE_DEPRECATION_MESSAGE),
+                    new DeprecatedRoute(POST, "/kibanainfo", KIBANAINFO_ROUTE_DEPRECATION_MESSAGE)
                 ),
                 LEGACY_PLUGIN_ROUTE_PREFIX
             )

src/main/java/org/opensearch/security/tools/democonfig/Installer.java

@@ -330,19 +330,21 @@ void setSecurityVariables() {
 
         // Extract OpenSearch version and Security version
         File[] opensearchLibFiles = new File(OPENSEARCH_LIB_PATH).listFiles(
-            pathname -> pathname.getName().matches("opensearch-core-(.*).jar")
+            pathname -> pathname.getName().matches("opensearch-core-(\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?).jar")
         );
 
         if (opensearchLibFiles != null && opensearchLibFiles.length > 0) {
-            OPENSEARCH_VERSION = opensearchLibFiles[0].getName().replaceAll("opensearch-core-(.*).jar", "$1");
+            OPENSEARCH_VERSION = opensearchLibFiles[0].getName()
+                .replaceAll("opensearch-core-(\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?).jar", "$1");
         }
 
         File[] securityFiles = new File(OPENSEARCH_PLUGINS_DIR + "opensearch-security").listFiles(
-            pathname -> pathname.getName().startsWith("opensearch-security-") && pathname.getName().endsWith(".jar")
+            pathname -> pathname.getName().matches("opensearch-security-\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?.jar")
         );
 
         if (securityFiles != null && securityFiles.length > 0) {
-            SECURITY_VERSION = securityFiles[0].getName().replaceAll("opensearch-security-(.*).jar", "$1");
+            SECURITY_VERSION = securityFiles[0].getName()
+                .replaceAll("opensearch-security-(\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?).jar", "$1");
         }
     }
 

src/test/java/org/opensearch/security/tools/democonfig/InstallerTests.java

@@ -118,7 +118,7 @@ public void testGatherUserInputs_withoutAssumeYes() {
 
         // set initsecurity and cluster_mode to no
         readInputStream("y" + System.lineSeparator() + "n" + System.lineSeparator() + "n" + System.lineSeparator()); // pass all 3 inputs as
-                                                                                                                     // y
+        // y
         installer.gatherUserInputs();
 
         verifyStdOutContainsString("Install demo certificates?");
@@ -134,7 +134,7 @@ public void testGatherUserInputs_withoutAssumeYes() {
 
         // set initsecurity and cluster_mode to no
         readInputStream("y" + System.lineSeparator() + "y" + System.lineSeparator() + "y" + System.lineSeparator()); // pass all 3 inputs as
-                                                                                                                     // y
+        // y
         installer.gatherUserInputs();
 
         verifyStdOutContainsString("Install demo certificates?");
@@ -175,7 +175,7 @@ public void testGatherUserInputs_withoutAssumeYes() {
         assertThat(installer.cluster_mode, is(true));
 
         readInputStream("y" + System.lineSeparator() + "y" + System.lineSeparator() + "y" + System.lineSeparator()); // pass all 3 inputs as
-                                                                                                                     // y
+        // y
         installer.gatherUserInputs();
 
         verifyStdOutContainsString("Install demo certificates?");
@@ -307,8 +307,8 @@ public void testSetSecurityVariables() {
         setUpSecurityDirectories();
         installer.setSecurityVariables();
 
-        assertThat(installer.OPENSEARCH_VERSION, is(equalTo("osVersion")));
-        assertThat(installer.SECURITY_VERSION, is(equalTo("version")));
+        assertThat(installer.OPENSEARCH_VERSION, is(equalTo("3.0.0-Version")));
+        assertThat(installer.SECURITY_VERSION, is(equalTo("3.0.0.0-version")));
         tearDownSecurityDirectories();
     }
 
@@ -481,8 +481,11 @@ public void setUpSecurityDirectories() {
         createDirectory(installer.OPENSEARCH_LIB_PATH);
         createDirectory(installer.OPENSEARCH_CONF_DIR);
         createDirectory(installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security");
-        createFile(installer.OPENSEARCH_LIB_PATH + "opensearch-core-osVersion.jar");
-        createFile(installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security" + File.separator + "opensearch-security-version.jar");
+        createFile(installer.OPENSEARCH_LIB_PATH + "opensearch-core-3.0.0-Version.jar");
+        createFile(
+            installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security" + File.separator + "opensearch-security-common-3.0.0.0-version.jar"
+        );
+        createFile(installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security" + File.separator + "opensearch-security-3.0.0.0-version.jar");
         createFile(installer.OPENSEARCH_CONF_DIR + File.separator + "securityadmin_demo.sh");
     }