mirror of
https://github.com/lkddi/Xboard.git
synced 2026-04-24 12:07:28 +08:00
feat: Trojan Reality support and protocol distribution optimizations
This commit is contained in:
xboard
+90
-28
@@ -23,6 +23,19 @@ class Stash extends AbstractProtocol
|
||||
Server::TYPE_HTTP,
|
||||
];
|
||||
protected $protocolRequirements = [
|
||||
// Global rules applied regardless of client version (features Stash never supports)
|
||||
'*' => [
|
||||
'trojan' => [
|
||||
'protocol_settings.tls' => [
|
||||
'2' => '9999.0.0', // Trojan Reality not supported in Stash
|
||||
],
|
||||
],
|
||||
'vmess' => [
|
||||
'protocol_settings.network' => [
|
||||
'httpupgrade' => '9999.0.0', // httpupgrade not supported in Stash
|
||||
],
|
||||
],
|
||||
],
|
||||
'stash' => [
|
||||
'anytls' => [
|
||||
'base_version' => '3.3.0' // AnyTLS 协议在3.3.0版本中添加
|
||||
@@ -110,10 +123,10 @@ class Stash extends AbstractProtocol
|
||||
array_push($proxy, self::buildTuic($item['password'], $item));
|
||||
array_push($proxies, $item['name']);
|
||||
}
|
||||
// if ($item['type'] === 'anytls') {
|
||||
// array_push($proxy, self::buildAnyTLS($item['password'], $item));
|
||||
// array_push($proxies, $item['name']);
|
||||
// }
|
||||
if ($item['type'] === Server::TYPE_ANYTLS) {
|
||||
array_push($proxy, self::buildAnyTLS($item['password'], $item));
|
||||
array_push($proxies, $item['name']);
|
||||
}
|
||||
if ($item['type'] === Server::TYPE_SOCKS) {
|
||||
array_push($proxy, self::buildSocks5($item['password'], $item));
|
||||
array_push($proxies, $item['name']);
|
||||
@@ -237,8 +250,8 @@ class Stash extends AbstractProtocol
|
||||
$array['cipher'] = 'auto';
|
||||
$array['udp'] = true;
|
||||
|
||||
$array['tls'] = data_get($protocol_settings, 'tls');
|
||||
$array['skip-cert-verify'] = data_get($protocol_settings, 'tls_settings.allow_insecure');
|
||||
$array['tls'] = (bool) data_get($protocol_settings, 'tls');
|
||||
$array['skip-cert-verify'] = (bool) data_get($protocol_settings, 'tls_settings.allow_insecure', false);
|
||||
if ($serverName = data_get($protocol_settings, 'tls_settings.server_name')) {
|
||||
$array['servername'] = $serverName;
|
||||
}
|
||||
@@ -266,6 +279,15 @@ class Stash extends AbstractProtocol
|
||||
$array['grpc-opts'] = [];
|
||||
$array['grpc-opts']['grpc-service-name'] = data_get($protocol_settings, 'network_settings.serviceName');
|
||||
break;
|
||||
case 'h2':
|
||||
$array['network'] = 'h2';
|
||||
$array['tls'] = true;
|
||||
$array['h2-opts'] = [];
|
||||
if ($path = data_get($protocol_settings, 'network_settings.path'))
|
||||
$array['h2-opts']['path'] = $path;
|
||||
if ($host = data_get($protocol_settings, 'network_settings.host'))
|
||||
$array['h2-opts']['host'] = is_array($host) ? $host : [$host];
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -297,6 +319,7 @@ class Stash extends AbstractProtocol
|
||||
break;
|
||||
case 2:
|
||||
$array['tls'] = true;
|
||||
$array['skip-cert-verify'] = (bool) data_get($protocol_settings, 'reality_settings.allow_insecure', false);
|
||||
if ($serverName = data_get($protocol_settings, 'reality_settings.server_name')) {
|
||||
$array['servername'] = $serverName;
|
||||
$array['sni'] = $serverName;
|
||||
@@ -335,11 +358,14 @@ class Stash extends AbstractProtocol
|
||||
$array['network'] = 'grpc';
|
||||
$array['grpc-opts']['grpc-service-name'] = data_get($protocol_settings, 'network_settings.serviceName');
|
||||
break;
|
||||
// case 'h2':
|
||||
// $array['network'] = 'h2';
|
||||
// $array['h2-opts']['host'] = data_get($protocol_settings, 'network_settings.host');
|
||||
// $array['h2-opts']['path'] = data_get($protocol_settings, 'network_settings.path');
|
||||
// break;
|
||||
case 'h2':
|
||||
$array['network'] = 'h2';
|
||||
$array['h2-opts'] = [];
|
||||
if ($path = data_get($protocol_settings, 'network_settings.path'))
|
||||
$array['h2-opts']['path'] = $path;
|
||||
if ($host = data_get($protocol_settings, 'network_settings.host'))
|
||||
$array['h2-opts']['host'] = is_array($host) ? $host : [$host];
|
||||
break;
|
||||
}
|
||||
|
||||
return $array;
|
||||
@@ -348,13 +374,36 @@ class Stash extends AbstractProtocol
|
||||
public static function buildTrojan($password, $server)
|
||||
{
|
||||
$protocol_settings = $server['protocol_settings'];
|
||||
$array = [];
|
||||
$array['name'] = $server['name'];
|
||||
$array['type'] = 'trojan';
|
||||
$array['server'] = $server['host'];
|
||||
$array['port'] = $server['port'];
|
||||
$array['password'] = $password;
|
||||
$array['udp'] = true;
|
||||
$array = [
|
||||
'name' => $server['name'],
|
||||
'type' => 'trojan',
|
||||
'server' => $server['host'],
|
||||
'port' => $server['port'],
|
||||
'password' => $password,
|
||||
'udp' => true,
|
||||
];
|
||||
|
||||
$tlsMode = (int) data_get($protocol_settings, 'tls', 1);
|
||||
switch ($tlsMode) {
|
||||
case 2: // Reality
|
||||
$array['tls'] = true;
|
||||
$array['skip-cert-verify'] = (bool) data_get($protocol_settings, 'reality_settings.allow_insecure', false);
|
||||
if ($serverName = data_get($protocol_settings, 'reality_settings.server_name')) {
|
||||
$array['sni'] = $serverName;
|
||||
}
|
||||
$array['reality-opts'] = [
|
||||
'public-key' => data_get($protocol_settings, 'reality_settings.public_key'),
|
||||
'short-id' => data_get($protocol_settings, 'reality_settings.short_id'),
|
||||
];
|
||||
break;
|
||||
default: // Standard TLS
|
||||
if ($serverName = data_get($protocol_settings, 'server_name')) {
|
||||
$array['sni'] = $serverName;
|
||||
}
|
||||
$array['skip-cert-verify'] = (bool) data_get($protocol_settings, 'allow_insecure', false);
|
||||
break;
|
||||
}
|
||||
|
||||
switch (data_get($protocol_settings, 'network')) {
|
||||
case 'tcp':
|
||||
$headerType = data_get($protocol_settings, 'network_settings.header.type', 'tcp');
|
||||
@@ -370,11 +419,13 @@ class Stash extends AbstractProtocol
|
||||
$array['ws-opts']['headers'] = ['Host' => $host];
|
||||
}
|
||||
break;
|
||||
case 'grpc':
|
||||
$array['network'] = 'grpc';
|
||||
if ($serviceName = data_get($protocol_settings, 'network_settings.serviceName'))
|
||||
$array['grpc-opts']['grpc-service-name'] = $serviceName;
|
||||
break;
|
||||
}
|
||||
if ($serverName = data_get($protocol_settings, 'server_name')) {
|
||||
$array['sni'] = $serverName;
|
||||
}
|
||||
$array['skip-cert-verify'] = data_get($protocol_settings, 'allow_insecure');
|
||||
|
||||
return $array;
|
||||
}
|
||||
|
||||
@@ -398,12 +449,18 @@ class Stash extends AbstractProtocol
|
||||
$array['type'] = 'hysteria';
|
||||
$array['auth-str'] = $password;
|
||||
$array['protocol'] = 'udp';
|
||||
$array['obfs'] = data_get($protocol_settings, 'obfs.open') ? data_get($protocol_settings, 'obfs.type') : null;
|
||||
if (data_get($protocol_settings, 'obfs.open')) {
|
||||
$array['obfs'] = data_get($protocol_settings, 'obfs.password');
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
$array['type'] = 'hysteria2';
|
||||
$array['auth'] = $password;
|
||||
$array['fast-open'] = true;
|
||||
if (data_get($protocol_settings, 'obfs.open')) {
|
||||
$array['obfs'] = data_get($protocol_settings, 'obfs.type', 'salamander');
|
||||
$array['obfs-password'] = data_get($protocol_settings, 'obfs.password');
|
||||
}
|
||||
break;
|
||||
}
|
||||
return $array;
|
||||
@@ -417,8 +474,6 @@ class Stash extends AbstractProtocol
|
||||
'type' => 'tuic',
|
||||
'server' => $server['host'],
|
||||
'port' => $server['port'],
|
||||
'uuid' => $password,
|
||||
'password' => $password,
|
||||
'congestion-controller' => data_get($protocol_settings, 'congestion_control', 'cubic'),
|
||||
'udp-relay-mode' => data_get($protocol_settings, 'udp_relay_mode', 'native'),
|
||||
'alpn' => data_get($protocol_settings, 'alpn', ['h3']),
|
||||
@@ -430,6 +485,13 @@ class Stash extends AbstractProtocol
|
||||
'version' => data_get($protocol_settings, 'version', 5),
|
||||
];
|
||||
|
||||
if (data_get($protocol_settings, 'version') === 4) {
|
||||
$array['token'] = $password;
|
||||
} else {
|
||||
$array['uuid'] = $password;
|
||||
$array['password'] = $password;
|
||||
}
|
||||
|
||||
$array['skip-cert-verify'] = (bool) data_get($protocol_settings, 'tls.allow_insecure', false);
|
||||
if ($serverName = data_get($protocol_settings, 'tls.server_name')) {
|
||||
$array['sni'] = $serverName;
|
||||
@@ -440,15 +502,15 @@ class Stash extends AbstractProtocol
|
||||
|
||||
public static function buildAnyTLS($password, $server)
|
||||
{
|
||||
$protocol_settings = $server['protocol_settings'];
|
||||
$protocol_settings = data_get($server, 'protocol_settings', []);
|
||||
$array = [
|
||||
'name' => $server['name'],
|
||||
'type' => 'anytls',
|
||||
'server' => $server['host'],
|
||||
'port' => $server['port'],
|
||||
'password' => $password,
|
||||
'sni' => data_get($protocol_settings, 'tls_settings.server_name'),
|
||||
'skip-cert-verify' => (bool) data_get($protocol_settings, 'tls_settings.allow_insecure', false),
|
||||
'sni' => data_get($protocol_settings, 'tls.server_name'),
|
||||
'skip-cert-verify' => (bool) data_get($protocol_settings, 'tls.allow_insecure', false),
|
||||
'udp' => true,
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user