Compare commits

..

25 Commits

Author SHA1 Message Date
mercury 4ef38775b0 update version 2024-09-10 15:30:59 +04:00
mercury abdb4d791a fix ipinfo case 2024-09-10 15:27:34 +04:00
mercury 6948239144 xray subscriptions: get['cdn'] -> domain without dns 2024-09-08 21:22:38 +04:00
mercury ff0fd177c7 xray subscriptions: get['cdn'] -> domain 2024-09-08 19:45:02 +04:00
mercury 28e66d46fd fix import with transport 2024-09-08 16:22:17 +04:00
mercury edee9c78c5 fix add user xray with transport 2024-09-08 14:54:43 +04:00
mercury 6ad8b3aa92 update version 2024-09-08 12:50:21 +04:00
mercury 31f1825d37 fix change transport 2024-09-08 12:40:51 +04:00
mercury 10d84da53e fix websocket -> reality 2024-09-08 00:58:37 +04:00
mercury c7cc0f31ad fix v2ray links 2024-09-03 19:23:38 +04:00
mercury e3ddb642d7 fix import, fix ws transport 2024-09-03 18:27:26 +04:00
mercury 589823e45d custom subdomain 2024-09-03 13:15:34 +04:00
mercury 0364188fe8 chat link 2024-09-03 10:48:15 +04:00
mercury 72edcc4757 websocket transport for xray 2024-09-03 10:19:00 +04:00
mercury 5988c4fcee display warp+ key 2024-08-27 13:46:08 +04:00
mercury a82147eeda update version 2024-08-26 23:23:09 +04:00
mercury 6bd21d06c0 fix list actions 2024-08-26 23:19:31 +04:00
mercury 3416cda826 qr for singbox 2024-08-25 23:30:19 +04:00
mercury 2e40daf0c4 update version 2024-08-21 23:04:58 +04:00
mercury 9c40b04392 custom outbound for ruleset 2024-08-18 20:01:53 +04:00
mercury 1217ea7a09 fix empty packagelist 2024-08-18 11:54:12 +04:00
mercury 7f6d462f22 fix name for short link vless 2024-08-18 02:11:05 +04:00
mercury 47876ecdb4 rule package_name separately 2024-08-18 02:00:09 +04:00
mercury 66f03709fc Merge branch 'master' into dev 2024-08-16 22:27:14 +04:00
mercury 1674f6929e fix ruleset list key 2024-08-16 22:24:23 +04:00
6 changed files with 346 additions and 65 deletions
+275 -62
View File
@@ -133,9 +133,18 @@ class Bot
case preg_match('~^/changeWG (\d+)$~', $this->input['callback'], $m):
$this->changeWG($m[1]);
break;
case preg_match('~^/changeTransport(?: (\d+))?$~', $this->input['callback'], $m):
$this->changeTransport($m[1] ?: false);
break;
case preg_match('~^/mirror$~', $this->input['message'], $m):
$this->menu('mirror');
break;
case preg_match('~^/appOutbound$~', $this->input['callback'], $m):
$this->appOutbound();
break;
case preg_match('~^/addSubdomain$~', $this->input['callback'], $m):
$this->addSubdomain();
break;
case preg_match('~^/id$~', $this->input['message'], $m):
$this->send($this->input['chat'], $this->input['from'], $this->input['message_id']);
break;
@@ -350,8 +359,8 @@ class Bot
case preg_match('~^/qrSS$~', $this->input['callback'], $m):
$this->qrSS();
break;
case preg_match('~^/qrXray (\d+)$~', $this->input['callback'], $m):
$this->qrXray($m[1]);
case preg_match('~^/qrXray (\d+)(?:_(\d+))?$~', $this->input['callback'], $m):
$this->qrXray($m[1], $m[2] ?: false);
break;
case preg_match('~^/qrMtproto$~', $this->input['callback'], $m):
$this->qrMtproto();
@@ -960,7 +969,7 @@ class Bot
if (!empty($s = trim($v))) {
$t = explode(';', $s);
if ($type == 'rulessetlist') {
if (preg_match('~^(?:direct|block|proxy):.+:https?://.+~', $t[0])) {
if (preg_match('~^.+:.+:https?://.+~', $t[0])) {
$list[$t[0]] = (bool) $t[1];
}
} else {
@@ -1347,7 +1356,7 @@ class Bot
$out[] = 'update xray';
$this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
$this->restartXray($json['xray']);
$this->setUpstreamDomain($json['xray']['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]);
$this->setUpstreamDomain($json['pac']['transport'] == 'Websocket' ? 't' : ($json['pac']['reality']['domain'] ?: $json['xray']['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]));
}
// ocserv
if (!empty($json['oc'])) {
@@ -1366,7 +1375,7 @@ class Bot
$t = file_get_contents('/config/nginx_default.conf');
if (!empty($json['pac']['domain'])) {
$t = preg_replace('/server_name ([^\n]+)?/', "server_name {$json['pac']['domain']};", $t);
$t = preg_replace('/server_name ([^\n]+)?/', "server_name *.{$json['pac']['domain']} {$json['pac']['domain']};", $t);
preg_match_all('~#-domain.+?#-domain~s', $t, $m);
foreach ($m[0] as $k => $v) {
$t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);
@@ -1601,9 +1610,9 @@ class Bot
}
}
public function qrXray($i)
public function qrXray($i, $s = false)
{
$link = $this->linkXray($i);
$link = $this->linkXray($i, $s);
$qr_file = __DIR__ . "/qr/xray.png";
exec("qrencode -t png -o $qr_file '$link'");
$r = $this->sendPhoto(
@@ -1687,7 +1696,7 @@ class Bot
$conf = $this->getPacConf();
$conf['domain'] = idn_to_ascii($domain);
$nginx = file_get_contents('/config/nginx.conf');
$t = preg_replace('/server_name ([^\n]+)?/', "server_name {$conf['domain']};", $nginx);
$t = preg_replace('/server_name ([^\n]+)?/', "server_name {$conf['domain']} *.{$conf['domain']};", $nginx);
preg_match_all('~#-domain.+?#-domain~s', $t, $m);
foreach ($m[0] as $k => $v) {
$t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);
@@ -1797,9 +1806,13 @@ class Bot
case 'letsencrypt':
$out[] = 'Install certificate:';
$this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
$adguardClient = $this->getPacConf()['adguardkey'];
$adguardClient = $adguardClient ? "-d $adguardClient.{$conf['domain']}" : '';
exec("certbot certonly --force-renew --preferred-chain 'ISRG Root X1' -n --agree-tos --email mail@{$conf['domain']} -d {$conf['domain']} -d oc.{$conf['domain']} -d np.{$conf['domain']} $adguardClient --webroot -w /certs/ --logs-dir /logs --max-log-backups 0 2>&1", $out, $code);
$adguardClient = $conf['adguardkey'] ? "-d {$conf['adguardkey']}.{$conf['domain']}" : '';
if (!empty($conf['subdomain'])) {
foreach ($conf['subdomain'] as $v) {
$custom .= " -d $v";
}
}
exec("certbot certonly --force-renew --preferred-chain 'ISRG Root X1' -n --agree-tos --email mail@{$conf['domain']} -d {$conf['domain']} -d oc.{$conf['domain']} -d np.{$conf['domain']} $adguardClient $custom --webroot -w /certs/ --logs-dir /logs --max-log-backups 0 2>&1", $out, $code);
if ($code > 0) {
$this->send($this->input['chat'], "ERROR\n" . implode("\n", $out));
break;
@@ -2048,6 +2061,30 @@ class Bot
'args' => [],
];
}
public function addSubdomain()
{
$r = $this->send(
$this->input['chat'],
"@{$this->input['username']} enter subdomain",
$this->input['message_id'],
reply: 'enter subdomain',
);
$_SESSION['reply'][$r['result']['message_id']] = [
'start_message' => $this->input['message_id'],
'callback' => 'setSubdomain',
'args' => [],
];
}
public function setSubdomain($text)
{
$c = $this->getPacConf();
$c['subdomain'] = array_filter(explode(',', $text), fn($e) => !empty(trim($e)));
$this->setPacConf($c);
$this->menu('config');
}
public function enterPage()
{
$r = $this->send(
@@ -2241,8 +2278,8 @@ DNS-over-HTTPS with IP:
public function addInclude(string $domains, $type)
{
if ($type == 'rulessetlist' && !preg_match('~^(?:direct|block|proxy):.+:https?://.+~', $domains)) {
$this->send($this->input['from'], 'wrong pattern, enter [direct|block|proxy]:time:URL');
if ($type == 'rulessetlist' && !preg_match('~^.+:.+:https?://.+~', $domains)) {
$this->send($this->input['from'], 'wrong pattern, enter [direct|block|proxy|custom outbound]:time:URL');
return;
}
$domains = explode(',', $domains);
@@ -2250,7 +2287,7 @@ DNS-over-HTTPS with IP:
if (!empty($domains)) {
$conf = $this->getPacConf();
foreach ($domains as $k => $v) {
$conf[$type][idn_to_ascii(trim($v))] = true;
$conf[$type][$type == 'rulessetlist' ? trim($v) : idn_to_ascii(trim($v))] = true;
}
ksort($conf[$type]);
$this->setPacConf($conf);
@@ -3383,11 +3420,26 @@ DNS-over-HTTPS with IP:
);
}
public function appOutbound()
{
$p = $this->getPacConf();
$p['app_outbound'] = !$p['app_outbound'];
$p = $this->setPacConf($p);
$this->xtlsapp();
}
public function xtlsapp($page = 0)
{
$text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> package list';
$data = $this->listPac('packagelist', $page, 'xtlsapp');
$p = $this->getPacConf();
$data[] = [
[
'text' => 'set to ' . ($p['app_outbound'] ? 'proxy' : 'direct'),
'callback_data' => "/appOutbound",
],
];
$data[] = [
[
'text' => $this->i18n('back'),
@@ -3440,11 +3492,11 @@ DNS-over-HTTPS with IP:
$data[] = [
[
'text' => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . idn_to_utf8($k),
'callback_data' => "/change$type $i",
'callback_data' => "/change$type " . ($i + $page * $this->limit),
],
[
'text' => 'delete',
'callback_data' => "/delete$type $i",
'callback_data' => "/delete$type " . ($i + $page * $this->limit),
],
];
$i++;
@@ -3662,7 +3714,7 @@ DNS-over-HTTPS with IP:
[
[
'text' => $this->i18n('chat'),
'url' => "https://t.me/vpnbot_group",
'url' => "https://t.me/+BYuWVd36cZYwNTMy",
],
[
'text' => $this->i18n('donate'),
@@ -3711,17 +3763,36 @@ DNS-over-HTTPS with IP:
}
}
public function geodb()
{
$this->answer($this->input['callback_id'], 'in developing...');
}
public function linkXray($i)
public function linkXray($i, $s = false)
{
$c = $this->getXray();
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
return "vless://{$c['inbounds'][0]['settings']['clients'][$i]['id']}@$domain:443?security=reality&sni={$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}&fp=chrome&pbk={$pac['xray']}&sid={$c['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0]}&type=tcp&flow=xtls-rprx-vision#vpnbot";
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
$si = "$scheme://{$domain}/pac/" . base64_encode(serialize([
'h' => $hash,
't' => 'si',
's' => $c['inbounds'][0]['settings']['clients'][$i]['id'],
]));
$v2 = "$scheme://{$domain}/pac/" . base64_encode(serialize([
'h' => $hash,
't' => 's',
's' => $c['inbounds'][0]['settings']['clients'][$i]['id'],
]));
switch ($s) {
case 1:
return "v2rayng://install-config?url=$v2#{$c['inbounds'][0]['settings']['clients'][$i]['id']}";
case 2:
return "sing-box://import-remote-profile/?url={$si}#{$c['inbounds'][0]['settings']['clients'][$i]['email']}";
default:
if ($pac['transport'] == 'Websocket') {
return "vless://{$c['inbounds'][0]['settings']['clients'][$i]['id']}@$domain:443?flow=&path=%2Fws&security=tls&sni=$domain&fp=chrome&type=ws#{$c['inbounds'][0]['settings']['clients'][$i]['email']}";
}
return "vless://{$c['inbounds'][0]['settings']['clients'][$i]['id']}@$domain:443?security=reality&sni={$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}&fp=chrome&pbk={$pac['xray']}&sid={$c['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0]}&type=tcp&flow=xtls-rprx-vision#{$c['inbounds'][0]['settings']['clients'][$i]['email']}";
}
}
public function dockerApi($url, $method = 'GET', $data = [])
@@ -3956,11 +4027,15 @@ DNS-over-HTTPS with IP:
public function addxrus($user)
{
$c = $this->getXray();
$p = $this->getPacConf();
$uuid = trim($this->ssh('xray uuid', 'xr'));
$c['inbounds'][0]['settings']['clients'][] = [
'id' => $uuid,
'flow' => 'xtls-rprx-vision',
'email' => $user,
$c['inbounds'][0]['settings']['clients'][] = $p['transport'] == 'Websocket' ? [
'id' => $uuid,
'email' => $user,
] : [
'id' => $uuid,
'flow' => 'xtls-rprx-vision',
'email' => $user,
];
$this->restartXray($c);
$this->userXr(count($c['inbounds'][0]['settings']['clients']) - 1);
@@ -4146,18 +4221,34 @@ DNS-over-HTTPS with IP:
$this->generateSecretXray();
}
$c = $this->getXray();
$p = $this->getPacConf();
$text[] = "Menu -> " . $this->i18n('xray');
$text[] = "fake domain: <code>{$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}</code>";
if (!empty($fake = $c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0])) {
$text[] = "fake domain: <code>$fake</code>";
}
$text[] = 'transport: ' . ($p['transport'] ?: 'Reality');
$data[] = [
[
'text' => $this->i18n('changeFakeDomain'),
'callback_data' => "/changeFakeDomain",
'text' => $this->i18n('Reality') . ' ' . ($p['transport'] != 'Websocket' ? $this->i18n('on') : $this->i18n('off')),
'callback_data' => "/changeTransport",
],
[
'text' => $this->i18n('selfFakeDomain'),
'callback_data' => "/selfFakeDomain",
'text' => $this->i18n('Websocket') . ' ' . ($p['transport'] == 'Websocket' ? $this->i18n('on') : $this->i18n('off')),
'callback_data' => "/changeTransport 1",
],
];
if ($p['transport'] != 'Websocket') {
$data[] = [
[
'text' => $this->i18n('changeFakeDomain'),
'callback_data' => "/changeFakeDomain",
],
[
'text' => $this->i18n('selfFakeDomain'),
'callback_data' => "/selfFakeDomain",
],
];
}
$data[] = [
[
'text' => $this->i18n('v2ray templates'),
@@ -4312,6 +4403,7 @@ DNS-over-HTTPS with IP:
{
$text[] = "Menu -> " . $this->i18n('warp');
$text[] = "status: " . $this->warpStatus();
$text[] = "key: " . $this->getPacConf()['warp'];
$data[] = [
[
'text' => $this->i18n('set key'),
@@ -4395,7 +4487,7 @@ DNS-over-HTTPS with IP:
$hash = substr(md5($this->key), 0, 8);
$text[] = "Menu -> " . $this->i18n('xray') . " -> {$c['email']}\n";
$text[] = "<code>{$this->linkXray($i)}</code>\n";
$text[] = "<pre><code>{$this->linkXray($i)}</code></pre>\n";
$text[] = "import subscribe:";
$text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=s&r=v&s={$c['id']}#{$c['email']}'>v2rayng</a>";
@@ -4403,8 +4495,8 @@ DNS-over-HTTPS with IP:
$text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=s&r=st&s={$c['id']}#{$c['email']}'>streisand</a>";
$text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=si&r=h&s={$c['id']}#{$c['email']}'>hiddify</a>";
$text[] = "\nv2ray config: <code>$scheme://{$domain}/pac?h=$hash&t=s&s={$c['id']}</code>";
$text[] = "sing-box config: <code>$scheme://{$domain}/pac?h=$hash&t=si&s={$c['id']}</code>";
$text[] = "\nv2ray config: <pre><code>$scheme://{$domain}/pac?h=$hash&t=s&s={$c['id']}</code></pre>";
$text[] = "sing-box config: <pre><code>$scheme://{$domain}/pac?h=$hash&t=si&s={$c['id']}</code></pre>";
$text[] = "sing-box windows: <a href='$scheme://{$domain}/pac?h=$hash&t=si&r=w&s={$c['id']}'>windows service</a>";
$data[] = [
@@ -4441,9 +4533,17 @@ DNS-over-HTTPS with IP:
];
$data[] = [
[
'text' => $this->i18n('show QR'),
'text' => $this->i18n('qr short'),
'callback_data' => "/qrXray $i",
],
[
'text' => $this->i18n('qr v2ray'),
'callback_data' => "/qrXray {$i}_1",
],
[
'text' => $this->i18n('qr singbox'),
'callback_data' => "/qrXray {$i}_2",
],
];
$data[] = [
[
@@ -4538,19 +4638,23 @@ DNS-over-HTTPS with IP:
't' => 'si',
's' => $uid,
]));
$v2 = "$scheme://{$domain}/pac?h=$hash&t=s&s=$uid";
$v2 = "$scheme://{$domain}/pac/" . base64_encode(serialize([
'h' => $hash,
't' => 's',
's' => $uid,
]));
switch ($_GET['r']) {
case 'si':
header("Location: sing-box://import-remote-profile/?url=" . $si);
header("Location: sing-box://import-remote-profile/?url=$si");
exit;
case 'st':
header("Location: streisand://import/$v2");
exit;
case 'v':
header("Location: v2rayng://install-config?url=" . urlencode($v2));
header("Location: v2rayng://install-config?url=$v2");
exit;
case 'h':
header("Location: hiddify://install-config/?url=" . $si);
header("Location: hiddify://install-config/?url=$si");
exit;
case 'w':
$link = htmlspecialchars($si, ENT_XML1, 'UTF-8');
@@ -4588,11 +4692,42 @@ DNS-over-HTTPS with IP:
switch ($_GET['t']) {
case 's':
$c['outbounds'][0]['settings']['vnext'][0]['address'] = $domain;
$c['outbounds'][0]['settings']['vnext'][0]['users'][0]['id'] = $uid;
$c['outbounds'][0]['streamSettings']['realitySettings']['serverName'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
$c['outbounds'][0]['streamSettings']['realitySettings']['publicKey'] = $pac['xray'];
$c['outbounds'][0]['streamSettings']['realitySettings']['shortId'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
$c['outbounds'][0]['settings']['vnext'][0]['address'] = $_GET['cdn'] ?: $domain;
$c['outbounds'][0]['settings']['vnext'][0]['users'][0] = [
'id' => $uid,
'encryption' => 'none',
];
if ($pac['transport'] == 'Websocket') {
$c['outbounds'][0]['streamSettings'] = [
"network" => "ws",
"security" => "tls",
"wsSettings" => [
"path" => "/ws?ed=2560"
],
"tlsSettings" => [
"allowInsecure" => false,
"serverName" => $_GET['cdn'] ?: $domain,
"fingerprint" => "chrome"
]
];
unset($c['outbounds'][0]['mux']);
} else {
$c['outbounds'][0]['settings']['vnext'][0]['users'][0]["flow"] = "xtls-rprx-vision";
$c['outbounds'][0]['streamSettings'] = [
"network" => "tcp",
"security" => "reality",
"realitySettings" => [
"serverName" => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
"fingerprint" => "chrome",
"publicKey" => $pac['xray'],
"shortId" => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
]
];
$c['outbounds'][0]['mux'] = [
"enabled" => false,
"concurrency" => -1
];
}
foreach ($c['routing']['rules'] as $k => $v) {
if (array_key_exists('domain', $v) && $v['domain'] == '~pac~') {
@@ -4609,11 +4744,24 @@ DNS-over-HTTPS with IP:
$c['dns']['servers'][0]['address'] = "tls://" . ($pac['adguardkey'] ? "{$pac['adguardkey']}." : '') . "$domain";
}
$c['outbounds'][0]['server'] = $domain;
$c['outbounds'][0]['uuid'] = $uid;
$c['outbounds'][0]['tls']['reality']['public_key'] = $pac['xray'];
$c['outbounds'][0]['tls']['server_name'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
$c['outbounds'][0]['tls']['reality']['short_id'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
$c['outbounds'][0]['server'] = $_GET['cdn'] ?: $domain;
$c['outbounds'][0]['uuid'] = $uid;
if ($pac['transport'] == 'Websocket') {
unset($c['outbounds'][0]['tls']['reality']);
unset($c['outbounds'][0]['flow']);
$c['outbounds'][0]["transport"] = [
"type" => "ws",
"path" => "/ws"
];
$c['outbounds'][0]['tls']['server_name'] = $_GET['cdn'] ?: $domain;
} else {
unset($c['outbounds'][0]["transport"]);
$c['outbounds'][0]['flow'] = 'xtls-rprx-vision';
$c['outbounds'][0]['tls']['reality']['public_key'] = $pac['xray'];
$c['outbounds'][0]['tls']['server_name'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
$c['outbounds'][0]['tls']['reality']['short_id'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
}
foreach ($c['route']['rules'] as $k => $v) {
if (array_key_exists('domain_suffix', $v) && $v['domain_suffix'] == '~pac~') {
$c['route']['rules'][$k]['domain_suffix'] = array_keys(array_filter($pac['includelist'] ?: []));
@@ -4641,21 +4789,18 @@ DNS-over-HTTPS with IP:
unset($route['rules'][$k]);
}
}
$route['rules'] = array_values($route['rules']);
return $route;
}
public function addPackageRule($route)
{
foreach ($route['rules'] as $k => $v) {
$t[$v['outbound']] = $k;
}
$p = $this->getPacConf();
if (!empty($p['packagelist'])) {
foreach ($p['packagelist'] as $k => $v) {
if (!empty($v)) {
$route['rules'][$t['proxy']]['package_name'][] = $k;
}
}
if (!empty($t = array_filter($p['packagelist'] ?: []))) {
$route['rules'][] = [
'package_name' => array_keys($t),
'outbound' => $p['app_outbound'] ? 'direct' : 'proxy',
];
}
return $route;
}
@@ -4776,6 +4921,8 @@ DNS-over-HTTPS with IP:
$c['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0] = $shortId;
$pac = $this->getPacConf();
$pac['xray'] = $public;
$pac['reality']['shortId'] = $shortId;
$pac['reality']['privateKey'] = $private;
$this->setPacConf($pac);
$this->restartXray($c);
}
@@ -5060,8 +5207,14 @@ DNS-over-HTTPS with IP:
public function configMenu()
{
exec('git -C / fetch');
$conf = $this->getPacConf();
$text[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\nnp.{$conf['domain']}\noc.{$conf['domain']}" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']}" : '') : $this->i18n('domain explain');
$conf = $this->getPacConf();
if (!empty($conf['subdomain'])) {
$custom = "\ncustom:\n";
foreach ($conf['subdomain'] as $v) {
$custom .= "$v\n";
}
}
$text[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\nnp.{$conf['domain']} (for naiveproxy)\noc.{$conf['domain']} (for openconnect)" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']} (for adguard DoT)" : '') . $custom : $this->i18n('domain explain');
$ssl = $this->expireCert();
$text[] = $conf['domain'] ? "\nSSL: " . ($ssl ? date('Y-m-d H:i:s', $this->expireCert()) : 'none') : '';
@@ -5071,6 +5224,10 @@ DNS-over-HTTPS with IP:
'text' => $conf['domain'] ? "{$this->i18n('delete')} {$conf['domain']}" : $this->i18n('install domain'),
'callback_data' => $conf['domain'] ? '/deldomain' : '/domain',
],
[
'text' => $this->i18n('subdomain'),
'callback_data' => '/addSubdomain',
],
],
];
if ($conf['domain']) {
@@ -5349,8 +5506,12 @@ DNS-over-HTTPS with IP:
public function setFakeDomain($domain, $self = false)
{
$c = $this->getXray();
$p = $this->getPacConf();
$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0] = $domain;
$c['inbounds'][0]['streamSettings']['realitySettings']['dest'] = $self ? "10.10.1.2:443" : "$domain:443";
$p['reality']['domain'] = $domain;
$p['reality']['destination'] = $self ? "10.10.1.2:443" : "$domain:443";
$this->setPacConf($p);
$this->restartXray($c);
$this->setUpstreamDomain($domain);
$this->xray();
@@ -5366,6 +5527,58 @@ DNS-over-HTTPS with IP:
}
}
public function changeTransport($ws = null)
{
$p = $this->getPacConf();
$x = $this->getXray();
$p['transport'] = $ws ? 'Websocket' : 'Reality';
if (!empty($ws)) {
$p['reality']['domain'] = $x['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0] ?: $p['reality']['domain'];
$p['reality']['destination'] = $x['inbounds'][0]['streamSettings']['realitySettings']['dest'] ?: $p['reality']['destination'];
$p['reality']['shortId'] = $x['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0] ?: $p['reality']['shortId'];
foreach ($x['inbounds'][0]['settings']['clients'] as $k => $v) {
unset($x['inbounds'][0]['settings']['clients'][$k]['flow']);
}
$x['inbounds'][0]['streamSettings'] = [
"network" => "ws",
"wsSettings" => [
"path" => "/ws"
]
];
} else {
foreach ($x['inbounds'][0]['settings']['clients'] as $k => $v) {
$x['inbounds'][0]['settings']['clients'][$k]['flow'] = 'xtls-rprx-vision';
}
$x['inbounds'][0]['streamSettings'] = [
"network" => "tcp",
"realitySettings" => [
"dest" => $p['reality']['destination'] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['dest'],
"maxClientVer" => "",
"maxTimeDiff" => 0,
"minClientVer" => "",
"privateKey" => $p['reality']['privateKey'],
"serverNames" => [
$p['reality']['domain'] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]
],
"shortIds" => [$p['reality']['shortId']] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
"show" => false,
"xver" => 0
],
"tcpSettings" => [
"acceptProxyProtocol" => true
],
"sockopt" => [
"acceptProxyProtocol" => true
],
"security" => "reality"
];
}
$this->setUpstreamDomain($ws ? 't' : ($p['reality']['domain'] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]));
$this->setPacConf($p);
$this->restartXray($x);
$this->xray();
}
public function setBackup($text)
{
$text = trim($text);
+2 -2
View File
@@ -262,8 +262,8 @@ $i = [
'ru' => 'очистить',
],
'xray' => [
'en' => 'XTLS-Reality',
'ru' => 'XTLS-Reality',
'en' => 'Xray',
'ru' => 'Xray',
],
'geodb' => [
'en' => 'GeoIp/GeoSite',
+22
View File
@@ -64,6 +64,17 @@ http {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location /ws {
proxy_pass http://xr:443;
proxy_redirect off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 5d;
}
location ~\.well-known {
access_log /logs/nginx_certbot_access;
root /certs/;
@@ -124,6 +135,17 @@ http {
# proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection "upgrade";
# }
# location /ws {
# proxy_pass http://xr:443;
# proxy_redirect off;
# proxy_http_version 1.1;
# proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection "upgrade";
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_read_timeout 5d;
# }
#-domain
#-ssl
# # The DoH server block
+22
View File
@@ -64,6 +64,17 @@ http {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location /ws {
proxy_pass http://xr:443;
proxy_redirect off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 5d;
}
location ~\.well-known {
access_log /logs/nginx_certbot_access;
root /certs/;
@@ -124,6 +135,17 @@ http {
# proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection "upgrade";
# }
# location /ws {
# proxy_pass http://xr:443;
# proxy_redirect off;
# proxy_http_version 1.1;
# proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection "upgrade";
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_read_timeout 5d;
# }
#-domain
#-ssl
# # The DoH server block
+1 -1
View File
@@ -3,7 +3,7 @@ b:
u: # запуск контейнеров
bash ./update/update.sh &
touch ./override.env
IP=$(shell curl https://ipinfo.io/ip) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
IP=$(shell curl ipinfo.io/ip) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
d: # остановка контейнеров
-kill -9 $(shell cat ./update/update_pid) > /dev/null
docker compose down --remove-orphans
+24
View File
@@ -1,3 +1,27 @@
10.09.2024 v1.51
- фикс ipinfo
08.09.2024 v1.50
- fix import with transport
08.09.2024 v1.49
- fix add user xray with transport
08.09.2024 v1.48
- fix change xray transport, save private key xray
08.09.2024 v1.47
- fix websocket -> reality
03.09.2024 v1.46.2
- fix link v2ray
03.09.2024 v1.46.1
- fix import
- fix websocket domain
03.09.2024 v1.46
- возможность добавить кастомный поддомен для Letsencrypt
03.09.2024 v1.45
- выбор транспорта reality/websocket
26.08.2024 v1.44
- qr для xtls
- фикс действий на элементом списков
21.08.2024 v1.43
- singbox:поддержка кастомных outbound для ruleset
16.08.2024 v1.42.1
- фикс добавления рулсетов с длинными урл
16.08.2024 v1.42