update: remove param check in Builder

ProxyBuilder/Shadowsocks.py

@@ -195,27 +195,6 @@ def __ssRust(proxyInfo: dict, socksPort: int, isUdp: bool) -> tuple[dict, str]:
         config['mode'] = 'tcp_and_udp'
     return config, 'ss-rust-local'
 
-def __ssFormatCheck(proxyInfo: dict) -> bool: # Shadowsocks参数检查
-    if 'server' not in proxyInfo or not isinstance(proxyInfo['server'], str): # server -> str
-        return False
-    if 'port' not in proxyInfo or not isinstance(proxyInfo['port'], int): # port -> int
-        return False
-    if 'method' not in proxyInfo or not isinstance(proxyInfo['method'], str): # method -> str
-        return False
-    if 'passwd' not in proxyInfo or not isinstance(proxyInfo['passwd'], str): # passwd -> str
-        return False
-    if 'plugin' not in proxyInfo:
-        return False
-    plugin = proxyInfo['plugin'] # plugin -> dict / None
-    if isinstance(plugin, dict):
-        if 'type' not in plugin or not isinstance(plugin['type'], str): # plugin.type -> str
-            return False
-        if 'param' not in plugin or not isinstance(plugin['param'], str): # plugin.param -> str
-            return False
-    elif plugin is not None:
-        return False
-    return True
-
 def load(proxyInfo: dict, socksPort: int, configFile: str) -> tuple[list or None, str or None, dict or None]:
     """
     Shadowsocks配置载入
@@ -229,24 +208,25 @@ def load(proxyInfo: dict, socksPort: int, configFile: str) -> tuple[list or None
         载入成功:
             return startCommand, fileContent, envVar
     """
-    if not __ssFormatCheck(proxyInfo): # 参数有误
+    try:
-        return None, None, None
+        if proxyInfo['plugin'] is None: # 无插件时启用UDP
-    if proxyInfo['plugin'] is None: # 无插件时启用UDP
+            isUdp = True
-        isUdp = True
+        else:
-    else:
+            isUdp = not __pluginWithUdp( # 获取插件UDP冲突状态
-        isUdp = not __pluginWithUdp( # 获取插件UDP冲突状态
+                proxyInfo['plugin']['type'], proxyInfo['plugin']['param']
-            proxyInfo['plugin']['type'], proxyInfo['plugin']['param']
+            )
-        )
+        if proxyInfo['method'] in ssMethodList['ss-libev']: # 按序匹配客户端
-    if proxyInfo['method'] in ssMethodList['ss-libev']: # 按序匹配客户端
+            config, ssFile = __ssLibev(proxyInfo, socksPort, isUdp)
-        config, ssFile = __ssLibev(proxyInfo, socksPort, isUdp)
+        elif proxyInfo['method'] in ssMethodList['ss-libev-legacy']:
-    elif proxyInfo['method'] in ssMethodList['ss-libev-legacy']:
+            config, ssFile = __ssLibev(proxyInfo, socksPort, isUdp, isLegacy = True)
-        config, ssFile = __ssLibev(proxyInfo, socksPort, isUdp, isLegacy = True)
+        elif proxyInfo['method'] in ssMethodList['ss-python']:
-    elif proxyInfo['method'] in ssMethodList['ss-python']:
+            config, ssFile = __ssPython(proxyInfo, socksPort, isUdp)
-        config, ssFile = __ssPython(proxyInfo, socksPort, isUdp)
+        elif proxyInfo['method'] in ssMethodList['ss-python-legacy']:
-    elif proxyInfo['method'] in ssMethodList['ss-python-legacy']:
+            config, ssFile = __ssPython(proxyInfo, socksPort, isUdp, isLegacy = True)
-        config, ssFile = __ssPython(proxyInfo, socksPort, isUdp, isLegacy = True)
+        elif proxyInfo['method'] in ssMethodList['ss-rust']:
-    elif proxyInfo['method'] in ssMethodList['ss-rust']:
+            config, ssFile = __ssRust(proxyInfo, socksPort, isUdp)
-        config, ssFile = __ssRust(proxyInfo, socksPort, isUdp)
+        else:
-    else:
+            return None, None, None # 无匹配加密方式
-        return None, None, None # 无匹配加密方式
+        return [ssFile, '-c', configFile], json.dumps(config), {}
-    return [ssFile, '-c', configFile], json.dumps(config), {}
+    except:
+        return None, None, None # 节点配置错误

ProxyBuilder/ShadowsocksR.py

@@ -3,95 +3,6 @@
 
 import json
 
