# support cli to config

zk-123 · Jan 30, 2019 · 8883919 · 8883919
1 parent aa245f8
commit 8883919
Show file tree

Hide file tree

Showing 7 changed files with 154 additions and 10 deletions.
diff --git a/http-server/pom.xml b/http-server/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.zkdcloud.proxy</groupId>
     <artifactId>http-server</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/http-server/src/main/java/com/zkdcloud/proxy/http/ServerStart.java b/http-server/src/main/java/com/zkdcloud/proxy/http/ServerStart.java
@@ -1,7 +1,7 @@
 package com.zkdcloud.proxy.http;
 
 import com.zkdcloud.proxy.http.handler.JudgeHttpTypeHandler;
-import com.zkdcloud.proxy.http.util.ServerConfigure;
+import com.zkdcloud.proxy.http.config.ServerConfigure;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.Channel;

diff --git a/...loud/proxy/http/util/ServerConfigure.java → ...ud/proxy/http/config/ServerConfigure.java b/...loud/proxy/http/util/ServerConfigure.java → ...ud/proxy/http/config/ServerConfigure.java
@@ -1,4 +1,4 @@
-package com.zkdcloud.proxy.http.util;
+package com.zkdcloud.proxy.http.config;
 
 /**
  * server config

diff --git a/socks5-server/pom.xml b/socks5-server/pom.xml
@@ -5,12 +5,13 @@
     <groupId>com.zkdcloud.proxy</groupId>
     <artifactId>socks5-server</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <netty.version>4.1.9.Final</netty.version>
         <logback.version>1.1.7</logback.version>
+        <apache.commons.cli>1.4</apache.commons.cli>
     </properties>
 
     <dependencies>
@@ -20,6 +21,12 @@
             <version>${netty.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>${apache.commons.cli}</version>
+        </dependency>
+
         <!-- logback -->
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/socks5-server/src/main/java/com/zkdcloud/proxy/socks5/ServerStart.java b/socks5-server/src/main/java/com/zkdcloud/proxy/socks5/ServerStart.java
@@ -1,5 +1,6 @@
 package com.zkdcloud.proxy.socks5;
 
+import com.zkdcloud.proxy.socks5.config.ServerConfigure;
 import com.zkdcloud.proxy.socks5.handler.Socks5ServerDoorHandler;
 import com.zkdcloud.proxy.socks5.handler.Socks5ServerEncoder;
 import io.netty.bootstrap.ServerBootstrap;
@@ -12,9 +13,12 @@
 import io.netty.handler.timeout.IdleStateEvent;
 import io.netty.handler.timeout.IdleStateHandler;
 import io.netty.util.concurrent.DefaultThreadFactory;
+import org.apache.commons.cli.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -28,20 +32,24 @@ public class ServerStart {
      * static logger
      */
     private static Logger logger = LoggerFactory.getLogger(ServerStart.class);
