Compare commits

...

13 Commits

Author SHA1 Message Date
mercury eb1ad21c88 domain for links 2024-09-17 20:15:34 +04:00
mercury a3ca7d9ed8 fix naming clients AdgHome + xray 2024-09-16 13:07:32 +04:00
mercury 60ba3cf15c fix name clients AdguardHome 2024-09-16 12:17:20 +04:00
mercury cd8bcbe05a singbox: tls->https+user
xray: add user to AdH
2024-09-16 00:06:57 +04:00
mercury 6cc05c88e7 autoupdate command 2024-09-15 01:16:03 +04:00
mercury 795c357897 domain for amnezia 2024-09-15 00:50:46 +04:00
mercury e172868f39 fix checkcert notify 2024-09-10 15:48:55 +04:00
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
3 changed files with 173 additions and 29 deletions
+153 -28
View File
@@ -139,12 +139,18 @@ class Bot
case preg_match('~^/mirror$~', $this->input['message'], $m):
$this->menu('mirror');
break;
case preg_match('~^/autoupdate$~', $this->input['message'], $m):
$this->autoupdate();
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('~^/addLinkDomain$~', $this->input['callback'], $m):
$this->addLinkDomain();
break;
case preg_match('~^/id$~', $this->input['message'], $m):
$this->send($this->input['chat'], $this->input['from'], $this->input['message_id']);
break;
@@ -1090,6 +1096,10 @@ class Bot
]
]);
}
if ($this->getPacConf()['autoupdate']) {
$this->input['chat'] = $this->input['from'] = $c['admin'][0];
$this->applyupdatebot();
}
}
}
}
@@ -1101,7 +1111,7 @@ class Bot
{
try {
require __DIR__ . '/config.php';
if (!empty($c['admin']) && (empty($this->time2) || ((time() - $this->time2) > 3600))) {
if (!empty($c['admin']) && date('H') == 12 && (empty($this->time2) || ((time() - $this->time2) > 4600))) {
$this->time2 = time();
$cert = $this->expireCert();
if (!empty($cert) && $cert - 60 * 60 * 24 * 14 < time()) {
@@ -1356,7 +1366,8 @@ 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->adguardXrayClients();
$this->setUpstreamDomain($json['pac']['transport'] == 'Websocket' ? 't' : ($json['pac']['reality']['domain'] ?: $json['xray']['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]));
}
// ocserv
if (!empty($json['oc'])) {
@@ -1590,7 +1601,7 @@ class Bot
{
$conf = $this->getPacConf();
$ip = $this->ip;
$domain = $conf['domain'] ?: $ip;
$domain = $this->getDomain();
$scheme = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https';
$ss = $this->getSSConfig();
$port = !empty($ss['plugin']) ? (!empty($ssl) ? 443 : 80) : getenv('SSPORT');
@@ -2077,10 +2088,41 @@ class Bot
];
}
public function addLinkDomain()
{
$r = $this->send(
$this->input['chat'],
"@{$this->input['username']} enter domain for link",
$this->input['message_id'],
reply: 'enter domain for link',
);
$_SESSION['reply'][$r['result']['message_id']] = [
'start_message' => $this->input['message_id'],
'callback' => 'setLinkDomain',
'args' => [],
];
}
public function setLinkDomain($text)
{
$c = $this->getPacConf();
if (empty($text)) {
unset($c['linkdomain']);
} else {
$c['linkdomain'] = trim($text);
}
$this->setPacConf($c);
$this->menu('config');
}
public function setSubdomain($text)
{
$c = $this->getPacConf();
$c['subdomain'] = array_filter(explode(',', $text), fn($e) => !empty(trim($e)));
if (empty($text)) {
unset($c['subdomain']);
} else {
$c['subdomain'] = array_filter(explode(',', $text), fn($e) => !empty(trim($e)));
}
$this->setPacConf($c);
$this->menu('config');
}
@@ -2152,6 +2194,61 @@ class Bot
$this->menu('adguard');
}
public function guidv4($data = null) {
// Generate 16 bytes (128 bits) of random data or use the data passed into the function.
$data = $data ?? random_bytes(16);
assert(strlen($data) == 16);
// Set version to 0100
$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
// Set bits 6-7 to 10
$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
// Output the 36 character UUID.
return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
}
public function adguardXrayClients()
{
$xr = $this->getXray();
$ad = yaml_parse_file($this->adguard);
foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
$tmp[] = [
'safe_search' => [
'enabled' => true,
'bing' => true,
'duckduckgo' => true,
'google' => true,
'pixabay' => true,
'yandex' => true,
'youtube' => true,
],
'blocked_services' => [
'schedule' => ['time_zone' => date_default_timezone_get()],
'ids' => [],
],
'name' => $v['email'],
'ids' => [$v['id']],
'tags' => [],
'upstreams' => [],
'uid' => $v['id'],
'upstreams_cache_size' => 0,
'upstreams_cache_enabled' => false,
'use_global_settings' => true,
'filtering_enabled' => false,
'parental_enabled' => false,
'safebrowsing_enabled' => false,
'use_global_blocked_services' => true,
'ignore_querylog' => false,
'ignore_statistics' => false,
];
}
$ad['clients']['persistent'] = $tmp;
yaml_emit_file($this->adguard, $ad);
$this->stopAd();
$this->startAd();
}
public function checkdns()
{
$r = $this->send(
@@ -3175,7 +3272,7 @@ DNS-over-HTTPS with IP:
$mpac = stat(__DIR__ . '/zapretlists/mpac');
$pac = stat(__DIR__ . '/zapretlists/pac');
$conf = $this->getPacConf();
$ip = $conf['domain'] ?: $this->ip;
$ip = $this->getDomain();
$hash = substr(md5($this->key), 0, 8);
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$text = <<<text
@@ -3587,7 +3684,7 @@ DNS-over-HTTPS with IP:
{
$conf = $this->getPacConf();
$ip = $this->ip;
$domain = $conf['domain'] ?: $ip;
$domain = $this->getDomain();
$scheme = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https';
$ss = $this->getSSConfig();
$v2ray = !empty($ss['plugin']) ? 'ON' : 'OFF';
@@ -3767,7 +3864,7 @@ DNS-over-HTTPS with IP:
{
$c = $this->getXray();
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$domain = $this->getDomain();
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
$si = "$scheme://{$domain}/pac/" . base64_encode(serialize([
@@ -3841,8 +3938,9 @@ DNS-over-HTTPS with IP:
public function naiveMenu()
{
$pac = $this->getPacConf();
$domain = $this->getDomain();
$text[] = "Menu -> NaiveProxy";
$text[] = "<code>https://{$pac['naive']['user']}:{$pac['naive']['pass']}@np.{$pac['domain']}</code>";
$text[] = "<code>https://{$pac['naive']['user']}:{$pac['naive']['pass']}@np.$domain</code>";
$data[] = [
[
'text' => $this->i18n('change login'),
@@ -3934,6 +4032,7 @@ DNS-over-HTTPS with IP:
public function ocMenu()
{
$pac = $this->getPacConf();
$domain = $this->getDomain();
$ocserv = file_get_contents('/config/ocserv.conf');
preg_match('~^camouflage_secret[^\n]+?"([^"]+)*"~sm', $ocserv, $m);
$cs = $m[1];
@@ -3942,7 +4041,7 @@ DNS-over-HTTPS with IP:
$pass = htmlspecialchars($pac['ocserv']);
$text[] = "Menu -> OpenConnect";
if (!empty($m[1])) {
$text[] = "<code>https://oc.{$pac['domain']}/?$cs</code>";
$text[] = "<code>https://oc.$domain/?$cs</code>";
}
$text[] = "password: <span class='tg-spoiler'>$pass</span>";
$data[] = [
@@ -4005,6 +4104,7 @@ DNS-over-HTTPS with IP:
if ($i == $k) {
unset($r['inbounds'][0]['settings']['clients'][$k]);
$this->restartXray($r);
$this->adguardXrayClients();
break;
}
}
@@ -4027,13 +4127,18 @@ 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->adguardXrayClients();
$this->userXr(count($c['inbounds'][0]['settings']['clients']) - 1);
}
@@ -4080,6 +4185,7 @@ DNS-over-HTTPS with IP:
$c = $this->getXray();
$c['inbounds'][0]['settings']['clients'][$i]['email'] = $name;
$this->restartXray($c);
$this->adguardXrayClients();
$this->userXr($i);
}
@@ -4155,7 +4261,7 @@ DNS-over-HTTPS with IP:
public function templates($type)
{
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$domain = $this->getDomain();
$hash = substr(md5($this->key), 0, 8);
$text[] = "Menu -> " . $this->i18n('xray') . " -> $type templates";
$templates = $pac["{$type}templates"];
@@ -4478,7 +4584,7 @@ DNS-over-HTTPS with IP:
{
$c = $this->getXray()['inbounds'][0]['settings']['clients'][$i];
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$domain = $this->getDomain();
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
@@ -4565,10 +4671,16 @@ DNS-over-HTTPS with IP:
);
}
public function getDomain()
{
$c = $this->getPacConf();
return $c['linkdomain'] ?: ($c['domain'] ?: $this->ip);
}
public function v2raySubscription($key, $fs = 0)
{
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$domain = $this->getDomain();
$xr = $this->getXray();
$flag = true;
@@ -4608,7 +4720,7 @@ DNS-over-HTTPS with IP:
{
$type = $_GET['t'] == 's' ? 'v2ray' : 'sing';
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$domain = $this->getDomain();
$xr = $this->getXray();
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
@@ -4621,6 +4733,7 @@ DNS-over-HTTPS with IP:
}
$template = base64_decode($v["{$type}template"]);
$uid = $v['id'];
$email = $v['email'];
break;
}
}
@@ -4688,7 +4801,7 @@ DNS-over-HTTPS with IP:
switch ($_GET['t']) {
case 's':
$c['outbounds'][0]['settings']['vnext'][0]['address'] = $domain;
$c['outbounds'][0]['settings']['vnext'][0]['address'] = $_GET['cdn'] ?: $domain;
$c['outbounds'][0]['settings']['vnext'][0]['users'][0] = [
'id' => $uid,
'encryption' => 'none',
@@ -4702,14 +4815,14 @@ DNS-over-HTTPS with IP:
],
"tlsSettings" => [
"allowInsecure" => false,
"serverName" => $domain,
"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'] = [
$c['outbounds'][0]['settings']['vnext'][0]['users'][0]["flow"] = "xtls-rprx-vision";
$c['outbounds'][0]['streamSettings'] = [
"network" => "tcp",
"security" => "reality",
"realitySettings" => [
@@ -4737,10 +4850,10 @@ DNS-over-HTTPS with IP:
break;
case 'si':
if ($c['dns']['servers'][0]['address'] == '~dns~') {
$c['dns']['servers'][0]['address'] = "tls://" . ($pac['adguardkey'] ? "{$pac['adguardkey']}." : '') . "$domain";
$c['dns']['servers'][0]['address'] = "https://$domain/dns-query/$uid";
}
$c['outbounds'][0]['server'] = $domain;
$c['outbounds'][0]['server'] = $_GET['cdn'] ?: $domain;
$c['outbounds'][0]['uuid'] = $uid;
if ($pac['transport'] == 'Websocket') {
unset($c['outbounds'][0]['tls']['reality']);
@@ -4749,7 +4862,7 @@ DNS-over-HTTPS with IP:
"type" => "ws",
"path" => "/ws"
];
$c['outbounds'][0]['tls']['server_name'] = $domain;
$c['outbounds'][0]['tls']['server_name'] = $_GET['cdn'] ?: $domain;
} else {
unset($c['outbounds'][0]["transport"]);
$c['outbounds'][0]['flow'] = 'xtls-rprx-vision';
@@ -4829,7 +4942,7 @@ DNS-over-HTTPS with IP:
public function createRuleSet($route, $uid)
{
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$domain = $this->getDomain();
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
@@ -5046,7 +5159,7 @@ DNS-over-HTTPS with IP:
{
$conf = $this->getPacConf();
$ip = $this->ip;
$domain = $conf['domain'] ?: $ip;
$domain = $this->getDomain();
$scheme = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https';
$text = "$scheme://$domain/adguard\nLogin: admin\nPass: <span class='tg-spoiler'>{$conf['adpswd']}</span>\n\n";
if ($ssl) {
@@ -5221,9 +5334,13 @@ DNS-over-HTTPS with IP:
'callback_data' => $conf['domain'] ? '/deldomain' : '/domain',
],
[
'text' => $this->i18n('subdomain'),
'text' => $this->i18n('+ subdomain'),
'callback_data' => '/addSubdomain',
],
[
'text' => $this->i18n('domain for link'),
'callback_data' => '/addLinkDomain',
],
],
];
if ($conf['domain']) {
@@ -5719,7 +5836,7 @@ DNS-over-HTTPS with IP:
$conf[] = '';
$conf[] = $peer['# PublicKey'] ? '# [Peer]' : '[Peer]';
if (!empty($peer['Endpoint'])) {
$peer['Endpoint'] = ($pac['domain'] && !$pac[$this->getInstanceWG(1) . 'amnezia'] ? $pac['domain'] : $this->ip) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
$peer['Endpoint'] = $this->getDomain() . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
}
foreach ($peer as $k => $v) {
$conf[] = "$k = $v";
@@ -5878,6 +5995,14 @@ DNS-over-HTTPS with IP:
return true;
}
public function autoupdate()
{
$p = $this->getPacConf();
$p['autoupdate'] = !$p['autoupdate'];
$this->setPacConf($p);
$this->send($this->input['from'], $this->i18n('autoupdate') . ' ' . $this->i18n($p['autoupdate'] ? 'on' : 'off'));
}
public function disconnect(...$args)
{
$this->send($this->input['chat'], "disconnect: \n" . var_export($args, true) . "\n", $this->input['message_id']);
+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
+19
View File
@@ -1,3 +1,22 @@
17.09.2024 v1.55
- возможность подменить домен в ссылках на конфиги
16.09.2024 v1.54.2
- фикс нэйминга клиентов в adguardHome: замена на uuid
16.09.2024 v1.54.1
- фикс нэйминга клиентов в adguardHome
16.09.2024 v1.54
- ~dns~ в шаблоне сингбокса подменяятся на https://DOMAIN/dns-query/USERNAME
- при добавлении пользователя в XRAY, он также добавляется в AdguardHome как сохраненый клиент
10.09.2024 v1.53
- домен в endpoint для амнезии
10.09.2024 v1.52
- фикс спамящего уведомления о просрочке сертификата
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