Merge pull request #2167 from sspanel-uim/dev

Dev 20230916
Anankke · Sep 16, 2023 · 8fdefab · 8fdefab
2 parents 6a97b2f + 70c1c7d
commit 8fdefab
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 83 deletions.
diff --git a/composer.json b/composer.json
@@ -5,6 +5,7 @@
         "ext-curl": "*",
         "ext-fileinfo": "*",
         "ext-json": "*",
+        "ext-mbstring": "*",
         "ext-mysqli": "*",
         "ext-openssl": "*",
         "ext-pdo": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/config/appprofile.example.php b/config/appprofile.example.php
@@ -8,13 +8,18 @@
     ],
     'dns' => [
         'servers' => [
+            [
+                'tag' => 'local',
+                'address' => 'local',
+            ],
             [
                 'tag' => 'cloudflare',
-                'address' => '1.1.1.1',
+                'address' => 'https://1.1.1.1/dns-query',
+                'address_resolver' => 'local',
             ],
             [
                 'tag' => 'dnspod',
-                'address' => '119.29.29.29',
+                'address' => 'https://1.12.12.12/dns-query',
                 'detour' => 'direct',
             ],
         ],
@@ -48,24 +53,24 @@
                 'server' => 'dnspod',
             ],
         ],
-        'strategy' => 'prefer_ipv4',
+        'strategy' => 'prefer_ipv6',
     ],
     'inbounds' => [
         [
-            "type" => "tun",
-            "inet4_address" => "172.19.0.1/30",
-            "auto_route" => true,
-            "strict_route" => true,
-            "endpoint_independent_nat" => true,
-            "udp_timeout" => 60,
-            "platform" => [
-                "http_proxy" => [
-                    "enabled" => true,
-                    "server" => "127.0.0.1",
-                    "server_port" => 8100,
+            'type' => 'tun',
+            'inet4_address' => '172.19.0.1/30',
+            'auto_route' => true,
+            'strict_route' => true,
+            'endpoint_independent_nat' => true,
+            'udp_timeout' => 60,
+            'platform' => [
+                'http_proxy' => [
+                    'enabled' => true,
+                    'server' => '127.0.0.1',
+                    'server_port' => 8100,
                 ],
             ],
-            "sniff" => true,
+            'sniff' => true,
         ],
         [
             'type' => 'mixed',
@@ -95,6 +100,14 @@
         ],
     ],
     'route' => [
+        'geoip' => [
+            'download_url' => 'https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.db',
+            'download_detour' => 'direct',
+        ],
+        'geosite' => [
+            'download_url' => 'https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite-lite.db',
+            'download_detour' => 'direct',
+        ],
         'rules' => [
             [
                 'protocol' => 'dns',
@@ -142,7 +155,9 @@
     ],
     'experimental' => [
         'clash_api' => [
+            'external_controller' => '0.0.0.0:9090',
             'store_mode' => true,
+            'store_selected' => true,
             'cache_id' => '',
         ],
     ],

diff --git a/resources/views/tabler/admin/node/create.tpl b/resources/views/tabler/admin/node/create.tpl
@@ -65,7 +65,9 @@
                                 <div class="col">
                                     <select id="sort" class="col form-select">
                                         <option value="14">Trojan</option>
-                                        <option value="11">V2Ray</option>
+                                        <option value="11">Vmess</option>
+                                        <option value="2">TUIC</option>
+                                        <option value="1">Shadowsocks2022</option>
                                         <option value="0">Shadowsocks</option>
                                     </select>
                                 </div>
@@ -184,4 +186,4 @@
     });
 </script>
 
-{include file='admin/footer.tpl'}
+{include file='admin/footer.tpl'}
diff --git a/resources/views/tabler/admin/node/edit.tpl b/resources/views/tabler/admin/node/edit.tpl
@@ -65,7 +65,9 @@
                                 <div class="col">
                                     <select id="sort" class="col form-select" value="{$node->sort}">
                                         <option value="14" {if $node->sort === 14}selected{/if}>Trojan</option>
-                                        <option value="11" {if $node->sort === 11}selected{/if}>V2Ray</option>
+                                        <option value="11" {if $node->sort === 11}selected{/if}>Vmess</option>
+                                        <option value="2" {if $node->sort === 2}selected{/if}>TUIC</option>
+                                        <option value="1" {if $node->sort === 1}selected{/if}>Shadowsocks2022</option>
                                         <option value="0" {if $node->sort === 0}selected{/if}>Shadowsocks</option>
                                     </select>
                                 </div>
@@ -233,4 +235,4 @@
     });
 </script>
 
-{include file='admin/footer.tpl'}
+{include file='admin/footer.tpl'}
diff --git a/src/Controllers/WebAPI/NodeController.php b/src/Controllers/WebAPI/NodeController.php
@@ -27,21 +27,14 @@ public function getInfo(ServerRequest $request, Response $response, array $args)
             ]);
         }
 
-        if ($node->sort === 0) {
-            $node_explode = explode(';', $node->server);
-            $node_server = $node_explode[0];
-        } else {
-            $node_server = $node->server;
-        }
-
         $data = [
             'node_group' => $node->node_group,
             'node_class' => $node->node_class,
             'node_speedlimit' => $node->node_speedlimit,
             'traffic_rate' => $node->traffic_rate,
             'mu_only' => 0,
             'sort' => $node->sort,
-            'server' => $node_server,
+            'server' => $node->server,
             'custom_config' => json_decode($node->custom_config, true, JSON_UNESCAPED_SLASHES),
             'type' => 'SSPanel-UIM',
             'version' => VERSION,

diff --git a/src/Controllers/WebAPI/UserController.php b/src/Controllers/WebAPI/UserController.php
@@ -87,6 +87,8 @@ public function index(ServerRequest $request, Response $response, array $args):
 
         $keys_unset = match ((int) $node->sort) {
             14, 11 => ['u', 'd', 'transfer_enable', 'method', 'port', 'passwd'],
+            2 => ['u', 'd', 'transfer_enable', 'method', 'port'],
+            1 => ['u', 'd', 'transfer_enable', 'method', 'port', 'uuid'],
             default => ['u', 'd', 'transfer_enable', 'uuid']
         };
 
@@ -102,6 +104,17 @@ public function index(ServerRequest $request, Response $response, array $args):
                 }
             }
 
+            if ($node->sort === 1) {
+                $method = json_decode($node->custom_config)->method ?? '2022-blake3-aes-128-gcm';
+
+                $pk_len = match ($method) {
+                    '2022-blake3-aes-128-gcm' => 16,
+                    default => 32,
+                };
+
+                $user_raw->passwd = Tools::getSs2022UserPk($user_raw, $pk_len);
+            }
+
             $user_raw->node_connector = 0;
 
             foreach ($keys_unset as $key) {

diff --git a/src/Models/Node.php b/src/Models/Node.php
@@ -51,7 +51,7 @@ public function sort(): string
             0 => 'Shadowsocks',
             1 => 'Shadowsocks2022',
             2 => 'TUIC',
-            11 => 'V2Ray',
+            11 => 'Vmess',
             14 => 'Trojan',
             default => '未知',
         };