修复TCP首次连接可能被重置的问题

Author: zhaochengyu

readme.md

@@ -57,7 +57,7 @@ SLEEP_TIME = 0.01
 [ADVANCED-CONFIG]
 SOCKS5 = True
 ```
-* 将stinger_server.exe和config.ini上传到目标服务器同一目录,菜刀(蚁剑)执行mirror_server.exe启动服务端
+* 将stinger_server.exe和config.ini上传到目标服务器同一目录,菜刀(蚁剑)执行stinger_server.exe启动服务端
 * stinger_client和config.ini拷贝到本地PC的同一目录,命令行执行stinger_client,生成如下输出表示成功
 ```
 2019-09-29 13:03:41,164 - INFO - 215 - Use SERVER_LISTEN as REMOTE_SERVER
@@ -86,7 +86,9 @@ SOCK5: True
 * 此时已经你本地10800启动了一个192.168.3.10所在内网的socks5代理
 # 相关工具
 [https://github.com/nccgroup/ABPTTS](https://github.com/nccgroup/ABPTTS)
+
 [https://github.com/sensepost/reGeorg](https://github.com/sensepost/reGeorg)
+
 [https://github.com/SECFORCE/Tunna](https://github.com/SECFORCE/Tunna)
 # 已测试
 ## stinger_server\stinger_client
@@ -101,3 +103,13 @@ SOCK5: True
 更新时间: 2019-09-29
 * 1.0正式版发布
 
+**1.1**
+更新时间: 2019-10-25
+* 增加SOCKET_TIMEOUT参数
+* 适配https网站
+* 服务端增加socket重试机制,增强socket健壮性
+
+**1.2**
+更新时间: 2019-11-23
+* 修复TCP首次连接可能被重置的问题
+

stinger_client.py

@@ -159,16 +159,26 @@ def sync_data(self):
         if CLEAN_DIE:
             for client_address in list(cache_conns.keys()):
                 if web_return_data.get(client_address) is None:
-                    logger.warning("CLIENT_ADDRESS:{} remove client not in server cache_conns".format(client_address))
-                    self.die_client_address.append(client_address)
+                    if cache_conns.get(client_address).get("new") is True:
+                        cache_conns[client_address]["new"] = False
+                        pass
+                    else:
+                        logger.warning(
+                            "CLIENT_ADDRESS:{} remove client not in server CHCHE_CONNS".format(client_address))
+                        logger.warning("CLIENT_ADDRESS:{} append in die_client_address".format(client_address))
+                        self.die_client_address.append(client_address)
+
 
 
 class TCPClient(BaseRequestHandler):
     def handle(self):
         logger.warning('Got connection from {}'.format(self.client_address))
         self.request.settimeout(SOCKET_TIMEOUT)
         key = "{}:{}".format(self.client_address[0], self.client_address[1])
-        cache_conns[key] = {"conn": self.request}
+        cache_conns[key] = {
+            "conn": self.request,
+            "new": True,  # 新的连接,第一次检查略过
+        }
         while True:
             time.sleep(10)  # 维持tcp连接
 
@@ -198,7 +208,7 @@ def handle(self):
         READ_BUFF_SIZE = int(configini.get("TOOL-CONFIG", "READ_BUFF_SIZE"))
     except Exception as E:
         logger.exception(E)
-        READ_BUFF_SIZE = 10240
+        READ_BUFF_SIZE = 51200
 
     try:
         SLEEP_TIME = float(configini.get("TOOL-CONFIG", "SLEEP_TIME"))
@@ -208,7 +218,6 @@ def handle(self):
         logger.exception(E)
         SLEEP_TIME = 0.1
 
-    READ_BUFF_SIZE = 10240
 
     # socket_timeout
     try:

webshell/proxy.jsp

@@ -27,7 +27,7 @@
                 }
             } catch (Exception e) {
                 System.out.println("error to send post！" + e);
-                return e.toString();
+                return "30" + e.toString();
             } finally {
                 try {
                     if (ou != null) {
@@ -37,7 +37,7 @@
                         in.close();
                     }
                 } catch (IOException ex) {
-                    return ex.toString();
+                    return "40" +ex.toString();
                 }
             }
             return result;