From 56efadeab91d452d6bf3fb453731ab4e6b5a502b Mon Sep 17 00:00:00 2001 From: GeekQu Date: Tue, 18 Jun 2019 22:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=90=8E=E7=AB=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=B0=8F=E7=81=AB=E7=AE=AD=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Admin/RelayController.php | 4 +- app/Controllers/LinkController.php | 102 +++++++++++++++++----- app/Controllers/RelayController.php | 8 +- app/Utils/Tools.php | 2 +- app/Utils/URL.php | 90 ++++++++++++------- 5 files changed, 146 insertions(+), 60 deletions(-) diff --git a/app/Controllers/Admin/RelayController.php b/app/Controllers/Admin/RelayController.php index c338a46b..fca33a03 100644 --- a/app/Controllers/Admin/RelayController.php +++ b/app/Controllers/Admin/RelayController.php @@ -52,7 +52,7 @@ class RelayController extends AdminController foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::ssv2Array($node->server); + $node_explode = Tools::v2Array($node->server); $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $node_explode['port']; } else { $node->name .= ' 如果是V2ray后端 请不要设置,用户页面设置 '; @@ -163,7 +163,7 @@ class RelayController extends AdminController foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::ssv2Array($node->server); + $node_explode = Tools::v2Array($node->server); $node->name = $node->name . ' 如果是V2ray后端 请设置成' . $node_explode['port']; } else { $node->name .= ' 如果是V2ray后端 请不要设置,用户页面设置 '; diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index 40f1c7cb..88bd9fad 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -77,6 +77,7 @@ class LinkController extends BaseController $surge = isset($request->getQueryParams()['surge']) ? (int)$request->getQueryParams()['surge'] : 0; $quantumult = isset($request->getQueryParams()['quantumult']) ? (int)$request->getQueryParams()['quantumult'] : 0; $surfboard = isset($request->getQueryParams()['surfboard']) ? (int)$request->getQueryParams()['surfboard'] : 0; + $shadowrocket = isset($request->getQueryParams()['shadowrocket']) ? (int)$request->getQueryParams()['shadowrocket'] : 0; if (isset($request->getQueryParams()['mu'])) { $mu = (int)$request->getQueryParams()['mu']; @@ -135,6 +136,12 @@ class LinkController extends BaseController ->withHeader('Cache-Control', 'no-store, no-cache, must-revalidate') ->withHeader('Content-Disposition', ' attachment; filename=SSD.txt'); $newResponse->getBody()->write(self::GetSSD($user)); + } elseif ($shadowrocket == 1) { + $newResponse = $response + ->withHeader('Content-type', ' application/octet-stream; charset=utf-8') + ->withHeader('Cache-Control', 'no-store, no-cache, must-revalidate') + ->withHeader('Content-Disposition', ' attachment; filename=Shadowrocket.txt'); + $newResponse->getBody()->write(self::getShadowrocket($user, $opts)); } else { $newResponse = $response ->withHeader('Content-type', ' application/octet-stream; charset=utf-8') @@ -382,10 +389,8 @@ class LinkController extends BaseController if ($item['obfs'] != 'v2ray') { if ($item['obfs_param'] != '') { $sss['plugin-opts']['host'] = $item['obfs_param']; - } elseif ($user->obfs_param != '') { - $sss['plugin-opts']['host'] = $user->obfs_param; } else { - $sss['plugin-opts']['host'] = 'wns.windows.com'; + $sss['plugin-opts']['host'] = 'windowsupdate.windows.com'; } } } @@ -483,31 +488,82 @@ class LinkController extends BaseController return URL::getAllSSDUrl($user); } + public static function getShadowrocket($user, $opts) + { + $return = ''; + if (strtotime($user->expire_in) > time()) { + if ($user->transfer_enable == 0) { + $tmp = '剩余流量:0'; + } else { + $tmp = '剩余流量:' . $user->unusedTraffic(); + } + $tmp .= ' - 过期时间:'; + if ($user->class_expire != '1989-06-04 00:05:00') { + $userClassExpire = explode(' ', $user->class_expire); + $tmp .= $userClassExpire[0]; + } else { + $tmp .= '无限期'; + } + } else { + $tmp = '账户已过期,请续费后使用'; + } + $return .= ('STATUS=' . $tmp . PHP_EOL . 'REMARKS=' . Config::get('appName') . PHP_EOL); + // v2ray + $items = URL::getAllVMessUrl($user, 1); + foreach ($items as $item) { + $return .= (URL::getV2Url($user, $item, 0) . PHP_EOL); + } + // ss + $items = array_merge( + URL::getAllItems($user, 0, 1), + URL::getAllItems($user, 1, 1) + ); + foreach ($items as $item) { + if ($item['obfs'] == 'v2ray') { + $v2rayplugin = [ + 'address' => $item['address'], + 'port' => $item['port'], + 'path' => ($item['path'] . '?redirect=' . $user->getMuMd5()), + 'host' => $item['host'], + 'mode' => 'websocket', + ]; + $v2rayplugin['tls'] = $item['tls'] == 'tls' ? true : false; + $return .= ('ss://' . Tools::base64_url_encode( + $item['method'] . ':' . $item['passwd'] . + '@' . $item['address'] . ':' . $item['port'] + ) . '?v2ray-plugin=' . Tools::base64_url_encode( + json_encode($v2rayplugin) + ) . '#' . urlencode($item['remark']) . PHP_EOL); + } elseif (in_array($item['obfs'], ['simple_obfs_http', 'simple_obfs_tls'])) { + $obfs = $item['method'] == 'simple_obfs_http' ? 'obfs=http;' : 'obfs=tls;'; + $obfs .= $item['obfs_param'] != '' ? ('obfs-host=' . $item['obfs_param'] . ';') : 'obfs-host=windowsupdate.windows.com;'; + $return .= ('ss://' . Tools::base64_url_encode( + $item['method'] . ':' . $item['passwd'] + ) . '@' . $item['address'] . ':' . $item['port'] . + '?plugin=simple-obfs;' . $obfs . + 'obfs-uri=/#' . urlencode($item['remark']) . PHP_EOL); + } elseif ($item['obfs'] == 'plain') { + $return .= ('ss://' . Tools::base64_url_encode( + $item['method'] . ':' . $item['passwd'] . '@' . $item['address'] . ':' . $item['port'] + ) . '#' . urlencode($item['remark']) . PHP_EOL); + } + } + // ssr + $items = array_merge( + URL::getAllItems($user, 0, 0), + URL::getAllItems($user, 1, 0) + ); + foreach ($items as $item) { + $return .= URL::getItemUrl($item, 0) . PHP_EOL; + } + return Tools::base64_url_encode($return); + } + public static function GetSub($user, $sub, $opts) { $extend = isset($opts['extend']) ? $opts['extend'] : 0; $getV2rayPlugin = 1; $return_url = ''; - if (strpos($_SERVER['HTTP_USER_AGENT'], 'Shadowrocket') !== false) { - if (strtotime($user->expire_in) > time()) { - if ($user->transfer_enable == 0) { - $tmp = '剩余流量:0'; - } else { - $tmp = '剩余流量:' . $user->unusedTraffic(); - } - $tmp .= ' - 过期时间:'; - if ($user->class_expire != '1989-06-04 00:05:00') { - $userClassExpire = explode(' ', $user->class_expire); - $tmp .= $userClassExpire[0]; - } else { - $tmp .= '无限期'; - } - } else { - $tmp = '账户已过期,请续费后使用'; - } - $return_url .= ('STATUS=' . $tmp . PHP_EOL . 'REMARKS=' . Config::get('appName') . PHP_EOL); - $extend = 0; - } if (strpos($_SERVER['HTTP_USER_AGENT'], 'Kitsunebi') !== false) { $getV2rayPlugin = 0; } diff --git a/app/Controllers/RelayController.php b/app/Controllers/RelayController.php index 7774b47a..4172adf7 100644 --- a/app/Controllers/RelayController.php +++ b/app/Controllers/RelayController.php @@ -166,7 +166,7 @@ class RelayController extends UserController foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::ssv2Array($node->server); + $node_explode = Tools::v2Array($node->server); $ports[] = $node_explode['port']; $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $node_explode['port']; } else { @@ -249,7 +249,7 @@ class RelayController extends UserController )->where('type', 1)->where('sort', 9)->where('node_class', '<=', $user->class)->first(); $v2ray_port_raw = ''; if ($dist_node->sort == 12 || $dist_node->sort == 11) { - $node_explode = Tools::ssv2Array($dist_node->server); + $node_explode = Tools::v2Array($dist_node->server); $v2ray_port_raw = $node_explode['port']; } if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) { @@ -355,7 +355,7 @@ class RelayController extends UserController } foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::ssv2Array($node->server); + $node_explode = Tools::v2Array($node->server); $ports[] = $node_explode['port']; $node->name = $node->name . ' 如果是V2ray后端 请设置成: ' . $node_explode['port']; } else { @@ -435,7 +435,7 @@ class RelayController extends UserController )->where('type', 1)->where('sort', 9)->where('node_class', '<=', $user->class)->first(); $v2ray_port_raw = ''; if ($dist_node->sort == 12 || $dist_node->sort == 11) { - $node_explode = Tools::ssv2Array($dist_node->server); + $node_explode = Tools::v2Array($dist_node->server); $v2ray_port_raw = $node_explode['port']; } if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) { diff --git a/app/Utils/Tools.php b/app/Utils/Tools.php index 7c4f9a6f..33ce0d06 100644 --- a/app/Utils/Tools.php +++ b/app/Utils/Tools.php @@ -496,7 +496,7 @@ class Tools { $server = explode(';', $node); $item = [ - 'host' => '', + 'host' => 'windowsupdate.microsoft.com', 'path' => '', 'net' => 'ws', 'tls' => '' diff --git a/app/Utils/URL.php b/app/Utils/URL.php index c86a299e..bb886700 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -275,7 +275,19 @@ class URL { $ss_obfs_list = Config::getSupportParam('ss_obfs'); if (!$is_ss) { - $ssurl = $item['address'] . ':' . $item['port'] . ':' . $item['protocol'] . ':' . $item['method'] . ':' . $item['obfs'] . ':' . Tools::base64_url_encode($item['passwd']) . '/?obfsparam=' . Tools::base64_url_encode($item['obfs_param']) . '&protoparam=' . Tools::base64_url_encode($item['protocol_param']) . '&remarks=' . Tools::base64_url_encode($item['remark']) . '&group=' . Tools::base64_url_encode($item['group']); + $ssurl = $item['address'] . ':' . $item['port'] . ':' . $item['protocol'] . + ':' . $item['method'] . ':' . $item['obfs'] . ':' . + Tools::base64_url_encode( + $item['passwd'] + ) . '/?obfsparam=' . Tools::base64_url_encode( + $item['obfs_param'] + ) . '&protoparam=' . Tools::base64_url_encode( + $item['protocol_param'] + ) . '&remarks=' . Tools::base64_url_encode( + $item['remark'] + ) . '&group=' . Tools::base64_url_encode( + $item['group'] + ); return 'ssr://' . Tools::base64_url_encode($ssurl); } @@ -300,7 +312,9 @@ class URL } $ssurl .= '?plugin=' . rawurlencode($plugin); } - $ssurl .= '#' . rawurlencode(Config::get('appName') . ' - ' . $item['remark']); + $ssurl .= '#' . rawurlencode( + Config::get('appName') . ' - ' . $item['remark'] + ); } return $ssurl; } @@ -313,7 +327,9 @@ class URL $item['id'] = $user->getUuid(); $item['class'] = $node->node_class; if ($arrout == 0) { - return 'vmess://' . base64_encode(json_encode($item, JSON_UNESCAPED_UNICODE)); + return 'vmess://' . base64_encode( + json_encode($item, 320) + ); } return $item; @@ -327,7 +343,10 @@ class URL $query->where('sort', 11) ->orwhere('sort', 12); } - )->where('type', '1')->orderBy('name')->get(); + ) + ->where('type', '1') + ->orderBy('name') + ->get(); } else { $nodes = Node::where( static function ($query) { @@ -339,7 +358,11 @@ class URL $query->where('node_group', '=', $user->node_group) ->orWhere('node_group', '=', 0); } - )->where('type', '1')->where('node_class', '<=', $user->class)->orderBy('name')->get(); + ) + ->where('type', '1') + ->where('node_class', '<=', $user->class) + ->orderBy('name') + ->get(); } if ($arrout == 0) { $result = ''; @@ -384,18 +407,28 @@ class URL } } - $nodes_muport = Node::where('type', 1)->where('sort', '=', 9)->orderBy('name')->get(); + $nodes_muport = Node::where('type', 1) + ->where('sort', '=', 9) + ->orderBy('name') + ->get(); $array_server = array(); - $nodes = Node::where('type', 1)->where('node_class', '<=', $user->class) - ->where(static function ($func) { - $func->where('sort', '=', 0) - ->orwhere('sort', '=', 10) - ->orwhere('sort', '=', 13); - }) - ->where(static function ($func) use ($user) { - $func->where('node_group', '=', $user->node_group) - ->orwhere('node_group', '=', 0); - })->orderBy('name')->get(); + $nodes = Node::where('type', 1) + ->where('node_class', '<=', $user->class) + ->where( + static function ($func) { + $func->where('sort', '=', 0) + ->orwhere('sort', '=', 10) + ->orwhere('sort', '=', 13); + } + ) + ->where( + static function ($func) use ($user) { + $func->where('node_group', '=', $user->node_group) + ->orwhere('node_group', '=', 0); + } + ) + ->orderBy('name') + ->get(); $server_index = 1; foreach ($nodes as $node) { $server = array(); @@ -403,18 +436,17 @@ class URL if (self::CanMethodConnect($user->method) != 2) { continue; } - $ssv2Array = Tools::ssv2Array($node->server); - $server['server'] = $ssv2Array['add']; + $server = Tools::ssv2Array($node->server); + $server['server'] = $server['add']; $server['id'] = $server_index; - $server['remarks'] = $node->name . ' - 单多' . $ssv2Array['port'] . '端口'; - $server['port'] = $ssv2Array['port']; + $server['remarks'] = $node->name . ' - 单多' . $server['port'] . '端口'; $server['encryption'] = $user->method; $server['password'] = $user->passwd; $server['plugin'] = 'v2ray'; - if ($ssv2Array['tls'] == 'tls' && $ssv2Array['net'] == 'ws') { - $server['plugin_options'] = 'mode=ws;security=tls;path=' . $ssv2Array['path'] . ';host=' . $user->getMuMd5(); + if ($server['tls'] == 'tls' && $server['net'] == 'ws') { + $server['obfs_param'] = 'mode=ws;security=tls;path=' . $server['path'] . '?redirect=' . $user->getMuMd5() . ';host=' . $return_array['host']; } else { - $server['plugin_options'] = 'mode=ws;security=none;path=' . $ssv2Array['path'] . ';host=' . $user->getMuMd5(); + $server['obfs_param'] = 'mode=ws;security=none;path=' . $server['path'] . '?redirect=' . $user->getMuMd5() . ';host=' . $return_array['host']; } $array_server[] = $server; $server_index++; @@ -569,17 +601,15 @@ class URL $user = self::getSSRConnectInfo($user); } if ($node->sort == 13) { - $server = Tools::ssv2Array($node->server); - $return_array['address'] = $server['add']; - $return_array['port'] = $server['port']; + $return_array = Tools::ssv2Array($node->server); + $return_array['address'] = $return_array['add']; $return_array['protocol'] = 'origin'; $return_array['protocol_param'] = ''; - $return_array['path'] = $server['path']; $return_array['obfs'] = 'v2ray'; - if ($server['tls'] == 'tls' && $server['net'] == 'ws') { - $return_array['obfs_param'] = 'mode=ws;security=tls;path=' . $server['path'] . ';host=' . $user->getMuMd5(); + if ($return_array['tls'] == 'tls' && $return_array['net'] == 'ws') { + $return_array['obfs_param'] = 'mode=ws;security=tls;path=' . $return_array['path'] . '?redirect=' . $user->getMuMd5() . ';host=' . $return_array['host']; } else { - $return_array['obfs_param'] = 'mode=ws;security=none;path=' . $server['path'] . ';host=' . $user->getMuMd5(); + $return_array['obfs_param'] = 'mode=ws;security=none;path=' . $return_array['path'] . '?redirect=' . $user->getMuMd5() . ';host=' . $return_array['host']; } } else { $return_array['address'] = $node->server;