on/off warp-svc

xray: add user to AdH

app/bot.php

@@ -139,12 +139,21 @@ 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('~^/offWarp$~', $this->input['callback'], $m):
+                $this->offWarp();
+                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;
@@ -337,6 +346,9 @@ class Bot
             case preg_match('~^/switchTorrent (\d+)$~', $this->input['callback'], $m):
                 $this->switchTorrent($m[1]);
                 break;
+            case preg_match('~^/switchEndpoint (\d+)$~', $this->input['callback'], $m):
+                $this->switchEndpoint($m[1]);
+                break;
             case preg_match('~^/switchAmnezia (-?\d+)$~', $this->input['callback'], $m):
                 $this->switchAmnezia($m[1]);
                 break;
@@ -1090,6 +1102,10 @@ class Bot
                                 ]
                             ]);
                         }
+                        if ($this->getPacConf()['autoupdate']) {
+                            $this->input['chat'] = $this->input['from'] = $c['admin'][0];
+                            $this->applyupdatebot();
+                        }
                     }
                 }
             }
@@ -1101,7 +1117,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 +1372,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'])) {
@@ -1526,6 +1543,14 @@ class Bot
         $this->menu('wg', $page);
     }
 
+    public function switchEndpoint($page = 0)
+    {
+        $c = $this->getPacConf();
+        $c[$this->getInstanceWG(1) . 'endpoint'] = $c[$this->getInstanceWG(1) . 'endpoint'] ? 0 : 1;
+        $this->setPacConf($c);
+        $this->menu('wg', $page);
+    }
+
     public function iptablesWG()
     {
         $c = $this->getPacConf();
@@ -1590,7 +1615,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');
@@ -1807,7 +1832,11 @@ class Bot
                 $out[] = 'Install certificate:';
                 $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
                 $adguardClient = $conf['adguardkey'] ? "-d {$conf['adguardkey']}.{$conf['domain']}" : '';
-                $custom = $conf['subdomain'] ? "-d {$conf['subdomain']}.{$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));
@@ -2073,10 +2102,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->xray();
+    }
+
     public function setSubdomain($text)
     {
         $c = $this->getPacConf();
-        $c['subdomain'] = $text;
+        if (empty($text)) {
+            unset($c['subdomain']);
+        } else {
+            $c['subdomain'] = array_filter(explode(',', $text), fn($e) => !empty(trim($e)));
+        }
         $this->setPacConf($c);
         $this->menu('config');
     }
