From ecf3f67d0442c61bfbbecfccd1d62f59dc999d41 Mon Sep 17 00:00:00 2001 From: czn Date: Wed, 11 Sep 2019 15:00:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E8=AF=86=E5=88=AB$debug=E5=AD=97=E6=AE=B5,=20=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=BF=9B=E5=85=A5index=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.php b/config/routes.php index 29b1f721..b1333671 100755 --- a/config/routes.php +++ b/config/routes.php @@ -36,7 +36,7 @@ $container['notAllowedHandler'] = static function ($c) { }; }; -if ($debug == false) { +if (DEBUG == false) { $container['errorHandler'] = static function ($c) { return static function ($request, $response, $exception) use ($c) { return $response->withAddedHeader('Location', '/500'); From ed0d9fde046d7acfe7db613136a2d80e5f3941fe Mon Sep 17 00:00:00 2001 From: GeekQu Date: Thu, 12 Sep 2019 00:51:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E8=80=97=E5=B0=BD=E7=94=A8=E6=88=B7=E9=99=90=E9=80=9F=E8=87=B3?= =?UTF-8?q?=201Mbps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Mod_Mu/UserController.php | 27 ++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app/Controllers/Mod_Mu/UserController.php b/app/Controllers/Mod_Mu/UserController.php index 33d716a5..4da13859 100644 --- a/app/Controllers/Mod_Mu/UserController.php +++ b/app/Controllers/Mod_Mu/UserController.php @@ -46,8 +46,7 @@ class UserController extends BaseController } )->orwhere('is_admin', 1); } - ) - ->where('enable', 1)->where('expire_in', '>', date('Y-m-d H:i:s'))->get(); + )->where('enable', 1)->where('expire_in', '>', date('Y-m-d H:i:s'))->get(); } else { $users_raw = User::where( static function ($query) use ($node) { @@ -75,20 +74,28 @@ class UserController extends BaseController 'forbidden_ip', 'forbidden_port', 'node_speedlimit', 'disconnect_ip', 'is_multi_user', 'id', 'port', 'passwd', 'u', 'd'); - foreach ($users_raw as $user_raw) { - if ($user_raw->transfer_enable > $user_raw->u + $user_raw->d) { - $user_raw = Tools::keyFilter($user_raw, $key_list); - $user_raw->uuid = $user_raw->getUuid(); - $users[] = $user_raw; - } else { - // 流量耗尽用户限速至 1Mbps - if (Config::get('keep_connect') == 'true') { + if (Config::get('keep_connect') == 'true') { + foreach ($users_raw as $user_raw) { + if ($user_raw->transfer_enable > $user_raw->u + $user_raw->d) { + $user_raw = Tools::keyFilter($user_raw, $key_list); + $user_raw->uuid = $user_raw->getUuid(); + $users[] = $user_raw; + } else { + // 流量耗尽用户限速至 1Mbps $user_raw = Tools::keyFilter($user_raw, $key_list); $user_raw->uuid = $user_raw->getUuid(); $user_raw->node_speedlimit = 1; $users[] = $user_raw; } } + } else { + foreach ($users_raw as $user_raw) { + if ($user_raw->transfer_enable > $user_raw->u + $user_raw->d) { + $user_raw = Tools::keyFilter($user_raw, $key_list); + $user_raw->uuid = $user_raw->getUuid(); + $users[] = $user_raw; + } + } } $res = [ From 4407015e462e5cc109f8b2e22823d3c8c03be7d6 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Thu, 12 Sep 2019 02:32:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=BA=E5=90=8E=E7=AB=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=81=8F=E7=A7=BB=E5=90=8E=E7=9A=84=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Mod_Mu/UserController.php | 113 ++++++++++++++++++---- config/.config.example.php | 1 + 2 files changed, 94 insertions(+), 20 deletions(-) diff --git a/app/Controllers/Mod_Mu/UserController.php b/app/Controllers/Mod_Mu/UserController.php index 4da13859..79f39e1d 100644 --- a/app/Controllers/Mod_Mu/UserController.php +++ b/app/Controllers/Mod_Mu/UserController.php @@ -11,6 +11,7 @@ use App\Models\DetectLog; use App\Controllers\BaseController; use App\Services\Config; use App\Utils\Tools; +use App\Utils\URL; class UserController extends BaseController { @@ -36,44 +37,116 @@ class UserController extends BaseController $node->node_heartbeat = time(); $node->save(); - if ($node->node_group != 0) { - $users_raw = User::where( - static function ($query) use ($node) { + // 节点流量耗尽则返回 null + if (($node->node_bandwidth_limit != 0) && $node->node_bandwidth_limit < $node->node_bandwidth) { + $users = null; + + $res = [ + 'ret' => 1, + 'data' => $users + ]; + return $this->echoJson($response, $res); + } + + if (in_array($node->sort, [0, 10])) { + $mu_port_migration = Config::get('mu_port_migration'); + } else { + $mu_port_migration = 'false'; + } + + $users_raw = User::where( + static function ($query) use ($node, $mu_port_migration) { + if ($mu_port_migration == 'true') { + $query->where( + static function ($query1) use ($node) { + if ($node->node_group != 0) { + $query1->where('class', '>=', $node->node_class) + ->where('node_group', '=', $node->node_group) + ->where('is_multi_user', '=', 0); + } else { + $query1->where('class', '>=', $node->node_class) + ->where('is_multi_user', '=', 0); + } + } + ); + } else { $query->where( static function ($query1) use ($node) { - $query1->where('class', '>=', $node->node_class) - ->where('node_group', '=', $node->node_group); + if ($node->node_group != 0) { + $query1->where('class', '>=', $node->node_class) + ->where('node_group', '=', $node->node_group); + } else { + $query1->where('class', '>=', $node->node_class); + } } )->orwhere('is_admin', 1); } - )->where('enable', 1)->where('expire_in', '>', date('Y-m-d H:i:s'))->get(); - } else { - $users_raw = User::where( + } + )->where('enable', 1)->where('expire_in', '>', date('Y-m-d H:i:s'))->get(); + + // 单端口承载用户 + if ($mu_port_migration == 'true') { + $mu_users_raw = User::where( static function ($query) use ($node) { $query->where( static function ($query1) use ($node) { - $query1->where('class', '>=', $node->node_class); + if ($node->node_group != 0) { + $query1->where('class', '>=', $node->node_class) + ->where('node_group', '=', $node->node_group) + ->where('is_multi_user', '>', 0); + } else { + $query1->where('class', '>=', $node->node_class) + ->where('is_multi_user', '>', 0); + } } )->orwhere('is_admin', 1); } )->where('enable', 1)->where('expire_in', '>', date('Y-m-d H:i:s'))->get(); + $type = 0; //偏移 + $port = []; //指定 + if (strpos($node->server, ';') !== false) { + $node_server = explode(';', $node->server); + if (strpos($node_server[1], 'port') !== false) { + $item = URL::parse_args($node_server[1]); + if (strpos($item['port'], '#') !== false) { + if (strpos($item['port'], '+') !== false) { + $args_explode = explode('+', $item['port']); + foreach ($args_explode as $arg) { + $port[substr($arg, 0, strpos($arg, '#'))] = (int) substr($arg, strpos($arg, '#') + 1); + } + } else { + $port[substr($item['port'], 0, strpos($item['port'], '#'))] = (int) substr($item['port'], strpos($item['port'], '#') + 1); + } + } else { + $$type = (int) $item['port']; + } + } + } + if ($type == 0) { + foreach ($mu_users_raw as $user_raw) { + if ($user_raw->is_multi_user != 0) { + if (in_array($user_raw->port, array_keys($port))) { + $user_raw->port = $port[$user_raw->port]; + } + } + $users_raw[] = $user_raw; + } + } else { + foreach ($mu_users_raw as $user_raw) { + if ($user_raw->is_multi_user != 0) { + $user_raw->port = ($user_raw->port + $type); + } + $users_raw[] = $user_raw; + } + } } - if (($node->node_bandwidth_limit != 0) && $node->node_bandwidth_limit < $node->node_bandwidth) { - $users = null; - - $res = [ - 'ret' => 1, - 'data' => $users - ]; - return $this->echoJson($response, $res); - } - - $users = array(); $key_list = array('email', 'method', 'obfs', 'obfs_param', 'protocol', 'protocol_param', 'forbidden_ip', 'forbidden_port', 'node_speedlimit', 'disconnect_ip', 'is_multi_user', 'id', 'port', 'passwd', 'u', 'd'); + $users = array(); + if (Config::get('keep_connect') == 'true') { foreach ($users_raw as $user_raw) { if ($user_raw->transfer_enable > $user_raw->u + $user_raw->d) { diff --git a/config/.config.example.php b/config/.config.example.php index 42f54932..d914deba 100644 --- a/config/.config.example.php +++ b/config/.config.example.php @@ -294,6 +294,7 @@ $System_Config['db_charset'] = 'utf8'; $System_Config['db_collation'] = 'utf8_general_ci'; $System_Config['db_prefix'] = ''; $System_Config['muKeyList'] = [' ']; //多 key 列表 +$System_Config['mu_port_migration'] = 'false'; //为后端直接下发偏移后的端口 #aws $System_Config['aws_access_key_id'] = ''; From 1811fc0aaa508fa8fedb0984ef05ad6ec693c87c Mon Sep 17 00:00:00 2001 From: SakuraSa233 Date: Thu, 12 Sep 2019 02:36:47 +0800 Subject: [PATCH 4/7] refactor(composer): clean composer.json --- composer.json | 76 ++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/composer.json b/composer.json index 44814a20..726a2275 100644 --- a/composer.json +++ b/composer.json @@ -1,46 +1,36 @@ { - "require": { - "slim/slim": "~3.0", - "slim/csrf": "*", - "smarty/smarty": "3.*", - "mailgun/mailgun-php": "^2.6.0", - "predis/predis": "~1.0", - "phpmailer/phpmailer": "~5.2", - "zeuxisoo/slim-whoops": "0.5.*", - "firebase/php-jwt": "~3.0", - "aws/aws-sdk-php": "3.*", - "gregwar/captcha": "1.*", - "cloudxns/cloud-xns-api-sdk-php": "*", - "guzzlehttp/guzzle": "^6.2.2", - "voku/anti-xss": "^1.2", - "paymentwall/paymentwall-php": "^2.1", - "telegram-bot/api": "^2.2", - "illuminate/pagination": "5.2.*", - "illuminate/database": "5.2.*", - "sendgrid/sendgrid": "^5.1", - "esdeathlove/datatables": "^1.6", - "slim/twig-view": "1.2.0", - "ramsey/uuid": "^3.0@dev", - "cloudflare/sdk": "1.1.1", - "chen-see/chen-pay": "^1.0@dev", - "league/omnipay": "^3", - "lokielse/omnipay-alipay": "*", - "charlottedunois/yasmin": "*" - }, - "autoload": { - "classmap": [ - - ], - "psr-4": { - "App\\": "app/" + "require": { + "slim/slim": "~3.0", + "slim/csrf": "*", + "smarty/smarty": "3.*", + "mailgun/mailgun-php": "^2.6.0", + "predis/predis": "~1.0", + "phpmailer/phpmailer": "~5.2", + "zeuxisoo/slim-whoops": "0.5.*", + "firebase/php-jwt": "~3.0", + "aws/aws-sdk-php": "3.*", + "gregwar/captcha": "1.*", + "cloudxns/cloud-xns-api-sdk-php": "*", + "guzzlehttp/guzzle": "^6.2.2", + "voku/anti-xss": "^1.2", + "paymentwall/paymentwall-php": "^2.1", + "telegram-bot/api": "^2.2", + "illuminate/pagination": "5.2.*", + "illuminate/database": "5.2.*", + "sendgrid/sendgrid": "^5.1", + "esdeathlove/datatables": "^1.6", + "slim/twig-view": "1.2.0", + "ramsey/uuid": "^3.0@dev", + "cloudflare/sdk": "1.1.1", + "chen-see/chen-pay": "^1.0@dev", + "league/omnipay": "^3", + "lokielse/omnipay-alipay": "*", + "charlottedunois/yasmin": "*", + "khanamiryan/qrcode-detector-decoder": "*" + }, + "autoload": { + "psr-4": { + "App\\": "app/" + } } - }, - - "config": { - "secure-http": false - }, - "minimum-stability": "dev", - "require-dev": { - "khanamiryan/qrcode-detector-decoder": "*" - } } From f1a799697905b7c4390bd48c227cd9be7fbe2fb3 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Thu, 12 Sep 2019 03:52:03 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=BA=E4=B8=AD=E8=BD=AC=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=B8=8B=E5=8F=91=E5=81=8F=E7=A7=BB=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E7=AB=AF=E5=8F=A3=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Mod_Mu/FuncController.php | 57 +++++++++++++++++++---- app/Controllers/Mod_Mu/UserController.php | 34 +++----------- app/Utils/Tools.php | 27 +++++++++++ config/.config.example.php | 1 + 4 files changed, 82 insertions(+), 37 deletions(-) diff --git a/app/Controllers/Mod_Mu/FuncController.php b/app/Controllers/Mod_Mu/FuncController.php index a6d8d75c..1c028abc 100644 --- a/app/Controllers/Mod_Mu/FuncController.php +++ b/app/Controllers/Mod_Mu/FuncController.php @@ -9,7 +9,10 @@ use App\Models\UnblockIp; use App\Models\Speedtest; use App\Models\Node; use App\Models\Auto; +use App\Models\User; use App\Controllers\BaseController; +use App\Utils\Tools; +use App\Services\Config; class FuncController extends BaseController { @@ -58,18 +61,52 @@ class FuncController extends BaseController if ($rules[0]['dist_node_id'] == -1) { $server = null; } - foreach ($rules as $rule) { - $dis = $this->get_dis_node_info($rule['dist_node_id']); - if ($dis != null) { - $rule['source_node_sort'] = $node->sort; - $rule['dist_node_sort'] = $dis->sort; - $rule['dist_node_server'] = $dis->server; - } else { - $rule['source_node_sort'] = $node->sort; - $rule['dist_node_sort'] = null; - $rule['dist_node_server'] = null; + + if (Config::get('mu_port_migration') == 'true') { + foreach ($rules as $rule) { + $dis = $this->get_dis_node_info($rule['dist_node_id']); + if ($dis != null) { + $rule['source_node_sort'] = $node->sort; + $rule['dist_node_sort'] = $dis->sort; + $rule['dist_node_server'] = $dis->server; + + if (in_array($dis->sort, [0, 10]) && strpos($dis->server, ';') !== false && $dis->mu_only != -1) { + $muPort = Tools::get_MuOutPortArray($dis->server); + $user = User::where('port', '=', $rule['port'])->first(); + if ($user != null) { + if ($user->is_multi_user != 0) { + if ($muPort['type'] == 0) { + if (in_array($rule['port'], array_keys($muPort['port']))) { + $rule['port'] = $muPort['port'][$rule['port']]; + } + } else { + $rule['port'] = ($rule['port'] + $muPort['type']); + } + } + } + } + + } else { + $rule['source_node_sort'] = $node->sort; + $rule['dist_node_sort'] = null; + $rule['dist_node_server'] = null; + } + } + } else { + foreach ($rules as $rule) { + $dis = $this->get_dis_node_info($rule['dist_node_id']); + if ($dis != null) { + $rule['source_node_sort'] = $node->sort; + $rule['dist_node_sort'] = $dis->sort; + $rule['dist_node_server'] = $dis->server; + } else { + $rule['source_node_sort'] = $node->sort; + $rule['dist_node_sort'] = null; + $rule['dist_node_server'] = null; + } } } + $res = [ 'ret' => 1, 'data' => $rules, diff --git a/app/Controllers/Mod_Mu/UserController.php b/app/Controllers/Mod_Mu/UserController.php index 79f39e1d..aa806fdb 100644 --- a/app/Controllers/Mod_Mu/UserController.php +++ b/app/Controllers/Mod_Mu/UserController.php @@ -48,7 +48,7 @@ class UserController extends BaseController return $this->echoJson($response, $res); } - if (in_array($node->sort, [0, 10])) { + if (in_array($node->sort, [0, 10]) && $node->mu_only != -1) { $mu_port_migration = Config::get('mu_port_migration'); } else { $mu_port_migration = 'false'; @@ -102,39 +102,19 @@ class UserController extends BaseController )->orwhere('is_admin', 1); } )->where('enable', 1)->where('expire_in', '>', date('Y-m-d H:i:s'))->get(); - $type = 0; //偏移 - $port = []; //指定 - if (strpos($node->server, ';') !== false) { - $node_server = explode(';', $node->server); - if (strpos($node_server[1], 'port') !== false) { - $item = URL::parse_args($node_server[1]); - if (strpos($item['port'], '#') !== false) { - if (strpos($item['port'], '+') !== false) { - $args_explode = explode('+', $item['port']); - foreach ($args_explode as $arg) { - $port[substr($arg, 0, strpos($arg, '#'))] = (int) substr($arg, strpos($arg, '#') + 1); - } - } else { - $port[substr($item['port'], 0, strpos($item['port'], '#'))] = (int) substr($item['port'], strpos($item['port'], '#') + 1); - } - } else { - $$type = (int) $item['port']; - } - } - } - if ($type == 0) { + + $muPort = Tools::get_MuOutPortArray($node->server); + if ($muPort['type'] == 0) { foreach ($mu_users_raw as $user_raw) { - if ($user_raw->is_multi_user != 0) { - if (in_array($user_raw->port, array_keys($port))) { - $user_raw->port = $port[$user_raw->port]; - } + if ($user_raw->is_multi_user != 0 && in_array($user_raw->port, array_keys($muPort['port']))) { + $user_raw->port = $muPort['port'][$user_raw->port]; } $users_raw[] = $user_raw; } } else { foreach ($mu_users_raw as $user_raw) { if ($user_raw->is_multi_user != 0) { - $user_raw->port = ($user_raw->port + $type); + $user_raw->port = ($user_raw->port + $muPort['type']); } $users_raw[] = $user_raw; } diff --git a/app/Utils/Tools.php b/app/Utils/Tools.php index 8000db59..3da942bc 100644 --- a/app/Utils/Tools.php +++ b/app/Utils/Tools.php @@ -568,4 +568,31 @@ class Tools 'port' => $node_port ]; } + + public static function get_MuOutPortArray($server) + { + $type = 0; //偏移 + $port = []; //指定 + $node_server = explode(';', $server); + if (strpos($node_server[1], 'port') !== false) { + $item = URL::parse_args($node_server[1]); + if (strpos($item['port'], '#') !== false) { + if (strpos($item['port'], '+') !== false) { + $args_explode = explode('+', $item['port']); + foreach ($args_explode as $arg) { + $port[substr($arg, 0, strpos($arg, '#'))] = (int) substr($arg, strpos($arg, '#') + 1); + } + } else { + $port[substr($item['port'], 0, strpos($item['port'], '#'))] = (int) substr($item['port'], strpos($item['port'], '#') + 1); + } + } else { + $$type = (int) $item['port']; + } + } + + return [ + 'type' => $type, + 'port' => $port + ]; + } } diff --git a/config/.config.example.php b/config/.config.example.php index d914deba..10b22096 100644 --- a/config/.config.example.php +++ b/config/.config.example.php @@ -295,6 +295,7 @@ $System_Config['db_collation'] = 'utf8_general_ci'; $System_Config['db_prefix'] = ''; $System_Config['muKeyList'] = [' ']; //多 key 列表 $System_Config['mu_port_migration'] = 'false'; //为后端直接下发偏移后的端口 +$System_Config['relay_port_migration'] = 'false'; //为中转规则下发偏移后的端口,一般与上一条同时启用 #aws $System_Config['aws_access_key_id'] = ''; From 4e6002fcd65ebf14557c1b09351b07ebfef42922 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Thu, 12 Sep 2019 11:21:09 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Mod_Mu/FuncController.php | 15 ++++++++++----- app/Controllers/Mod_Mu/UserController.php | 10 ++++++++-- config/.config.example.php | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/Controllers/Mod_Mu/FuncController.php b/app/Controllers/Mod_Mu/FuncController.php index 1c028abc..e74f21e0 100644 --- a/app/Controllers/Mod_Mu/FuncController.php +++ b/app/Controllers/Mod_Mu/FuncController.php @@ -62,14 +62,19 @@ class FuncController extends BaseController $server = null; } - if (Config::get('mu_port_migration') == 'true') { + if (Config::get('relay_port_migration') == 'true') { foreach ($rules as $rule) { $dis = $this->get_dis_node_info($rule['dist_node_id']); if ($dis != null) { $rule['source_node_sort'] = $node->sort; $rule['dist_node_sort'] = $dis->sort; - $rule['dist_node_server'] = $dis->server; - + if (in_array($dis->sort, [0, 10])) { + $dis_server = explode(';', $dis->server); + $rule['dist_node_server'] = $dis_server[0]; + } else { + $rule['dist_node_server'] = $dis->server; + } + if (in_array($dis->sort, [0, 10]) && strpos($dis->server, ';') !== false && $dis->mu_only != -1) { $muPort = Tools::get_MuOutPortArray($dis->server); $user = User::where('port', '=', $rule['port'])->first(); @@ -85,7 +90,7 @@ class FuncController extends BaseController } } } - + } else { $rule['source_node_sort'] = $node->sort; $rule['dist_node_sort'] = null; @@ -98,7 +103,7 @@ class FuncController extends BaseController if ($dis != null) { $rule['source_node_sort'] = $node->sort; $rule['dist_node_sort'] = $dis->sort; - $rule['dist_node_server'] = $dis->server; + $rule['dist_node_server'] = $dis->server; } else { $rule['source_node_sort'] = $node->sort; $rule['dist_node_sort'] = null; diff --git a/app/Controllers/Mod_Mu/UserController.php b/app/Controllers/Mod_Mu/UserController.php index aa806fdb..472a767a 100644 --- a/app/Controllers/Mod_Mu/UserController.php +++ b/app/Controllers/Mod_Mu/UserController.php @@ -54,6 +54,10 @@ class UserController extends BaseController $mu_port_migration = 'false'; } + /* + * 1. 请不要把管理员作为单端口承载用户 + * 2. 请不要把真实用户作为单端口承载用户 + */ $users_raw = User::where( static function ($query) use ($node, $mu_port_migration) { if ($mu_port_migration == 'true') { @@ -62,10 +66,12 @@ class UserController extends BaseController if ($node->node_group != 0) { $query1->where('class', '>=', $node->node_class) ->where('node_group', '=', $node->node_group) - ->where('is_multi_user', '=', 0); + ->where('is_multi_user', '=', 0) + ->where('is_admin', 0); } else { $query1->where('class', '>=', $node->node_class) - ->where('is_multi_user', '=', 0); + ->where('is_multi_user', '=', 0) + ->where('is_admin', 0); } } ); diff --git a/config/.config.example.php b/config/.config.example.php index 10b22096..b4dec9ac 100644 --- a/config/.config.example.php +++ b/config/.config.example.php @@ -295,7 +295,7 @@ $System_Config['db_collation'] = 'utf8_general_ci'; $System_Config['db_prefix'] = ''; $System_Config['muKeyList'] = [' ']; //多 key 列表 $System_Config['mu_port_migration'] = 'false'; //为后端直接下发偏移后的端口 -$System_Config['relay_port_migration'] = 'false'; //为中转规则下发偏移后的端口,一般与上一条同时启用 +$System_Config['relay_port_migration'] = 'false'; //为中转规则下发偏移后的端口,此项未经测试 #aws $System_Config['aws_access_key_id'] = ''; From 90fe6def619e2326c04e50ef994bf42d7ebb3112 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Fri, 13 Sep 2019 06:47:02 +0800 Subject: [PATCH 7/7] =?UTF-8?q?ClashR=20=E5=85=BC=E5=AE=B9=E6=80=A7?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E6=89=8B=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E9=93=BE=E6=8E=A5=20clash=3D2=20=E5=8D=B3?= =?UTF-8?q?=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/LinkController.php | 38 +++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index 71d660a5..d16e4a25 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -153,11 +153,11 @@ class LinkController extends BaseController 'Surfboard.conf' ); $subscribe_type = 'Surfboard'; - } elseif ($clash == 1) { + } elseif ($clash >= 1) { $getBody = self::getBody( $user, $response, - self::getClash($user, $opts), + self::getClash($user, $clash, $opts), 'config.yaml' ); $subscribe_type = 'Clash'; @@ -524,7 +524,7 @@ class LinkController extends BaseController * * @return string */ - public static function getClash($user, $opts) + public static function getClash($user, $clash, $opts) { $subInfo = self::getSubinfo($user, 0); $userapiUrl = $subInfo['clash']; @@ -608,6 +608,38 @@ class LinkController extends BaseController $Proxys[] = $v2rays; } + if ($clash == 2) { + // ssr + $items = array_merge(URL::getAllItems($user, 0, 0, 0), URL::getAllItems($user, 1, 0, 0)); + foreach ($items as $item) { + // 不支持的 + if (in_array($item['method'], ['rc4-md5-6', 'des-ede3-cfb', 'xsalsa20', 'none']) + || + in_array($item['protocol'], array_merge(Config::getSupportParam('allow_none_protocol'), ['verify_deflate'])) + || + in_array($item['obfs'], ['tls1.2_ticket_fastauth']) + ) { + continue; + } + $ssr = [ + 'name' => $item['remark'], + 'type' => 'ssr', + 'server' => $item['address'], + 'port' => $item['port'], + 'cipher' => $item['method'], + 'password' => $item['passwd'], + 'protocol' => $item['protocol'], + 'protocolparam' => $item['protocol_param'], + 'obfs' => $item['obfs'], + 'obfsparam' => $item['obfs_param'] + ]; + if (isset($opts['source']) && $opts['source'] != '') { + $ssr['class'] = $item['class']; + } + $Proxys[] = $ssr; + } + } + if (isset($opts['source']) && $opts['source'] != '') { $SourceURL = trim(urldecode($opts['source'])); // 远程规则仅支持 github 以及 gitlab