-    private static NioEventLoopGroup bossGroup = new NioEventLoopGroup(1);
-    private static NioEventLoopGroup workGroup = new NioEventLoopGroup(Math.min(Runtime.getRuntime().availableProcessors() + 1, 32),
-            new DefaultThreadFactory("proxy-workers"));
+    private static NioEventLoopGroup bossGroup;
+    private static NioEventLoopGroup workGroup;
 
     public static void main(String[] args) throws InterruptedException {
+        // init args
+        initCliArgs(args);
         ServerBootstrap serverBootstrap = new ServerBootstrap();
+        bossGroup = new NioEventLoopGroup(1);
+        workGroup = new NioEventLoopGroup(serverConfigure.getNumberWorkers(),
+                new DefaultThreadFactory("proxy-workers"));
 
         serverBootstrap.group(bossGroup,workGroup)
                 .channel(NioServerSocketChannel.class)
                 .childHandler(new ChannelInitializer<Channel>() {
                     @Override
                     protected void initChannel(Channel ch) throws Exception {
                         ch.pipeline()
-                                .addFirst("idle", new IdleStateHandler(0, 0, 7, TimeUnit.MINUTES){
+                                .addFirst("idle", new IdleStateHandler(0, 0, serverConfigure.getSecondsClientIdle(), TimeUnit.SECONDS){
                                     private Logger logger = LoggerFactory.getLogger("client idle logger");
                                     @Override
                                     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
@@ -56,9 +64,91 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                                 .addLast(new Socks5ServerEncoder());
                     }
                 });
-        int port = args != null && args.length >= 1 ? Integer.parseInt(args[0]) : 1081;
+        int port = serverConfigure.getPort();
         logger.info("socks5 server start at : : {}", port);
 
         serverBootstrap.bind(port).sync().channel().closeFuture().sync();
     }
+
+    public static ServerConfigure serverConfigure = new ServerConfigure();
+    private static Options OPTIONS = new Options();
+    private static CommandLine commandLine;
+    private static String HELP_STRING = null;
+
+    /**
+     * init args
+     *
+     * @param args args
+     */
+    private static void initCliArgs(String[] args) {
+        // validate args
+        {
+            CommandLineParser commandLineParser = new DefaultParser();
+            // help
+            OPTIONS.addOption("help","usage help");
+            // port
+            OPTIONS.addOption(Option.builder("p").hasArg(true).longOpt("port").type(Short.TYPE).desc("the port of server startup").build());
+            // number fo workers thread
+            OPTIONS.addOption(Option.builder("n").hasArg(true).longOpt("number_workers").type(Short.TYPE).desc("the number of workers thread").build());
+            // client idle seconds
+            OPTIONS.addOption(Option.builder("c").hasArg(true).longOpt("seconds_client_idle").type(Long.TYPE).desc("the seconds of client idle").build());
+            // remote idle seconds
+            OPTIONS.addOption(Option.builder("r").hasArg(true).longOpt("seconds_remote_idle").type(Long.TYPE).desc("the seconds of remote idle").build());
+            try {
+                commandLine = commandLineParser.parse(OPTIONS, args);
+            } catch (ParseException e) {
+                logger.error("{}\n{}", e.getMessage(), getHelpString());
+                System.exit(0);
+            }
+        }
+
+        // init serverConfigure
+        {
+            if(commandLine.hasOption("help")){
+                logger.info("\n" + getHelpString());
+                System.exit(1);
+            }
+            // server port
+            String portOptionValue = commandLine.getOptionValue("p");
+            short port = portOptionValue == null || "".equals(portOptionValue) ? 1081 : Short.parseShort(portOptionValue);
+            serverConfigure.setPort(port);
+
+            // netty workers thread number(client)
+            String numberWorksOptionValue = commandLine.getOptionValue("n");
+            short numberWorks = numberWorksOptionValue == null || "".equals(numberWorksOptionValue) ?
+                    (short) Math.min(Runtime.getRuntime().availableProcessors() + 1, 32) : Short.parseShort(numberWorksOptionValue);
+            serverConfigure.setNumberWorkers(numberWorks);
+
+            // client idle seconds, default is 1 min
+            String scOptionValue = commandLine.getOptionValue("c");
+            short secondsClientIdle = scOptionValue == null || "".equals(scOptionValue) ? 60 : Short.parseShort(scOptionValue);
+            serverConfigure.setSecondsClientIdle(secondsClientIdle);
+
+            // remote idle seconds, default is 1min
+            String srOptionValue = commandLine.getOptionValue("r");
+            short secondsRemoteIdle = srOptionValue == null || "".equals(srOptionValue) ? 60 : Short.parseShort(srOptionValue);
+            serverConfigure.setSecondsRemoteIdle(secondsRemoteIdle);
+        }
+
+    }
+
+    /**
+     * get string of help usage
+     *
+     * @return help string
+     */
+    private static String getHelpString() {
+        if (HELP_STRING == null) {
+            HelpFormatter helpFormatter = new HelpFormatter();
+
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            PrintWriter printWriter = new PrintWriter(byteArrayOutputStream);
+            helpFormatter.printHelp(printWriter, HelpFormatter.DEFAULT_WIDTH, "socks server proxy", null,
+                    OPTIONS, HelpFormatter.DEFAULT_LEFT_PAD, HelpFormatter.DEFAULT_DESC_PAD, null);
+            printWriter.flush();
+            HELP_STRING = new String(byteArrayOutputStream.toByteArray());
+            printWriter.close();
+        }
+        return HELP_STRING;
+    }
 }
diff --git a/socks5-server/src/main/java/com/zkdcloud/proxy/socks5/config/ServerConfigure.java b/socks5-server/src/main/java/com/zkdcloud/proxy/socks5/config/ServerConfigure.java
@@ -0,0 +1,46 @@
+package com.zkdcloud.proxy.socks5.config;
+
+/**
+ * server config
+ *
+ * @author zk
+ * @since 2019/1/30
+ */
+public class ServerConfigure {
+    private short port;
+    private short numberWorkers;
+    private long secondsClientIdle;
+    private long secondsRemoteIdle;
+
+    public short getPort() {
+        return port;
+    }
+
+    public void setPort(short port) {
+        this.port = port;
+    }
+
+    public short getNumberWorkers() {
+        return numberWorkers;
+    }
+
+    public void setNumberWorkers(short numberWorkers) {
+        this.numberWorkers = numberWorkers;
+    }
+
+    public long getSecondsClientIdle() {
+        return secondsClientIdle;
+    }
+
+    public void setSecondsClientIdle(long secondsClientIdle) {
+        this.secondsClientIdle = secondsClientIdle;
+    }
+
+    public long getSecondsRemoteIdle() {
+        return secondsRemoteIdle;
+    }
+
+    public void setSecondsRemoteIdle(long secondsRemoteIdle) {
+        this.secondsRemoteIdle = secondsRemoteIdle;
+    }
+}
diff --git a/socks5-server/src/main/java/com/zkdcloud/proxy/socks5/handler/Socks5ServerDoorHandler.java b/socks5-server/src/main/java/com/zkdcloud/proxy/socks5/handler/Socks5ServerDoorHandler.java
@@ -1,5 +1,6 @@
 package com.zkdcloud.proxy.socks5.handler;
 
+import com.zkdcloud.proxy.socks5.ServerStart;
 import com.zkdcloud.proxy.socks5.context.ChannelContextConst;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.ByteBuf;
@@ -94,7 +95,7 @@ private void buildLocalConnect(final InetSocketAddress dstAddress, final Channel
                     .handler(new ChannelInitializer<SocketChannel>() {
                         @Override
                         protected void initChannel(SocketChannel ch) throws Exception {
-                            ch.pipeline().addFirst("idle", new IdleStateHandler(0, 0, 30, TimeUnit.SECONDS) {
+                            ch.pipeline().addFirst("idle", new IdleStateHandler(0, 0, ServerStart.serverConfigure.getSecondsRemoteIdle(), TimeUnit.SECONDS) {
                                         private Logger logger = LoggerFactory.getLogger("remote idle logger");
 
                                         @Override