Merge pull request #10 from libxengine/develop

V1.7.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,25 @@
+XEngine_ProxyServer V1.7.0.1001
+
+增加:转发协议支持用户验证了
+修改:用户验证从本地用户验证修改为http用户验证
+修改:http转发包协议现在有code和msg字段了
+修改:ModuleSession_Forward_Get是否登录处理
+修改:转发列表和绑定协议错误处理方法
+修改:转发协议请求必须登录了
+修正:套接字验证类型不正确
+删除:SOCKS和TUNNEL代理启动参数支持
+删除:解绑协议支持,因为不会被使用到
+
+added:forward user verifacation supported
+modify:user verifacation modify to http pass from local user
+modify:http forward packet protocol have code and msg field
+modify:ModuleSession_Forward_Get supported addr whether login
+modify:forward list and bind protocol error process way
+modify:forward must be login now
+fixed:socks ver type is incorrent
+delete:socks and tunnel start parament supported
+delete:unbind protocol,because that does not work
+======================================================================================
 XEngine_ProxyServer V1.6.0.1001
 
 增加:数据转发解绑协议支持

README.en.md

@@ -14,7 +14,7 @@ This software is a standard proxy server that supports Socks5 and HTTP tunnel pr
 this software support following features  
 1. SOCKS5 proxy  
 2. Tunnel proxy  
-3. forward proxy
+3. TCP forward proxy
 4. support Permission Validation  
 5. operator log  
 6. encrypt Communication(planning)  

README.md

@@ -12,15 +12,15 @@ c c++ Socks5 Proxy Service,HTTP Tunnel Proxy Service,tcp forward service
 此软件是一款标准的代理服务器,支持Socks5和HTTP的隧道代理  
 ## 软件特性
 此软件支持以下特性  
-1. SOCKS5代理  
-2. Tunnel代理 
-3. 数据转发服务 
-4. 权限验证  
+1. SOCKS5代理
+2. Tunnel代理
+3. TCP数据转发服务
+4. 权限验证
 5. 操作日志
-6. 加密通信(planning)  
-7. 负载均衡(planning)  
-8. 自定义证书代理协议(planning)  
-9. 多级代理(planning)  
+6. 加密通信(planning)
+7. 负载均衡(planning)
+8. 自定义证书代理协议(planning)
+9. 多级代理(planning)
 
 ## 安装教程
 
@@ -87,11 +87,11 @@ make FLAGS=CleanAll 清理编译
 
 ## 开发计划
 透传代理  
-转发代理支持权限和确认  
 支持加密代理  
 转发代理绑定解绑支持附加用户信息  
 转发代理绑定支持拒绝  
-转发代理支持用户验证  
+支持UDP转发代理  
+性能优化  
 
 ## 关注我们
 如果你觉得这个软件对你有帮助,请你给我们一个START吧

XEngine_Docment/Docment_en.docx

@@ -23,10 +23,11 @@
     "tszLogFile": "./XEngine_Log/XEngine_ProxyServiceApp.log"
   },
   "XAuth": {
-    "bAuth": 0,
-    "tszAuthFile": "./XEngine_Config/UserList.txt"
+    "bAuth": false,
+    "tszAuthUrl": ""
   },
   "XVer": [
+    "1.7.0.1001 Build20240104",
     "1.6.0.1001 Build20230817",
     "1.5.1.1001 Build20230426",
     "1.5.0.1001 Build20230202",

XEngine_Docment/Docment_zh.docx

@@ -4,14 +4,12 @@ PLATFORM=linux
 FLAGS= 
 #要编译的模块
 THIRDPART_MODULE_JSONCPP = ./XEngine_ThirdPart/jsoncpp
-
 MODULE_CONFIGURE_PATH = ./XEngine_ModuleConfigure
-MODULE_AUTHORIZE_PATH = ./XEngine_ModuleAuthorize
 MODULE_PROTOCOL_PATH = ./XEngine_ModuleProtocol
 MODULE_SESSION_PATH = ./XEngine_ModuleSession
 APP_SERVICE_PATH = ./XEngine_ServiceApp
 
-XENGINE_MODULES = libjsoncpp.so libXEngine_ModuleConfigure.so libXEngine_ModuleAuthorize.so libXEngine_ModuleProtocol.so libXEngine_ModuleSession.so XEngine_ServiceApp.exe 
+XENGINE_MODULES = libjsoncpp.so libXEngine_ModuleConfigure.so libXEngine_ModuleProtocol.so libXEngine_ModuleSession.so XEngine_ServiceApp.exe 
 
 .PHONY:MakeAll 
 MakeAll:$(XENGINE_MODULES)
@@ -21,8 +19,6 @@ libjsoncpp.so:
 
 libXEngine_ModuleConfigure.so:
 	make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
-libXEngine_ModuleAuthorize.so:
-	make -C $(MODULE_AUTHORIZE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
 libXEngine_ModuleProtocol.so:
 	make -C $(MODULE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
 libXEngine_ModuleSession.so:

XEngine_Release/XEngine_Config/UserList.txt

@@ -6,11 +6,11 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_NetXApi.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIClient.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_Socket.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_XLog.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\RfcComponents_ProxyProtocol.dll" "./"
 
-copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ProcFile.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -1,19 +1,16 @@
-copy /y "%XEngine_Lib64%\x64\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_Core\XEngine_Core.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_Core\XEngine_OPenSsl.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_Core\XEngine_ManagePool.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_Core\XEngine_NetXApi.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Core.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_OPenSsl.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_NetXApi.dll" "./"
 
-copy /y "%XEngine_Lib64%\x64\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_Client\XClient_Socket.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Socket.dll" "./"
 
-copy /y "%XEngine_Lib64%\x64\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_RfcComponents\RfcComponents_ProxyProtocol.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_RfcComponents\RfcComponents_ProxyProtocol.dll" "./"
 
-copy /y "%XEngine_Lib64%\x64\XEngine_SystemSdk\XEngine_ProcFile.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
-
-copy /y "%XEngine_Lib64%\x64\XEngine_LibEx\libcrypto-3-x64.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_LibEx\libssl-3-x64.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"