Merge pull request #3511, apply #2925 to branch 2.6.x (to make telnet…

… config work again).
apache · Feb 20, 2019 · 0f9cef9 · 0f9cef9
1 parent 54e14e9
commit 0f9cef9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java
@@ -641,6 +641,8 @@ public class Constants {
 
     public static final String FORCE_USE_TAG = "dubbo.force.tag";
 
+    public static final String TELNET = "telnet";
+
     /*
      * private Constants(){ }
      */

diff --git a/...ing-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java b/...ing-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java
@@ -17,7 +17,9 @@
 package com.alibaba.dubbo.remoting.telnet.support;
 
 import com.alibaba.dubbo.common.Constants;
+import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
+import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.dubbo.remoting.Channel;
 import com.alibaba.dubbo.remoting.RemotingException;
 import com.alibaba.dubbo.remoting.telnet.TelnetHandler;
@@ -49,14 +51,20 @@ public String telnet(Channel channel, String message) throws RemotingException {
         }
         if (command.length() > 0) {
             if (extensionLoader.hasExtension(command)) {
-                try {
-                    String result = extensionLoader.getExtension(command).telnet(channel, message);
-                    if (result == null) {
-                        return null;
+                if (commandEnabled(channel.getUrl(), command)) {
+                    try {
+                        String result = extensionLoader.getExtension(command).telnet(channel, message);
+                        if (result == null) {
+                            return null;
+                        }
+                        buf.append(result);
+                    } catch (Throwable t) {
+                        buf.append(t.getMessage());
                     }
-                    buf.append(result);
-                } catch (Throwable t) {
-                    buf.append(t.getMessage());
+                } else {
+                    buf.append("Command: ");
+                    buf.append(command);
+                    buf.append(" disabled");
                 }
             } else {
                 buf.append("Unsupported command: ");
@@ -72,4 +80,21 @@ public String telnet(Channel channel, String message) throws RemotingException {
         return buf.toString();
     }
 
+    private boolean commandEnabled(URL url, String command) {
+        boolean commandEnable = false;
+        String supportCommands = url.getParameter(Constants.TELNET);
+        if (StringUtils.isEmpty(supportCommands)) {
+            commandEnable = true;
+        } else {
+            String[] commands = Constants.COMMA_SPLIT_PATTERN.split(supportCommands);
+            for (String c : commands) {
+                if (command.equals(c)) {
+                    commandEnable = true;
+                    break;
+                }
+            }
+        }
+        return commandEnable;
+    }
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -641,6 +641,8 @@ public class Constants { @@
         public static final String FORCE_USE_TAG = "dubbo.force.tag";
+        public static final String TELNET = "telnet";
         /*
          * private Constants(){ }
          */
@@ Expand Down @@