yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-11-10 17:49:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #210 from betaxab/patch-2

Browse Source 
Improved tls support
This commit is contained in:
tokumeikoi 2020-05-25 17:42:27 +08:00 committed by GitHub
commit ccd52546c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Client/ClientController.php
View File

@ -53,6 +53,17 @@ class ClientController extends Controller
$uri = ''; $uri = '';
foreach ($server as $item) { foreach ($server as $item) {
$uri .= "vmess=" . $item->host . ":" . $item->port . ", method=none, password=" . $user->v2ray_uuid . ", fast-open=false, udp-relay=false, tag=" . $item->name; $uri .= "vmess=" . $item->host . ":" . $item->port . ", method=none, password=" . $user->v2ray_uuid . ", fast-open=false, udp-relay=false, tag=" . $item->name;
if ($item->tls) {
$tlsSettings = json_decode($item->tlsSettings);
$uri .= ', obfs=over-tls';
if (isset($tlsSettings->allowInsecure)) {
// Default: tls-verification=true
$uri .= ', tls-verification=' . ($tlsSettings->allowInsecure ? "false" : "true");
}
if (isset($tlsSettings->serverName)) {
$uri .= ', obfs-host=' . $tlsSettings->serverName;
}
}
if ($item->network == 'ws') { if ($item->network == 'ws') {
$uri .= ', obfs=' . ($item->tls ? 'wss' : 'ws'); $uri .= ', obfs=' . ($item->tls ? 'wss' : 'ws');
if ($item->networkSettings) { if ($item->networkSettings) {
@ -106,7 +117,7 @@ class ClientController extends Controller
$tlsSettings = json_decode($item->tlsSettings); $tlsSettings = json_decode($item->tlsSettings);
$proxies .= ', tls=' . ($item->tls ? "true" : "false"); $proxies .= ', tls=' . ($item->tls ? "true" : "false");
if (isset($tlsSettings->allowInsecure)) { if (isset($tlsSettings->allowInsecure)) {
$proxies .= ', skip-cert-verify=true'; $proxies .= ', skip-cert-verify=' . ($tlsSettings->allowInsecure ? "true" : "false");
} }
} }
if ($item->network == 'ws') { if ($item->network == 'ws') {
@ -162,8 +173,9 @@ class ClientController extends Controller
$array['alterId'] = $user->v2ray_alter_id; $array['alterId'] = $user->v2ray_alter_id;
$array['cipher'] = 'auto'; $array['cipher'] = 'auto';
if ($item->tls) { if ($item->tls) {
$tlsSettings = json_decode($item->tlsSettings);
$array['tls'] = true; $array['tls'] = true;
$array['skip-cert-verify'] = true; if (isset($tlsSettings->allowInsecure)) $array['skip-cert-verify'] = ($tlsSettings->allowInsecure ? true : false );
} }
if ($item->network == 'ws') { if ($item->network == 'ws') {
$array['network'] = $item->network; $array['network'] = $item->network;