@@ -2148,6 +2208,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(
@@ -2574,6 +2689,7 @@ DNS-over-HTTPS with IP:
         $dns     = $c[$this->getInstanceWG(1) . 'dns'];
         $mtu     = $c[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
         $am      = $c[$this->getInstanceWG(1) . 'amnezia'];
+        $end     = $c[$this->getInstanceWG(1) . 'endpoint'];
         $data    = [
             [
                 [
@@ -2605,6 +2721,12 @@ DNS-over-HTTPS with IP:
                     'callback_data' => "/defaultMTU $page",
                 ],
             ],
+            [
+                [
+                    'text'          => $this->i18n('endpoint') . ': ' . ($end ? $this->ip : $this->getDomain()),
+                    'callback_data' => "/switchEndpoint $page",
+                ],
+            ],
             [
                 [
                     'text'          =>  $this->i18n('add peer'),
@@ -3171,7 +3293,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
@@ -3583,7 +3705,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';
@@ -3763,7 +3885,7 @@ DNS-over-HTTPS with IP:
     {
         $c      = $this->getXray();
         $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
+        $domain = $this->getDomain($pac['transport'] == 'Websocket');
         $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
         $hash   = substr(md5($this->key), 0, 8);
         $si     = "$scheme://{$domain}/pac/" . base64_encode(serialize([
@@ -3837,8 +3959,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'),
@@ -3930,6 +4053,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];
@@ -3938,7 +4062,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[] = [
@@ -4001,6 +4125,7 @@ DNS-over-HTTPS with IP:
             if ($i == $k) {
                 unset($r['inbounds'][0]['settings']['clients'][$k]);
                 $this->restartXray($r);
+                $this->adguardXrayClients();
                 break;
             }
         }
@@ -4023,13 +4148,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);
     }
 
@@ -4076,6 +4206,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);
     }
 
@@ -4151,7 +4282,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"];
@@ -4219,6 +4350,12 @@ DNS-over-HTTPS with IP:
             $text[] = "fake domain: <code>$fake</code>";
         }
         $text[] = 'transport: ' . ($p['transport'] ?: 'Reality');
+        $data[] = [
+            [
+                'text'          => $p['linkdomain'] ?: $this->i18n('cdn'),
+                'callback_data' => '/addLinkDomain',
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('Reality') . ' ' . ($p['transport'] != 'Websocket' ? $this->i18n('on') : $this->i18n('off')),
@@ -4386,23 +4523,53 @@ DNS-over-HTTPS with IP:
 
     public function warpStatus()
     {
-        $st = $this->ssh('curl -m 1 -x socks5://127.0.0.1:40000 https://cloudflare.com/cdn-cgi/trace', 'wp');
-        preg_match('~warp=(\w+)~', $st, $m);
-        return $m[1];
+        if (!empty($this->ssh('pgrep warp-svc', 'wp'))) {
+            $st = $this->ssh('curl -m 1 -x socks5://127.0.0.1:40000 https://cloudflare.com/cdn-cgi/trace', 'wp');
+            preg_match('~warp=(\w+)~', $st, $m);
+            return $m[1];
+        }
+        return 'off';
+    }
+
+    public function offWarp()
+    {
+        $p = $this->getPacConf();
+        if (empty($p['warpoff'])) {
+            $this->ssh('pkill warp-svc', 'wp');
+            $p['warpoff'] = 1;
+        } else {
+            $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
+            sleep(3);
+            $this->ssh('warp-cli --accept-tos registration new', 'wp');
+            if (!empty($p['warp'])) {
+                $this->ssh("warp-cli --accept-tos registration license {$p['warp']}", 'wp');
+            }
+            $this->ssh('warp-cli --accept-tos mode proxy', 'wp');
+            $this->ssh('warp-cli --accept-tos connect', 'wp');
+            unset($p['warpoff']);
+        }
+        $this->setPacConf($p);
+        $this->warp();
     }
 
     public function warp()
     {
+        $p      = $this->getPacConf();
         $text[] = "Menu -> " . $this->i18n('warp');
         $text[] = "status: " . $this->warpStatus();
         $text[] = "key: " . $this->getPacConf()['warp'];
+        $data[] = [
+            [
+                'text'          => $this->i18n($p['warpoff'] ? 'off' : 'on'),
+                'callback_data' => "/offWarp",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('set key'),
                 'callback_data' => "/warpPlus",
             ],
         ];
-
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -4474,7 +4641,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($pac['transport'] == 'Websocket');
         $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
         $hash   = substr(md5($this->key), 0, 8);
 
@@ -4561,17 +4728,26 @@ DNS-over-HTTPS with IP:
         );
     }
 
+    public function getDomain($cdn = false)
+    {
+        $c = $this->getPacConf();
+        if ($cdn && $c['linkdomain']) {
+            return $c['linkdomain'];
+        }
+        return $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;
         foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
             if ($v['id'] == $key) {
                 if (!empty($fs)) {
-                    return $this->userXr($k, 0, 1);
+                    return $this->userXr($k);
                 }
                 if (empty($v['off'])) {
                     $flag = false;
@@ -4604,7 +4780,7 @@ DNS-over-HTTPS with IP:
     {
         $type   = $_GET['t'] == 's' ? 'v2ray' : 'sing';
         $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
+        $domain = $_GET['cdn'] ?: ($_SERVER['SERVER_NAME'] ?: $this->getDomain($pac['transport'] == 'Websocket'));
         $xr     = $this->getXray();
         $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
         $hash   = substr(md5($this->key), 0, 8);
@@ -4617,6 +4793,7 @@ DNS-over-HTTPS with IP:
                 }
                 $template = base64_decode($v["{$type}template"]);
                 $uid      = $v['id'];
+                $email    = $v['email'];
                 break;
             }
         }
@@ -4651,14 +4828,11 @@ DNS-over-HTTPS with IP:
                 case 'w':
                     $link = htmlspecialchars($si, ENT_XML1, 'UTF-8');
                     file_put_contents('/singbox/winsw3.xml', preg_replace('#~url~#', $link, file_get_contents('/singbox/winsw3.xml')));
-                    $zip = new ZipArchive();
                     $n   = "singbox_$uid.zip";
-                    $zip->open($n, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-                    foreach (scandir('/singbox') as $k => $v) {
-                        if (!empty(!in_array($v, ['.', '..']))) {
-                            $zip->addFile("/singbox/$v", $v);
-                        }
-                    }
+                    copy('/singbox/singbox.zip', $n);
+                    $zip = new ZipArchive();
+                    $zip->open($n, ZipArchive::CREATE);
+                    $zip->addFile('/singbox/winsw3.xml', 'winsw3.xml');
                     $zip->close();
                     header('Content-Disposition: attachment; filename="singbox.zip"');
                     echo file_get_contents($n);
@@ -4684,7 +4858,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']  = $domain;
                 $c['outbounds'][0]['settings']['vnext'][0]['users'][0] = [
                     'id'         => $uid,
                     'encryption' => 'none',
@@ -4704,8 +4878,8 @@ DNS-over-HTTPS with IP:
                     ];
                     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" => [
@@ -4733,7 +4907,7 @@ 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;
@@ -4765,7 +4939,7 @@ DNS-over-HTTPS with IP:
                 $c['route']['rules'] = array_values($c['route']['rules']);
                 $c['route']          = $this->addRuleSet($c['route']);
                 $c['route']          = $this->addPackageRule($c['route']);
-                $c['route']          = $this->createRuleSet($c['route'], $uid);
+                $c['route']          = $this->createRuleSet($c['route'], $uid, $domain);
                 $c['route']          = $this->clearEmptyRules($c['route']);
                 break;
         }
@@ -4822,10 +4996,9 @@ DNS-over-HTTPS with IP:
         return $route;
     }
 
-    public function createRuleSet($route, $uid)
+    public function createRuleSet($route, $uid, $domain)
     {
         $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
         $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
         $hash   = substr(md5($this->key), 0, 8);
 
@@ -4914,7 +5087,7 @@ DNS-over-HTTPS with IP:
         $pac         = $this->getPacConf();
         $pac['xray'] = $public;
         $pac['reality']['shortId'] = $shortId;
-        $pac['reality']['privateKey'] = $$p['reality']['shortId'];
+        $pac['reality']['privateKey'] = $private;
         $this->setPacConf($pac);
         $this->restartXray($c);
     }
@@ -5042,7 +5215,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) {
@@ -5146,6 +5319,15 @@ DNS-over-HTTPS with IP:
         return openssl_x509_parse($c)["validTo_time_t"] ?: false;
     }
 
+    public function domainsCert()
+    {
+        $domains = openssl_x509_parse(openssl_x509_read(file_get_contents("/certs/cert_public")))['extensions']["subjectAltName"];
+        if (empty($domains)) {
+            return false;
+        }
+        return implode("\n", array_map(fn($e) => trim($e), explode(',', str_replace('DNS:', '', $domains))));
+    }
+
     public function updatebot()
     {
         $b = exec('git -C / rev-parse --abbrev-ref HEAD');
@@ -5199,10 +5381,16 @@ 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']} (for naiveproxy)\noc.{$conf['domain']} (for openconnect)" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']} (for adguard DoT)" : '') . ($conf['subdomain'] ? "\n{$conf['subdomain']}.{$conf['domain']} (custom)" : '') : $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') : '';
+        $text[] = $conf['domain'] ? "\nSSL: " . ($ssl ? date('Y-m-d H:i:s', $this->expireCert()) . "\n" . $this->domainsCert() : 'none') : '';
 
         $data = [
             [
@@ -5211,7 +5399,7 @@ DNS-over-HTTPS with IP:
                     'callback_data' => $conf['domain'] ? '/deldomain' : '/domain',
                 ],
                 [
-                    'text'          => $this->i18n('subdomain') . ($conf['subdomain'] ? ": {$conf['subdomain']}" : ''),
+                    'text'          => $this->i18n('+ subdomain'),
                     'callback_data' => '/addSubdomain',
                 ],
             ],
@@ -5519,9 +5707,9 @@ DNS-over-HTTPS with IP:
         $x              = $this->getXray();
         $p['transport'] = $ws ? 'Websocket' : 'Reality';
         if (!empty($ws)) {
-            $p['reality']['domain']      = $x['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
-            $p['reality']['destination'] = $x['inbounds'][0]['streamSettings']['realitySettings']['dest'];
-            $p['reality']['shortId']     = $x['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
+            $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']);
             }
@@ -5529,8 +5717,8 @@ DNS-over-HTTPS with IP:
                 "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';
@@ -5538,15 +5726,15 @@ DNS-over-HTTPS with IP:
             $x['inbounds'][0]['streamSettings'] = [
                 "network"         => "tcp",
                 "realitySettings" => [
-                    "dest"         => $p['reality']['destination'],
+                    "dest"         => $p['reality']['destination'] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['dest'],
                     "maxClientVer" => "",
                     "maxTimeDiff"  => 0,
                     "minClientVer" => "",
                     "privateKey"   => $p['reality']['privateKey'],
                     "serverNames"  => [
-                        $p['reality']['domain']
+                        $p['reality']['domain'] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]
                     ],
-                    "shortIds" => [$p['reality']['shortId']],
+                    "shortIds" => [$p['reality']['shortId']] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
                     "show"     => false,
                     "xver"     => 0
                 ],
@@ -5559,7 +5747,7 @@ DNS-over-HTTPS with IP:
                 "security" => "reality"
             ];
         }
-        $this->setUpstreamDomain($ws ? 't' : $p['reality']['domain']);
+        $this->setUpstreamDomain($ws ? 't' : ($p['reality']['domain'] ?: $x['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]));
         $this->setPacConf($p);
         $this->restartXray($x);
         $this->xray();
@@ -5709,7 +5897,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->getPacConf()[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
                 }
                 foreach ($peer as $k => $v) {
                     $conf[] = "$k = $v";
@@ -5868,6 +6056,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']);

config/nginx.conf

@@ -48,6 +48,7 @@ http {
     }
     location /pac {
       access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
       proxy_pass http://php;
     }
     location /tlgrm {
@@ -75,6 +76,27 @@ http {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_read_timeout 5d;
     }
+#-ssl
+#   # The DoH server block
+#   location /dns-query {
+#     access_log /logs/nginx_doh_access;
+#     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
+#     proxy_http_version 1.1;
+#     proxy_set_header Connection "";
+#     proxy_set_header  Host $host;
+#     proxy_set_header  X-Real-IP $remote_addr;
+#     proxy_set_header  X-Forwarded-Proto https;
+#     proxy_set_header  X-Forwarded-For $remote_addr;
+#     proxy_set_header  X-Forwarded-Host $remote_addr;
+
+#     # Enable Cache, and set the cache_key to include the request_body
+#     proxy_cache doh_cache;
+#     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+
+#     # proxy pass to the dohloop upstream
+#     proxy_pass https://ad/dns-query;
+#   }
+#-ssl
     location ~\.well-known {
       access_log /logs/nginx_certbot_access;
       root /certs/;
@@ -118,6 +140,7 @@ http {
   #   }
   #   location /pac {
   #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
   #     proxy_pass http://php;
   #   }
   #   location ~\.well-known {

config/nginx_default.conf

@@ -48,6 +48,7 @@ http {
     }
     location /pac {
       access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
       proxy_pass http://php;
     }
     location /tlgrm {
@@ -75,6 +76,27 @@ http {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_read_timeout 5d;
     }
+#-ssl
+#   # The DoH server block
+#   location /dns-query {
+#     access_log /logs/nginx_doh_access;
+#     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
+#     proxy_http_version 1.1;
+#     proxy_set_header Connection "";
+#     proxy_set_header  Host $host;
+#     proxy_set_header  X-Real-IP $remote_addr;
+#     proxy_set_header  X-Forwarded-Proto https;
+#     proxy_set_header  X-Forwarded-For $remote_addr;
+#     proxy_set_header  X-Forwarded-Host $remote_addr;
+
+#     # Enable Cache, and set the cache_key to include the request_body
+#     proxy_cache doh_cache;
+#     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+
+#     # proxy pass to the dohloop upstream
+#     proxy_pass https://ad/dns-query;
+#   }
+#-ssl
     location ~\.well-known {
       access_log /logs/nginx_certbot_access;
       root /certs/;
@@ -118,6 +140,7 @@ http {
   #   }
   #   location /pac {
   #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
   #     proxy_pass http://php;
   #   }
   #   location ~\.well-known {

makefile

@@ -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

scripts/init.sh

@@ -16,7 +16,11 @@ echo \
   "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') \
   $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
 apt update
-apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+apt install -y docker-ce docker-ce-cli containerd.io
+DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
+mkdir -p $DOCKER_CONFIG/cli-plugins
+curl -SL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose
+chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
 git clone https://github.com/mercurykd/vpnbot.git
 cd ./vpnbot
 echo "<?php

scripts/start_wp.sh

@@ -1,14 +1,18 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-warp-svc > /dev/null &
-sleep 3
-warp-cli --accept-tos registration new
+off=$(cat /config/pac.json | jq -r .warpoff)
 key=$(cat /config/pac.json | jq -r .warp)
-if [ ! -z "$key" ]
+if [ "$off" == 'null' ]
 then
-    warp-cli --accept-tos registration license $key
+    warp-svc > /dev/null &
+    sleep 3
+    warp-cli --accept-tos registration new
+    if [ ! -z "$key" ]
+    then
+        warp-cli --accept-tos registration license $key
+    fi
+    warp-cli --accept-tos mode proxy
+    warp-cli --accept-tos connect
 fi
-warp-cli --accept-tos mode proxy
-warp-cli --accept-tos connect
 socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000

singbox_windows/install.cmd

@@ -1,2 +0,0 @@
-winsw3.exe install
-pause

singbox_windows/restart.cmd

@@ -1,2 +0,0 @@
-winsw3.exe stop
-winsw3.exe start

singbox_windows/start.cmd

@@ -1 +0,0 @@
-winsw3.exe start

singbox_windows/status.cmd

@@ -1,2 +0,0 @@
-winsw3.exe status
-pause

singbox_windows/stop.cmd

@@ -1 +0,0 @@
-winsw3.exe stop

singbox_windows/uninstall.cmd

@@ -1,2 +0,0 @@
-winsw3.exe uninstall
-pause

update/update.sh

@@ -24,7 +24,7 @@ do
         curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "применяю обновления"/')"
         git pull > ./update/message
         curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "запускаю бота"/')"
-        IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose up -d --force-recreate
+        IP=$(curl ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
         bash $pwd/update/update.sh &
         > $pwd/update/key
         > $pwd/update/curl

version

@@ -1,3 +1,38 @@
+29.09.2024 v1.61
+- включение/отключение процесса warp
+29.09.2024 v1.60
+- ускорение сборки архива sing-box windows
+23.09.2024 v1.59
+- docker compose v2.29.6 (при установке бота)
+22.09.2024 v1.58
+- фикс запуска бота с правильными параметрами после обновления
+22.09.2024 v1.57
+- выбор типа endpoint для wireguard/amnezia
+22.09.2024 v1.56.2
+- фикс разных доменов при указании cdn для xray
+19.09.2024 v1.56.1
+- cdn для xray
+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
 - fix websocket -> reality
 03.09.2024 v1.46.2