Merge pull request #5299 from payara/FISH-1423-disable-escaping-asadmin

FISH-1423 disable escaping asadmin
payara · Jun 16, 2021 · baf5e6a · baf5e6a
2 parents 8939b26 + d0b1a4d
commit baf5e6a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2018-2019] Payara Foundation and/or affiliates
+// Portions Copyright [2018-2021] Payara Foundation and/or affiliates
 
 package com.sun.enterprise.admin.cli;
 
@@ -1440,12 +1440,25 @@ protected void buildTerminal() {
 
     protected void buildLineReader() {
         if (lineReader == null) {
-            lineReader = LineReaderBuilder.builder()
+            lineReader = newLineReaderBuilder()
                     .terminal(terminal)
                     .build();
         }
     }
 
+    protected LineReaderBuilder newLineReaderBuilder() {
+        // In community this should be disabled by default
+        boolean disabled = true;
+        Environment environment = this.env;
+        if(environment.hasOption("DISABLE_EVENT_EXPANSION")) {
+            disabled = environment.getBooleanOption("DISABLE_EVENT_EXPANSION");
+        }
+        return LineReaderBuilder.builder()
+            .appName(ASADMIN)
+            // disable event expansion because it swallows backslashes and we don't need to support events
+            .option(LineReader.Option.DISABLE_EVENT_EXPANSION, disabled);
+    }
+
     protected void closeTerminal() {
         try {
             if (terminal != null) {

diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2018-2019] Payara Foundation and/or affiliates
+// Portions Copyright [2018-2021] Payara Foundation and/or affiliates
 
 package com.sun.enterprise.admin.cli;
 
@@ -61,7 +61,6 @@
 import org.jline.reader.Completer;
 import org.jline.reader.EndOfFileException;
 import org.jline.reader.LineReader;
-import org.jline.reader.LineReaderBuilder;
 import org.jline.reader.UserInterruptException;
 import org.jline.reader.impl.completer.StringsCompleter;
 import org.jline.terminal.Terminal;
@@ -149,8 +148,7 @@ protected int executeCommand() throws CommandException, CommandValidationExcepti
                         .encoding(encoding != null ? Charset.forName(encoding) : Charset.defaultCharset())
                         .build();
 
-                reader = LineReaderBuilder.builder()
-                        .appName(ASADMIN)
+                reader = newLineReaderBuilder()
                         .terminal(asadminTerminal)
                         .completer(completer)
                         .build();
@@ -183,9 +181,8 @@ public void write(byte[] b, int off, int len) throws IOException {
                 Terminal asadminTerminal = new ExternalTerminal(ASADMIN, "",
                         new FileInputStream(file), out, encoding != null ? Charset.forName(encoding) : Charset.defaultCharset());
 
-                reader = LineReaderBuilder.builder()
+                reader = newLineReaderBuilder()
                         .terminal(asadminTerminal)
-                        .appName(ASADMIN)
                         .build();
             }