-ssrMethodList = [ # ShadowsocksR加密方式
-    'aes-128-cfb',
-    'aes-192-cfb',
-    'aes-256-cfb',
-    'aes-128-cfb1',
-    'aes-192-cfb1',
-    'aes-256-cfb1',
-    'aes-128-cfb8',
-    'aes-192-cfb8',
-    'aes-256-cfb8',
-    'aes-128-ctr',
-    'aes-192-ctr',
-    'aes-256-ctr',
-    'aes-128-gcm',
-    'aes-192-gcm',
-    'aes-256-gcm',
-    'aes-128-ofb',
-    'aes-192-ofb',
-    'aes-256-ofb',
-    'camellia-128-cfb',
-    'camellia-192-cfb',
-    'camellia-256-cfb',
-    'none',
-    'table',
-    'rc4',
-    'rc4-md5',
-    'rc4-md5-6',
-    'bf-cfb',
-    'cast5-cfb',
-    'des-cfb',
-    'idea-cfb',
-    'seed-cfb',
-    'rc2-cfb',
-    'salsa20',
-    'xsalsa20',
-    'chacha20',
-    'xchacha20',
-    'chacha20-ietf',
-]
-
-ssrProtocolList = [ # ShadowsocksR协议列表
-    'origin',
-    'verify_sha1',
-    'verify_simple',
-    'verify_deflate',
-    'auth_simple',
-    'auth_sha1',
-    'auth_sha1_v2',
-    'auth_sha1_v4',
-    'auth_aes128',
-    'auth_aes128_md5',
-    'auth_aes128_sha1',
-    'auth_chain_a',
-    'auth_chain_b',
-    'auth_chain_c',
-    'auth_chain_d',
-    'auth_chain_e',
-    'auth_chain_f',
-]
-
-ssrObfsList = [ # ShadowsocksR混淆方式
-    'plain',
-    'http_post',
-    'http_simple',
-    'tls_simple',
-    'tls1.2_ticket_auth',
-    'tls1.2_ticket_fastauth',
-    'random_head',
-]
-
-def __ssrFormatCheck(proxyInfo: dict) -> bool:  # ShadowsocksR参数检查
-    if 'server' not in proxyInfo or not isinstance(proxyInfo['server'], str): # server -> str
-        return False
-    if 'port' not in proxyInfo or not isinstance(proxyInfo['port'], int): # port -> int
-        return False
-    if 'method' not in proxyInfo or not isinstance(proxyInfo['method'], str): # method -> str
-        return False
-    if 'passwd' not in proxyInfo or not isinstance(proxyInfo['passwd'], str): # passwd -> str
-        return False
-    if 'protocol' not in proxyInfo or not isinstance(proxyInfo['protocol'], str): # protocol -> str
-        return False
-    if 'protocolParam' not in proxyInfo or not isinstance(proxyInfo['protocolParam'], str): # protocolParam -> str
-        return False
-    if 'obfs' not in proxyInfo or not isinstance(proxyInfo['obfs'], str): # obfs -> str
-        return False
-    if 'obfsParam' not in proxyInfo or not isinstance(proxyInfo['obfsParam'], str): # obfsParam -> str
-        return False
-    return True
-
 def load(proxyInfo: dict, socksPort: int, configFile: str) -> tuple[list or None, str or None, dict or None]:
     """
     ShadowsocksR配置载入
@@ -105,24 +16,19 @@ def load(proxyInfo: dict, socksPort: int, configFile: str) -> tuple[list or None
         载入成功:
             return startCommand, fileContent, envVar
     """
-    if not __ssrFormatCheck(proxyInfo): # 参数有误
+    try:
-        return None, None, None
+        config = {
-    if not proxyInfo['method'] in ssrMethodList: # 匹配不到加密方法
+            'server': proxyInfo['server'],
-        return None, None, None
+            'server_port': proxyInfo['port'],
-    if not proxyInfo['protocol'] in ssrProtocolList: # 匹配不到协议
+            'local_address': '127.0.0.1',
-        return None, None, None
+            'local_port': socksPort,
-    if not proxyInfo['obfs'] in ssrObfsList: # 匹配不到混淆方式
+            'password': proxyInfo['passwd'],
+            'method': proxyInfo['method'],
+            'protocol': proxyInfo['protocol'],
+            'protocol_param': proxyInfo['protocolParam'],
+            'obfs': proxyInfo['obfs'],
+            'obfs_param': proxyInfo['obfsParam']
+        }
+        return ['ssr-local', '-c', configFile], json.dumps(config), {}
+    except:
         return None, None, None
-    config = {
-        'server': proxyInfo['server'],
-        'server_port': proxyInfo['port'],
-        'local_address': '127.0.0.1',
-        'local_port': socksPort,
-        'password': proxyInfo['passwd'],
-        'method': proxyInfo['method'],
-        'protocol': proxyInfo['protocol'],
-        'protocol_param': proxyInfo['protocolParam'],
-        'obfs': proxyInfo['obfs'],
-        'obfs_param': proxyInfo['obfsParam']
-    }
-    return ['ssr-local', '-c', configFile], json.dumps(config), {}

ProxyBuilder/VMess.py

@@ -61,8 +61,6 @@ def load(proxyInfo: dict, socksPort: int, configFile: str) -> tuple[list or None
         载入成功:
             return startCommand, fileContent, envVar
     """
-    # if not __vmessFormatCheck(proxyInfo): # 参数有误
-    #     return None, None, None
 
     config = __baseConfig(socksPort, __vmessConfig(proxyInfo))