fix actframework#462 and actframework#464

greenlaw110 · greenlaw110 · commit c5299f3b64c0 · 2018-01-13T09:37:50.000+11:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * ApiManager prints a lot of warning messages #466
 * `ClassCastException` caused by `@CacheFor` #465
 * Show entry URL on the console #463
+* It displays control characters in the Eclipse console #462
+* Limit the access to CLI service #464
 
 **1.6.2 11/Jan/2018**
 * Add string resolver for `java.sql.Date` and `java.sql.Timestamp` #460
diff --git a/src/main/java/act/app/CliServer.java b/src/main/java/act/app/CliServer.java
@@ -32,6 +32,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.List;
@@ -82,6 +83,12 @@ public void run() {
             Socket socket;
             try {
                 socket = serverSocket.accept();
+                InetAddress addr = socket.getInetAddress();
+                if (!addr.isLoopbackAddress()) {
+                    logger.warn("remote connection request rejected: " + addr.getHostAddress());
+                    socket.close();
+                    continue;
+                }
                 CliSession session = new CliSession(socket, this);
                 sessions.put(session.id(), session);
                 executor.submit(session);
diff --git a/src/main/java/act/conf/AppConfig.java b/src/main/java/act/conf/AppConfig.java
@@ -520,7 +520,7 @@ protected T cliEnable(boolean enable) {
 
     public boolean cliEnabled() {
         if (null == cliEnabled) {
-            cliEnabled = get(CLI_ENABLED, true);
+            cliEnabled = get(CLI_ENABLED, Act.isDev());
         }
         return cliEnabled;
     }
diff --git a/src/main/java/act/conf/AppConfigKey.java b/src/main/java/act/conf/AppConfigKey.java
@@ -122,7 +122,7 @@ public enum AppConfigKey implements ConfigKey {
      *
      * Turn on/off CLI server support
      *
-     * Default value: {@code true}
+     * Default value: `true` on dev mode and `false` on prod mode
      */
     CLI_ENABLED("cli.enabled"),
 
diff --git a/src/main/java/act/util/Banner.java b/src/main/java/act/util/Banner.java
@@ -218,9 +218,13 @@ private static String udfBanner() {
     }
 
     private static String poweredBy(int width, String actVersion, boolean center) {
-        String raw = S.concat("powered by @|bold ActFramework|@ ", actVersion);
-        String poweredBy = Ansi.ansi().render(raw).toString();
-        int pw = raw.length() - 9;
+        String poweredBy = "powered by ActFramework ";
+        int pw = poweredBy.length();
+        if (supportAnsi()) {
+            String raw = S.concat("powered by @|bold ActFramework|@ ", actVersion);
+            poweredBy = Ansi.ansi().render(raw).toString();
+            pw = raw.length() - 9;
+        }
         int gap = width - pw;
         gap = Math.max(gap, 0);
         if (gap == 0) {
@@ -232,4 +236,9 @@ private static String poweredBy(int width, String actVersion, boolean center) {
         return S.concat(S.times(" ", gap), poweredBy);
     }
 
+    private static boolean supportAnsi() {
+        // eclipse project does not support ansi
+        return !new File(".project").exists();
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ protected T cliEnable(boolean enable) {`
`520`	`520`
`521`	`521`	`public boolean cliEnabled() {`
`522`	`522`	`if (null == cliEnabled) {`
`523`		`- cliEnabled = get(CLI_ENABLED, true);`
	`523`	`+ cliEnabled = get(CLI_ENABLED, Act.isDev());`
`524`	`524`	`}`
`525`	`525`	`return cliEnabled;`
`526`	`526`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public enum AppConfigKey implements ConfigKey {`
`122`	`122`	`*`
`123`	`123`	`* Turn on/off CLI server support`
`124`	`124`	`*`
`125`		`- * Default value: {@code true}`
	`125`	+ * Default value: `true` on dev mode and `false` on prod mode
`126`	`126`	`*/`
`127`	`127`	`CLI_ENABLED("cli.enabled"),`
`128`	`128`