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 diff --git a/app/Controllers/Mod_Mu/FuncController.php b/app/Controllers/Mod_Mu/FuncController.php index a6d8d75c..e74f21e0 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,57 @@ 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('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; + 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(); + 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 33d716a5..472a767a 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,59 +37,124 @@ 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]) && $node->mu_only != -1) { + $mu_port_migration = Config::get('mu_port_migration'); + } else { + $mu_port_migration = 'false'; + } + + /* + * 1. 请不要把管理员作为单端口承载用户 + * 2. 请不要把真实用户作为单端口承载用户 + */ + $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) + ->where('is_admin', 0); + } else { + $query1->where('class', '>=', $node->node_class) + ->where('is_multi_user', '=', 0) + ->where('is_admin', 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(); - } - 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); + $muPort = Tools::get_MuOutPortArray($node->server); + if ($muPort['type'] == 0) { + foreach ($mu_users_raw as $user_raw) { + 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 + $muPort['type']); + } + $users_raw[] = $user_raw; + } + } } - $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'); - 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') { + $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) { + $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 = [ 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/composer.json b/composer.json index d31e26c0..6440e551 100644 --- a/composer.json +++ b/composer.json @@ -25,21 +25,14 @@ "chen-see/chen-pay": "^1.0@dev", "league/omnipay": "^3", "lokielse/omnipay-alipay": "*", - "remotelyliving/php-dns": "3.0.6", "charlottedunois/yasmin": "*", + "khanamiryan/qrcode-detector-decoder": "*", + "remotelyliving/php-dns": "3.0.6", "symfony/yaml": "^4.4@dev" }, "autoload": { - "classmap": [], "psr-4": { "App\\": "app/" } - }, - "config": { - "secure-http": false - }, - "minimum-stability": "dev", - "require-dev": { - "khanamiryan/qrcode-detector-decoder": "*" } -} \ No newline at end of file +} diff --git a/config/.config.example.php b/config/.config.example.php index 42f54932..b4dec9ac 100644 --- a/config/.config.example.php +++ b/config/.config.example.php @@ -294,6 +294,8 @@ $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'; //为后端直接下发偏移后的端口 +$System_Config['relay_port_migration'] = 'false'; //为中转规则下发偏移后的端口,此项未经测试 #aws $System_Config['aws_access_key_id'] = ''; diff --git a/config/routes.php b/config/routes.php index 71cba755..47704654 100644 --- 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');