Update to jline 3.x to resolve CVE

lib/readline/version.rb

@@ -1,6 +1,6 @@
 module Readline
   module Version
     VERSION = "1.3.6"
-    JLINE_VERSION = "2.14.6"
+    JLINE_VERSION = "3.21.0"
   end
 end

readline.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.files = Dir['[A-Z]*'] + Dir['lib/**/*']
   s.platform = 'java'
   s.required_ruby_version = '>= 2.3'
-  s.requirements << "jar jline:jline, #{Readline::Version::JLINE_VERSION}"
+  s.requirements << "jar org.jline:jline, #{Readline::Version::JLINE_VERSION}"
 end
 
 # vim: syntax=Ruby

src/main/java/org/jruby/demo/readline/TextAreaReadline.java

@@ -36,6 +36,8 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.Join;
+import org.jline.reader.Candidate;
+import org.jline.reader.impl.DefaultParser;
 
 public class TextAreaReadline implements KeyListener {
     private static final String EMPTY_LINE = "";
@@ -315,7 +317,7 @@ protected void completeAction(KeyEvent event) {
 
         if (completePopup.isVisible()) return;
 
-        List candidates = new LinkedList();
+        List<Candidate> candidates = new LinkedList<Candidate>();
         String bufstr = null;
         try {
             bufstr = area.getText(startPos, area.getCaretPosition() - startPos);
@@ -325,25 +327,25 @@ protected void completeAction(KeyEvent event) {
 
         int cursor = area.getCaretPosition() - startPos;
 
-        int position = Readline.getCompletor(Readline.getHolder(runtime)).complete(bufstr, cursor, candidates);
+        Readline.getCompletor(Readline.getHolder(runtime)).complete(Readline.getHolder(runtime).readline, new DefaultParser().parse(bufstr, cursor), candidates);
 
         // no candidates? Fail.
         if (candidates.isEmpty()) {
             return;
         }
 
         if (candidates.size() == 1) {
-            replaceText(startPos + position, area.getCaretPosition(), (String) candidates.get(0));
+            replaceText(startPos, area.getCaretPosition(), candidates.get(0).value());
             return;
         }
 
-        start = startPos + position;
+        start = startPos;
         end = area.getCaretPosition();
 
         Point pos = area.getCaret().getMagicCaretPosition();
 
         // bit risky if someone changes completor, but useful for method calls
-        int cutoff = bufstr.substring(position).lastIndexOf('.') + 1;
+        int cutoff = bufstr.lastIndexOf('.') + 1;
         start += cutoff;
 
         if (candidates.size() < 10) {
@@ -353,8 +355,8 @@ protected void completeAction(KeyEvent event) {
         }
 
         completeCombo.removeAllItems();
-        for (Iterator i = candidates.iterator(); i.hasNext();) {
-            String item = (String) i.next();
+        for (Candidate c : candidates) {
+            String item = c.value();
             if (cutoff != 0) item = item.substring(cutoff);
             completeCombo.addItem(item);
         }
@@ -378,15 +380,8 @@ protected void upAction(KeyEvent event) {
             return;
         }
 
-        if (!Readline.getHistory(Readline.getHolder(runtime)).next()) {
-            currentLine = getLine(); // at end
-        } else {
-            Readline.getHistory(Readline.getHolder(runtime)).previous(); //undo check
-        }
-
-        if (!Readline.getHistory(Readline.getHolder(runtime)).previous()) return;
-
-        String oldLine = Readline.getHistory(Readline.getHolder(runtime)).current().toString().trim();
+        Readline.getHolder(runtime).readline.getHistory().previous();
+        String oldLine = Readline.getHolder(runtime).readline.getHistory().current().toString().trim();
         replaceText(startPos, area.getDocument().getLength(), oldLine);
     }
 
@@ -400,16 +395,8 @@ protected void downAction(KeyEvent event) {
             return;
         }
 
-        if (!Readline.getHistory(Readline.getHolder(runtime)).next()) return;
-
-        String oldLine;
-        if (!Readline.getHistory(Readline.getHolder(runtime)).next()) {
-            oldLine = currentLine; // at end
-        } else {
-            Readline.getHistory(Readline.getHolder(runtime)).previous(); // undo check
-            oldLine = Readline.getHistory(Readline.getHolder(runtime)).current().toString().trim();
-        }
-
+        Readline.getHolder(runtime).readline.getHistory().next();
+        String oldLine = Readline.getHolder(runtime).readline.getHistory().current().toString().trim();
         replaceText(startPos, area.getDocument().getLength(), oldLine);
     }
 
@@ -460,7 +447,7 @@ public void run() {
                append(" ", inputStyle); // hack to get right style for input
                area.setCaretPosition(area.getDocument().getLength());
                startPos = area.getDocument().getLength();
-               Readline.getHistory(Readline.getHolder(runtime)).moveToEnd();
+               Readline.getHolder(runtime).readline.getHistory().moveToEnd();
             }
         });
 
@@ -616,4 +603,4 @@ public void write(byte[] b) {
             writeLine(RubyEncoding.decodeUTF8(b));
         }
     }
-}
+}