From 6fb1e4a75990c6ee4975604d146a8e1b44c78ab1 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Fri, 1 Jun 2018 15:00:41 -0400
Subject: [PATCH] Fix handling of percent-encoded spaces in Windows batch files
 (#31034)

If you invoke elasticsearch-plugin (or any other CLI script on Windows)
with a path that has a percent-encoded space (or any other
percent-encoded character) because the CLI scripts now shell into a
common shell script (elasticsearch-cli) the percent-encoded space ends
up being interpreted as a parameter. For example passing install --batch
file:/c:/encoded%20%space/analysis-icu-7.0.0.zip to elasticsearch-plugin
leads to the %20 being interpreted as %2 followed by a zero. Here, the
%2 is interpreted as the second parameter (--batch) and the
InstallPluginCommand class ends up seeing
file:/c/encoded--batch0space/analysis-icu-7.0.0.zip as the path which
will not exist. This commit addresses this by escaping the %* that is
used to pass the parameters to the common CLI script so that the common
script sees the correct parameters without the %2 being substituted.
---
 distribution/src/bin/elasticsearch-keystore.bat                 | 2 +-
 distribution/src/bin/elasticsearch-plugin.bat                   | 2 +-
 distribution/src/bin/elasticsearch-translog.bat                 | 2 +-
 x-pack/plugin/security/src/main/bin/elasticsearch-certgen.bat   | 2 +-
 x-pack/plugin/security/src/main/bin/elasticsearch-certutil.bat  | 2 +-
 x-pack/plugin/security/src/main/bin/elasticsearch-migrate.bat   | 2 +-
 .../security/src/main/bin/elasticsearch-saml-metadata.bat       | 2 +-
 .../security/src/main/bin/elasticsearch-setup-passwords.bat     | 2 +-
 x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen.bat | 2 +-
 x-pack/plugin/security/src/main/bin/elasticsearch-users.bat     | 2 +-
 x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval.bat   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/distribution/src/bin/elasticsearch-keystore.bat b/distribution/src/bin/elasticsearch-keystore.bat
index 9bd72a65745a9..380a3e501d57e 100644
--- a/distribution/src/bin/elasticsearch-keystore.bat
+++ b/distribution/src/bin/elasticsearch-keystore.bat
@@ -5,7 +5,7 @@ setlocal enableextensions
 
 call "%~dp0elasticsearch-cli.bat" ^
    org.elasticsearch.common.settings.KeyStoreCli ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/distribution/src/bin/elasticsearch-plugin.bat b/distribution/src/bin/elasticsearch-plugin.bat
index c9a8e9748f149..5d7b1d7a8283d 100644
--- a/distribution/src/bin/elasticsearch-plugin.bat
+++ b/distribution/src/bin/elasticsearch-plugin.bat
@@ -6,7 +6,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/plugin-cli
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.plugins.PluginCli ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/distribution/src/bin/elasticsearch-translog.bat b/distribution/src/bin/elasticsearch-translog.bat
index 37d96bbed6c4e..9c4cefcf2fe64 100644
--- a/distribution/src/bin/elasticsearch-translog.bat
+++ b/distribution/src/bin/elasticsearch-translog.bat
@@ -5,7 +5,7 @@ setlocal enableextensions
 
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.index.translog.TranslogToolCli ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/security/src/main/bin/elasticsearch-certgen.bat b/x-pack/plugin/security/src/main/bin/elasticsearch-certgen.bat
index 8c8a0c69f5626..01f3c0f21cd77 100644
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-certgen.bat
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-certgen.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.core.ssl.CertificateGenerateTool ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/security/src/main/bin/elasticsearch-certutil.bat b/x-pack/plugin/security/src/main/bin/elasticsearch-certutil.bat
index f898f885ce0a3..f8a5fd9880a62 100644
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-certutil.bat
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-certutil.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.core.ssl.CertificateTool ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/security/src/main/bin/elasticsearch-migrate.bat b/x-pack/plugin/security/src/main/bin/elasticsearch-migrate.bat
index f9486979e6bc3..67faf2ea66afc 100644
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-migrate.bat
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-migrate.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.security.authc.esnative.ESNativeRealmMigrateTool ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/security/src/main/bin/elasticsearch-saml-metadata.bat b/x-pack/plugin/security/src/main/bin/elasticsearch-saml-metadata.bat
index 4ddb8da3ff143..6cdd539a81da3 100644
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-saml-metadata.bat
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-saml-metadata.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.security.authc.saml.SamlMetadataCommand ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/security/src/main/bin/elasticsearch-setup-passwords.bat b/x-pack/plugin/security/src/main/bin/elasticsearch-setup-passwords.bat
index f380e5f55271f..e3ea134ae43b3 100644
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-setup-passwords.bat
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-setup-passwords.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.security.authc.esnative.tool.SetupPasswordTool ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen.bat b/x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen.bat
index 1eff4aad8251e..570eef619ec28 100644
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen.bat
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.security.crypto.tool.SystemKeyTool ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/security/src/main/bin/elasticsearch-users.bat b/x-pack/plugin/security/src/main/bin/elasticsearch-users.bat
index 7f7347d706ff5..2975fbe87b976 100644
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-users.bat
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-users.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.security.authc.file.tool.UsersTool ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal
diff --git a/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval.bat b/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval.bat
index 37ca14dd094cc..281b06cf77b17 100644
--- a/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval.bat
+++ b/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval.bat
@@ -10,7 +10,7 @@ setlocal enableextensions
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-watcher-env
 call "%~dp0elasticsearch-cli.bat" ^
   org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool ^
-  %* ^
+  %%* ^
   || exit /b 1
 
 endlocal