yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-09-20 12:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #468 from betaxab/fix-grpc-protocol

Browse Source
This commit is contained in:
tokumeikoi 2021-07-31 13:17:06 +09:00 committed by GitHub
commit 448b5382b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Client/Protocols/AnXray.php
View File

@ -64,8 +64,14 @@ class AnXray
"encryption" => "none", "encryption" => "none",
"type" => urlencode($server['network']), "type" => urlencode($server['network']),
"security" => $server['tls'] ? "tls" : "", "security" => $server['tls'] ? "tls" : "",
"sni" => $server['tls'] ? urlencode(json_decode($server['tlsSettings'], true)['serverName']) : ""
]; ];
if ($server['tls']) {
if ($server['tlsSettings']) {
$tlsSettings = json_decode($server['tlsSettings'], true);
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
$config['sni'] = urlencode($tlsSettings['serverName']);
}
}
if ((string)$server['network'] === 'ws') { if ((string)$server['network'] === 'ws') {
$wsSettings = json_decode($server['networkSettings'], true); $wsSettings = json_decode($server['networkSettings'], true);
if (isset($wsSettings['path'])) $config['path'] = urlencode($wsSettings['path']); if (isset($wsSettings['path'])) $config['path'] = urlencode($wsSettings['path']);

2
app/Http/Controllers/Client/Protocols/Passwall.php
View File

@ -75,7 +75,7 @@ class Passwall
} }
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = json_decode($server['networkSettings'], true); $grpcSettings = json_decode($server['networkSettings'], true);
if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
} }
return "vmess://" . base64_encode(json_encode($config)) . "\r\n"; return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
} }

2
app/Http/Controllers/Client/Protocols/SSRPlus.php
View File

@ -75,7 +75,7 @@ class SSRPlus
} }
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = json_decode($server['networkSettings'], true); $grpcSettings = json_decode($server['networkSettings'], true);
if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
} }
return "vmess://" . base64_encode(json_encode($config)) . "\r\n"; return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
} }

2
app/Http/Controllers/Client/Protocols/V2rayN.php
View File

@ -75,7 +75,7 @@ class V2rayN
} }
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = json_decode($server['networkSettings'], true); $grpcSettings = json_decode($server['networkSettings'], true);
if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
} }
return "vmess://" . base64_encode(json_encode($config)) . "\r\n"; return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
} }

2
app/Http/Controllers/Client/Protocols/V2rayNG.php
View File

@ -75,7 +75,7 @@ class V2rayNG
} }
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = json_decode($server['networkSettings'], true); $grpcSettings = json_decode($server['networkSettings'], true);
if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
} }
return "vmess://" . base64_encode(json_encode($config)) . "\r\n"; return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
} }