update version

- cron status
- fix with sending a backup when there are special characters in the bot name

.gitignore

@@ -20,4 +20,5 @@ update/*
 !update/update.sh
 
 override.env
-override.html
+override.html
+override.php

app/bot.php

@@ -142,9 +142,15 @@ class Bot
             case preg_match('~^/autoupdate$~', $this->input['message'], $m):
                 $this->autoupdate();
                 break;
+            case preg_match('~^/adgFillAllowedClients(?: (\d+))?$~', $this->input['callback'], $m):
+                $this->adgFillAllowedClients($m[1] ?: false);
+                break;
             case preg_match('~^/appOutbound$~', $this->input['callback'], $m):
                 $this->appOutbound();
                 break;
+            case preg_match('~^/processOutbound$~', $this->input['callback'], $m):
+                $this->processOutbound();
+                break;
             case preg_match('~^/offWarp$~', $this->input['callback'], $m):
                 $this->offWarp();
                 break;
@@ -268,6 +274,9 @@ class Bot
             case preg_match('~^/addOcUser$~', $this->input['callback'], $m):
                 $this->addOcUser();
                 break;
+            case preg_match('~^/changeOcExpose$~', $this->input['callback'], $m):
+                $this->changeOcExpose();
+                break;
             case preg_match('~^/addXrUser$~', $this->input['callback'], $m):
                 $this->addXrUser();
                 break;
@@ -431,6 +440,9 @@ class Bot
             case preg_match('~^/xtlsapp(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlsapp($m[1] ?: 0);
                 break;
+            case preg_match('~^/xtlsprocess(?: (\d+))?$~', $this->input['callback'], $m):
+                $this->xtlsprocess($m[1] ?: 0);
+                break;
             case preg_match('~^/xtlsrulesset(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlsrulesset($m[1] ?: 0);
                 break;
@@ -1054,25 +1066,32 @@ class Bot
 
     public function cron()
     {
+        $period = 10;
         while (true) {
             $this->shutdownClient();
             $this->shutdownClientXr();
             $this->checkVersion();
-            $this->checkBackup();
+            $this->checkBackup($period);
             $this->checkCert();
-            sleep(10);
+            sleep($period);
         }
     }
 
-    public function checkBackup()
+    public function checkBackup($delta)
     {
         $c   = $this->getPacConf();
-        $now = strtotime(date('Y-m-d H:i'));
         if (!empty($c['backup'])) {
+            $now = strtotime(date('Y-m-d H:i:s'));
             [$start, $period] = explode('/', $c['backup']);
-            $start  = strtotime($start);
-            $period = strtotime($period, 0);
-            if ($now - $start >= $period && ($now - $start) % $period == 0) {
+            $start  = strtotime(trim($start));
+            $period = strtotime(trim($period), 0);
+            if (
+                !empty($start)
+                && !empty($period)
+                && empty($this->backup)
+                && $now - $start >= 0
+                && (($now - $start) % $period < $delta)
+            ) {
                 if (!empty($c['pinbackup'])) {
                     $this->pinAdmin($c['pinbackup'], 1);
                 }
@@ -1081,6 +1100,12 @@ class Bot
         }
     }
 
+    public function cleanQueue(): void
+    {
+        $r = $this->request('deleteWebhook', []);
+        $r = $this->request('getUpdates', ['offset' => -1]);
+    }
+
     public function pinAdmin($pin, $unpin = false)
     {
         require __DIR__ . '/config.php';
@@ -1095,9 +1120,8 @@ class Bot
     {
         require __DIR__ . '/config.php';
         $conf              = $this->getPacConf();
-        $bot               = $this->request('getMyName', [])['result']['name'];
+        $bot               = preg_replace('~[\W]~iu', '_', $this->request('getMyName', [])['result']['name']);
         $conf['pinbackup'] = $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $this->export(), $c['admin'][0])['result']['message_id'];
-        $conf['backup']    = implode(' / ', [date('Y-m-d H:i'), trim(explode('/', $conf['backup'])[1])]);
         $this->setPacConf($conf);
         $this->pinAdmin($conf['pinbackup']);
     }
@@ -1287,7 +1311,7 @@ class Bot
         if (!empty($file)) {
             file_put_contents($file, $json);
         }
-        $bot = $this->request('getMyName', [])['result']['name'];
+        $bot = preg_replace('~[\W]~iu', '_', $this->request('getMyName', [])['result']['name']);
         return $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $json);
     }
 
@@ -1439,8 +1463,8 @@ class Bot
             $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
             $this->language = $this->getPacConf()['language'] ?: 'en';
             $this->limit    = $this->getPacConf()['limitpage'] ?: 5;
-            sleep(3);
             if (empty($file)) {
+                sleep(3);
                 $this->menu();
             }
         }
@@ -1754,10 +1778,14 @@ class Bot
             $this->adguardProtect();
             $u = $this->ssh("nginx -t 2>&1", 'ng');
             $out[] = $u;
-            $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+            if (empty($nomenu)) {
+                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+            }
             if (preg_match('~test is successful~', $u)) {
                 $out[] = $this->ssh("nginx -s reload 2>&1", 'ng');
-                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+                if (empty($nomenu)) {
+                    $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+                }
                 $this->setPacConf($conf);
                 $this->chocdomain($domain);
                 $this->setUpstreamDomainOcserv($domain);
@@ -1774,13 +1802,19 @@ class Bot
 
     public function sslip()
     {
-        $c = $this->getPacConf();
-        if (empty($c['domain'])) {
-            $this->addDomain(str_replace('.', '-', $this->ip) . '.sslip.io', 1);
+        require __DIR__ . '/config.php';
+        $p  = $this->getPacConf();
+        $ip = getenv('IP');
+        $r  = $this->send($c['admin'][0], "start $ip");
+
+        $this->input['chat']        = $c['admin'][0];
+        $this->input['message_id']  = $r['result']['message_id'];
+        $this->input['callback_id'] = false;
+        if (empty($p['domain'])) {
+            $this->addDomain(str_replace('.', '-', $this->ip) . '.nip.io', 1);
             $this->setSSL('letsencrypt');
-        } else {
-            $this->menu();
         }
+        $this->menu();
     }
 
     public function comment($text, $tag)
@@ -2422,7 +2456,7 @@ DNS-over-HTTPS with IP:
         if (!empty($domains)) {
             $conf = $this->getPacConf();
             foreach ($domains as $k => $v) {
-                $conf[$type][$type == 'rulessetlist' ? trim($v) : idn_to_ascii(trim($v))] = true;
+                $conf[$type][in_array($type, ['rulessetlist', 'packagelist', 'processlist']) ? trim($v) : idn_to_ascii(trim($v))] = true;
             }
             ksort($conf[$type]);
             $this->setPacConf($conf);
@@ -2446,6 +2480,10 @@ DNS-over-HTTPS with IP:
                 $this->xrayUpdateRules();
                 $this->xtlswarp();
                 break;
+            case 'processlist':
+                $this->xrayUpdateRules();
+                $this->xtlsprocess();
+                break;
             case 'packagelist':
                 $this->xrayUpdateRules();
                 $this->xtlsapp();
@@ -3425,6 +3463,9 @@ DNS-over-HTTPS with IP:
             case 'packagelist':
                 $this->xtlsapp();
                 break;
+            case 'processlist':
+                $this->xtlsprocess();
+                break;
             case 'rulessetlist':
                 $this->xtlsrulesset();
                 break;
@@ -3570,6 +3611,14 @@ DNS-over-HTTPS with IP:
         $this->xtlsapp();
     }
 
+    public function processOutbound()
+    {
+        $p = $this->getPacConf();
+        $p['process_outbound'] = !$p['process_outbound'];
+        $p = $this->setPacConf($p);
+        $this->xtlsprocess();
+    }
+
     public function xtlsapp($page = 0)
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> package list';
@@ -3596,6 +3645,32 @@ DNS-over-HTTPS with IP:
         );
     }
 
+    public function xtlsprocess($page = 0)
+    {
+        $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> process list';
+
+        $data   = $this->listPac('processlist', $page, 'xtlsprocess');
+        $p      = $this->getPacConf();
+        $data[] = [
+            [
+                'text'          => 'set to ' . ($p['process_outbound'] ? 'proxy' : 'direct'),
+                'callback_data' => "/processOutbound",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/routes",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            implode("\n", $text ?: ['...']),
+            $data ?: false,
+        );
+    }
+
     public function xtlsrulesset($page = 0)
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> rulesset list';
@@ -3633,7 +3708,7 @@ DNS-over-HTTPS with IP:
             foreach ($domains as $k => $v) {
                 $data[] = [
                     [
-                        'text'          => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . idn_to_utf8($k),
+                        'text'          => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . (in_array($type, ['rulessetlist', 'packagelist', 'processlist']) ? $k : idn_to_utf8($k)),
                         'callback_data' => "/change$type " . ($i + $page * $this->limit),
                     ],
                     [
@@ -3793,9 +3868,10 @@ DNS-over-HTTPS with IP:
     public function menu($type = false, $arg = false, $return = false)
     {
         $domain = $this->getPacConf()['domain'] ?: $this->ip;
+        $cron   = exec('pgrep -f cron.php');
         $menu   = [
             'main' => [
-                'text' => 'v' . getenv('VER'),
+                'text' => 'v' . getenv('VER') . ($this->dontshowcron ? '' : "\ncron: " . $this->i18n($cron ? 'on' : 'off') . ($cron ? '' : ' show <code>logs/php_error</code>')),
                 'data' => [
                     [
                         [
@@ -4082,10 +4158,12 @@ DNS-over-HTTPS with IP:
         preg_match('~^camouflage_secret[^\n]+?"([^"]+)*"~sm', $ocserv, $m);
         $cs = $m[1];
         preg_match('~^dns = ([^\n]+)~sm', $ocserv, $m);
-        $dns    = $m[1];
+        $dns = $m[1];
+        preg_match('~^expose-iroutes = (true)~sm', $ocserv, $m);
+        $expose = $m[1];
         $pass   = htmlspecialchars($pac['ocserv']);
         $text[] = "Menu -> OpenConnect";
-        if (!empty($m[1])) {
+        if (!empty($cs)) {
             $text[] = "<code>https://oc.$domain/?$cs</code>";
         }
         $text[] = "password: <span class='tg-spoiler'>$pass</span>";
@@ -4103,6 +4181,12 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/changeOcDns",
             ],
         ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('expose-iroutes') . ' ' . $this->i18n($expose ? 'on' : 'off'),
+                'callback_data' => "/changeOcExpose",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('add peer'),
@@ -4130,6 +4214,15 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function changeOcExpose()
+    {
+        $c = file_get_contents('/config/ocserv.conf');
+        preg_match('~^expose-iroutes = ([^\n]+)~sm', $c, $m);
+        $t = preg_replace('~^expose-iroutes[^\n]+~sm', "expose-iroutes = " . ($m[1] == 'true' ? 'false' : 'true'), $c);
+        $this->restartOcserv($t);
+        $this->menu('oc');
+    }
+
     public function deloc($i)
     {
         $clients = $this->getClientsOc();
@@ -4496,6 +4589,10 @@ DNS-over-HTTPS with IP:
                 'text'          => $this->i18n('warp'),
                 'callback_data' => "/xtlswarp",
             ]],
+            [[
+                'text'          => $this->i18n('process'),
+                'callback_data' => "/xtlsprocess",
+            ]],
             [[
                 'text'          => $this->i18n('package'),
                 'callback_data' => "/xtlsapp",
@@ -4563,14 +4660,17 @@ DNS-over-HTTPS with IP:
     {
         $p = $this->getPacConf();
         if (empty($p['warpoff'])) {
+            $this->ssh('warp-cli --accept-tos registration delete', 'wp');
             $this->ssh('pkill warp-svc', 'wp');
             $p['warpoff'] = 1;
         } else {
             $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
             sleep(3);
-            $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
-            if (!empty($p['warp'])) {
-                $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
+            if (empty($this->ssh('[ -f "/var/lib/cloudflare-warp/conf.json" ] && echo 1', 'wp'))) {
+                $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
+                if (!empty($p['warp'])) {
+                    $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
+                }
             }
             $this->send($this->input['chat'], 'Proxy mode: ' . $this->ssh('warp-cli --accept-tos mode proxy 2>&1', 'wp'));
             $this->send($this->input['chat'], 'Connect: ' . $this->ssh('warp-cli --accept-tos connect 2>&1', 'wp'));
@@ -4585,7 +4685,7 @@ DNS-over-HTTPS with IP:
         $p      = $this->getPacConf();
         $text[] = "Menu -> " . $this->i18n('warp');
         $text[] = "status: " . $this->warpStatus();
-        $text[] = "key: " . $this->getPacConf()['warp'];
+        $text[] = "key: <code>{$this->getPacConf()['warp']}</code>";
         $data[] = [
             [
                 'text'          => $this->i18n($p['warpoff'] ? 'off' : 'on'),
@@ -4778,45 +4878,6 @@ DNS-over-HTTPS with IP:
         return $c['domain'] ?: $this->ip;
     }
 
-    public function v2raySubscription($key, $fs = 0)
-    {
-        $pac    = $this->getPacConf();
-        $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);
-                }
-                if (empty($v['off'])) {
-                    $flag = false;
-                }
-                break;
-            }
-        }
-        if ($flag) {
-            return;
-        }
-
-        $c = json_decode(file_get_contents('/config/v2ray.json'), true);
-
-        $c['outbounds'][0]['settings']['vnext'][0]['address']                 = $domain;
-        $c['outbounds'][0]['settings']['vnext'][0]['users'][0]['id']          = $key;
-        $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['routing']['rules'][0]['domain']                                   = array_keys(array_filter($pac['includelist']));
-
-        if (empty($c['routing']['rules'][0]['domain'])) {
-            unset($c['routing']['rules'][0]);
-            $c['routing']['rules'] = array_values($c['routing']['rules']);
-
-        }
-        echo json_encode($c);
-    }
-
     public function subscription()
     {
         $type   = $_GET['t'] == 's' ? 'v2ray' : 'sing';
@@ -4901,9 +4962,9 @@ 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,
+                    'id'         => '~uid~',
                     'encryption' => 'none',
                 ];
                 if ($pac['transport'] == 'Websocket') {
@@ -4915,7 +4976,7 @@ DNS-over-HTTPS with IP:
                         ],
                         "tlsSettings" => [
                             "allowInsecure" => false,
-                            "serverName"    => $domain,
+                            "serverName"    => '~domain~',
                             "fingerprint"   => "chrome"
                         ]
                     ];
@@ -4926,10 +4987,10 @@ DNS-over-HTTPS with IP:
                         "network"         => "tcp",
                         "security"        => "reality",
                         "realitySettings" => [
-                            "serverName"  => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
+                            "serverName"  => '~server_name~',
                             "fingerprint" => "chrome",
-                            "publicKey"   => $pac['xray'],
-                            "shortId"     => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
+                            "publicKey"   => '~public_key~',
+                            "shortId"     => '~short_id~',
                         ]
                     ];
                     $c['outbounds'][0]['mux'] = [
@@ -4937,24 +4998,10 @@ DNS-over-HTTPS with IP:
                         "concurrency" => -1
                     ];
                 }
-
-                foreach ($c['routing']['rules'] as $k => $v) {
-                    if (array_key_exists('domain', $v) && $v['domain'] == '~pac~') {
-                        $c['routing']['rules'][$k]['domain'] = array_keys(array_filter($pac['includelist'] ?: []));
-                        if (empty($c['routing']['rules'][$k]['domain'])) {
-                            unset($c['routing']['rules'][$k]);
-                        }
-                    }
-                }
-                $c['routing']['rules'] = array_values($c['routing']['rules']);
                 break;
             case 'si':
-                if ($c['dns']['servers'][0]['address'] == '~dns~') {
-                    $c['dns']['servers'][0]['address'] = "https://$domain/dns-query/$uid";
-                }
-
-                $c['outbounds'][0]['server'] = $domain;
-                $c['outbounds'][0]['uuid']   = $uid;
+                $c['outbounds'][0]['server'] = '~domain~';
+                $c['outbounds'][0]['uuid']   = '~uid~';
                 if ($pac['transport'] == 'Websocket') {
                     unset($c['outbounds'][0]['tls']['reality']);
                     unset($c['outbounds'][0]['flow']);
@@ -4962,81 +5009,60 @@ DNS-over-HTTPS with IP:
                         "type" => "ws",
                         "path" => "/ws"
                     ];
-                    $c['outbounds'][0]['tls']['server_name'] = $domain;
+                    $c['outbounds'][0]['tls']['server_name'] = '~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];
+                    $c['outbounds'][0]['tls']['reality']['public_key'] = '~public_key~';
+                    $c['outbounds'][0]['tls']['server_name']           = '~server_name~';
+                    $c['outbounds'][0]['tls']['reality']['short_id']   = '~short_id~';
                 }
 
-                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'] ?: []));
-                        if (empty($c['route']['rules'][$k]['domain_suffix'])) {
-                            unset($c['route']['rules'][$k]);
-                        }
-                    }
-                }
-                $c['route']['rules'] = array_values($c['route']['rules']);
-                $c['route']          = $this->addRuleSet($c['route']);
-                $c['route']          = $this->addPackageRule($c['route']);
-                $c['route']          = $this->addProcessRule($c['route']);
-                $c['route']          = $this->createRuleSet($c['route'], $uid, $domain);
-                $c['route']          = $this->clearEmptyRules($c['route']);
+                $c['route'] = $this->addRuleSet($c['route']);
+                $c['route'] = $this->createRuleSet($c['route'], $uid, $domain);
                 break;
         }
 
+        $json = $this->replaceTags(json_encode($c), [
+            '"~pac~"'         => json_encode(array_keys(array_filter($pac['includelist'] ?: []))),
+            '~dns~'         => "https://$domain/dns-query/$uid",
+            '~uid~'         => $uid,
+            '~domain~'      => $domain,
+            '~short_id~'    => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
+            '~public_key~'  => $pac['xray'],
+            '~server_name~' => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
+        ]);
+        $json = $this->clearEmptyRules($json);
+
         header('Content-type: application/json');
-        echo json_encode($c);
+        echo $json;
     }
 
-    public function clearEmptyRules($route)
+    public function replaceTags($subject, $tags)
     {
-        foreach ($route['rules'] as $k => $v) {
-            if (count($v) == 1) {
-                unset($route['rules'][$k]);
-            }
-        }
-        $route['rules'] = array_values($route['rules']);
-        return $route;
+        return str_replace(array_keys($tags), array_values($tags), $subject);
     }
 
-    public function addPackageRule($route)
+    public function clearEmptyRules($json)
     {
-        foreach ($route['rules'] as $k => $v) {
-            if (array_key_exists('package_name', $v)) {
-                $p = $this->getPacConf();
-                if (!empty($t = array_filter($p['packagelist'] ?: []))) {
-                    $route['rules'][$k] = [
-                        'package_name' => array_keys($t),
-                        'outbound'     => $p['app_outbound'] ? 'direct' : 'proxy',
-                    ];
-                } else {
-                    unset($route['rules'][$k]);
+        $json = json_decode($json, 1);
+        if (!empty($json['routing']['rules'])) {
+            foreach ($json['routing']['rules'] as $k => $v) {
+                if (array_key_exists('domain', $v) && empty($v['domain'])) {
+                    unset($json['routing']['rules'][$k]);
                 }
             }
+            $json['routing']['rules'] = array_values($json['routing']['rules']);
         }
-        return $route;
-    }
-
-    public function addProcessRule($route)
-    {
-        foreach ($route['rules'] as $k => $v) {
-            if (array_key_exists('process_name', $v)) {
-                $p = $this->getPacConf();
-                if (!empty($t = array_filter($p['processlist'] ?: []))) {
-                    $route['rules'][$k] = [
-                        'process_name' => array_keys($t),
-                        'outbound'     => $p['process_outbound'] ? 'direct' : 'proxy',
-                    ];
-                } else {
-                    unset($route['rules'][$k]);
+        if (!empty($json['route']['rules'])) {
+            foreach ($json['route']['rules'] as $k => $v) {
+                if (count($v) < 2) {
+                    unset($json['route']['rules'][$k]);
                 }
             }
+            $json['route']['rules'] = array_values($json['route']['rules']);
         }
-        return $route;
+        return json_encode($json);
     }
 
     public function addRuleSet($route)
@@ -5072,25 +5098,38 @@ DNS-over-HTTPS with IP:
 
         foreach ($route['rules'] as $k => $v) {
             if (!empty($v['createruleset'])) {
-                foreach ($v['createruleset'] as $i => $r) {
+                foreach ($v['createruleset'] as $r) {
                     foreach ($r['rules'] as $l => $n) {
-                        if (array_key_exists('domain_suffix', $n) && $n['domain_suffix'] == '~pac~') {
-                            $r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac['includelist'] ?: []));
-                            if (empty($r['rules'][$l]['domain_suffix'])) {
-                                unset($r['rules'][$l]);
-                            }
-                        }
-                        if (array_key_exists('domain_suffix', $n) && $n['domain_suffix'] == '~warp~') {
-                            $r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac['warplist'] ?: []));
-                            if (empty($r['rules'][$l]['domain_suffix'])) {
-                                unset($r['rules'][$l]);
-                            }
-                        }
-                        if (array_key_exists('domain_suffix', $n) && $n['domain_suffix'] == '~block~') {
-                            $r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac['blocklist'] ?: []));
-                            if (empty($r['rules'][$l]['domain_suffix'])) {
-                                unset($r['rules'][$l]);
-                            }
+                        switch (true) {
+                            case array_key_exists('domain_suffix', $n):
+                                switch ($n['domain_suffix']) {
+                                    case '~pac~':
+                                        $t = 'includelist';
+                                        break;
+                                    case '~warp~':
+                                        $t = 'warplist';
+                                        break;
+                                    case '~block~':
+                                        $t = 'blocklist';
+                                        break;
+                                }
+                                $r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac[$t] ?: []));
+                                if (empty($r['rules'][$l]['domain_suffix'])) {
+                                    unset($r['rules'][$l]);
+                                }
+                                break;
+                            case array_key_exists('package_name', $n):
+                                $r['rules'][$l]['package_name'] = array_keys(array_filter($pac['packagelist'] ?: []));
+                                if (empty($r['rules'][$l]['package_name'])) {
+                                    unset($r['rules'][$l]);
+                                }
+                                break;
+                            case array_key_exists('process_name', $n):
+                                $r['rules'][$l]['process_name'] = array_keys(array_filter($pac['processlist'] ?: []));
+                                if (empty($r['rules'][$l]['process_name'])) {
+                                    unset($r['rules'][$l]);
+                                }
+                                break;
                         }
                     }
                     if (!empty($_GET['r']) && $r['name'] == $_GET['r']) {
@@ -5121,6 +5160,11 @@ DNS-over-HTTPS with IP:
                         "download_detour" => "direct",
                     ];
                     $route['rules'][$k]['rule_set'][] = $r['name'];
+                    switch (true) {
+                        case preg_match('#~(.+)~#', $route['rules'][$k]['outbound'], $m):
+                            $route['rules'][$k]['outbound'] = $pac[$m[1]] ? 'direct' : 'proxy';
+                            break;
+                    }
                 }
                 unset($route['rules'][$k]['createruleset']);
                 if (empty($route['rules'][$k]['rule_set'])) {
@@ -5290,6 +5334,11 @@ DNS-over-HTTPS with IP:
             $text .= "DNS over HTTPS:\n<code>$ip</code>\n<code>$scheme://$domain/dns-query" . ($conf['adguardkey'] ? "/{$conf['adguardkey']}" : '') . "</code>\n\n";
             $text .= "DNS over TLS:\n<code>tls://" . ($conf['adguardkey'] ? "{$conf['adguardkey']}." : '') . "$domain</code>";
         }
+        $safesearch = yaml_parse_file($this->adguard)['filtering']['safe_search']['enabled'];
+        $text .= "\n\nsafesearch: " . $this->i18n($safesearch ? 'on' : 'off');
+        $allowedClients = yaml_parse_file($this->adguard)['dns']['allowed_clients'];
+        $text .= $allowedClients ? "\n\nallowed clients: \n - " . implode("\n - ", $allowedClients) : '';
+
         $data = [
             [
                 [
@@ -5314,6 +5363,16 @@ DNS-over-HTTPS with IP:
                 ],
             ],
         ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('fill allowed clients'),
+                'callback_data' => "/adgFillAllowedClients 0",
+            ],
+            [
+                'text'          => $this->i18n('delete allowed clients'),
+                'callback_data' => "/adgFillAllowedClients 1",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('add upstream'),
@@ -5351,6 +5410,34 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function adgFillAllowedClients($delete = false)
+    {
+        $pac = $this->getPacConf();
+        $out[] = 'Restart Adguard Home';
+        $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+        $this->stopAd();
+        $c = yaml_parse_file($this->adguard);
+        if (!empty($delete)) {
+            unset($c['dns']['allowed_clients']);
+        } else {
+            $c['dns']['allowed_clients'] = [];
+            if (!empty($pac['adguardKey'])) {
+                $c['dns']['allowed_clients'][] = $pac['adguardKey'];
+            }
+            $c['dns']['allowed_clients'][] = getenv('WGADDRESS');
+            $c['dns']['allowed_clients'][] = getenv('WG1ADDRESS');
+            $c['dns']['allowed_clients'][] = '10.0.2.0/24'; // openconnect
+            if (!empty($xr = $this->getXray())) {
+                foreach ($xr['inbounds'][0]['settings']['clients'] as $v) {
+                    $c['dns']['allowed_clients'][] = $v['id'];
+                }
+            }
+        }
+        yaml_emit_file($this->adguard, $c);
+        $this->startAd();
+        $this->menu('adguard');
+    }
+
     public function menuLang()
     {
         $data = [];
@@ -5558,7 +5645,11 @@ DNS-over-HTTPS with IP:
         ];
         $backup = array_filter(explode('/', $conf['backup']));
         if (!empty($backup)) {
-            $backup = "{$backup[0]} start / {$backup[1]} period";
+            if (!empty(strtotime($backup[0])) && !empty(strtotime($backup[1]))) {
+                $backup = "{$backup[0]} start / {$backup[1]} period";
+            } else {
+                $backup = $this->i18n('off') . " {$conf['backup']} - wrong format";
+            }
         }
         $data[] = [
             [
@@ -5703,13 +5794,35 @@ DNS-over-HTTPS with IP:
         $this->logs();
     }
 
+    public function selfUpdate()
+    {
+        $ip                         = getenv('IP');
+        $rm                         = explode(':', trim(file_get_contents('/update/reload_message')));
+        $m                          = file_get_contents('/update/message');
+        $this->input['chat']        = $rm[0];
+        $this->input['message_id']  = $rm[1];
+        $this->input['callback_id'] = $rm[1];
+        if (file_exists($this->update)) {
+            if (!empty($m)) {
+                $this->send($this->input['chat'], "<pre>$m</pre>", $rm[1]);
+            }
+            $r = $this->send($this->input['chat'], "import settings");
+            $this->input['message_id']  = $r['result']['message_id'];
+            $this->input['callback_id'] = $r['result']['message_id'];
+            $this->importFile($this->update);
+            unlink($this->update);
+        }
+        file_put_contents('/update/message', '');
+        file_put_contents('/update/reload_message', '');
+    }
+
     public function backup()
     {
         $r = $this->send(
             $this->input['chat'],
-            "@{$this->input['username']} enter like start / period",
+            "@{$this->input['username']} enter like: start / period",
             $this->input['message_id'],
-            reply: 'enter like now / 12:00',
+            reply: 'enter like: now / 12 hours',
         );
         $_SESSION['reply'][$r['result']['message_id']] = [
             'start_message'  => $this->input['message_id'],
@@ -5835,7 +5948,11 @@ DNS-over-HTTPS with IP:
             $c['backup'] = '';
         } else {
             [$start, $period] = explode('/', $text);
-            $c['backup'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
+            if (!empty(strtotime($start)) && !empty(strtotime($period))) {
+                $c['backup'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
+            } else {
+                $this->send($this->input['from'], $this->input['message'] . ' - wrong format');
+            }
         }
         if ($c['pinbackup']) {
             $this->pinAdmin($c['pinbackup'], 1);
@@ -5953,25 +6070,25 @@ DNS-over-HTTPS with IP:
 
     public function createConfig($data)
     {
+        $pac = $this->getPacConf();
         $conf[] = "[Interface]";
         if (empty($data['interface']['ListenPort'])) {
             if (empty($data['interface']['DNS'])) {
-                $data['interface']['DNS'] = $this->getPacConf()[$this->getInstanceWG(1) . 'dns'] ?: $this->dns;
+                $data['interface']['DNS'] = $pac[$this->getInstanceWG(1) . 'dns'] ?: $this->dns;
             }
             if (empty($data['interface']['MTU'])) {
-                $data['interface']['MTU'] = $this->getPacConf()[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
+                $data['interface']['MTU'] = $pac[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
             }
         }
         foreach ($data['interface'] as $k => $v) {
             $conf[] = "$k = $v";
         }
-        $pac = $this->getPacConf();
         if (!empty($data['peers'])) {
             foreach ($data['peers'] as $peer) {
                 $conf[] = '';
                 $conf[] = $peer['# PublicKey'] ? '# [Peer]' : '[Peer]';
                 if (!empty($peer['Endpoint'])) {
-                    $peer['Endpoint'] = ($this->getPacConf()[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
+                    $peer['Endpoint'] = ($pac[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
                 }
                 foreach ($peer as $k => $v) {
                     $conf[] = "$k = $v";

app/cron.php

@@ -7,5 +7,4 @@ require __DIR__ . '/bot.php';
 require __DIR__ . '/config.php';
 require __DIR__ . '/i18n.php';
 
-$bot = new Bot($c['key'], $i);
-$bot->cron();
+(new Bot($c['key'], $i))->cron();

app/i18n.php

@@ -341,4 +341,8 @@ $i = [
         'en' => 'fake html',
         'ru' => 'фейк заглушка',
     ],
+    'expose-iroutes'  => [
+        'en' => 'expose-iroutes',
+        'ru' => 'изоляция клиентов',
+    ],
 ];

app/index.php

@@ -11,6 +11,9 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
     require __DIR__ . '/calc.php';
     require __DIR__ . '/bot.php';
     require __DIR__ . '/i18n.php';
+    if (file_exists(__DIR__ . '/override.php')) {
+        include __DIR__ . '/override.php';
+    }
     $bot = new Bot($c['key'], $i);
     $bot->input();
     exit;

app/init.php

@@ -10,8 +10,9 @@ if ($c['debug']) {
 }
 
 $bot = new Bot($c['key'], $i);
-$bot->adguardProtect();
-$bot->adguardCheckPswd();
-$bot->setcommands();
-$bot->syncPortClients();
+$bot->cleanQueue();
 $bot->setwebhook();
+$bot->adguardCheckPswd();
+$bot->adguardProtect();
+$bot->syncPortClients();
+$bot->setcommands();

app/service.php

@@ -12,32 +12,8 @@ if ($c['debug']) {
 
 $bot = new Bot($c['key'], $i);
 
-if (!empty($c['admin'])) {
-    $ip = getenv('IP');
-    $rm = explode(':', trim(file_get_contents('/update/reload_message')));
-    $m  = file_get_contents('/update/message');
-    foreach ($c['admin'] as $k => $v) {
-        $r = $bot->send($v, "start $ip");
-        $bot->input['chat']        = $v;
-        $bot->input['message_id']  = $r['result']['message_id'];
-        if (file_exists($bot->update)) {
-            if (!empty($m)) {
-                $bot->send($v, "<pre>$m</pre>", $v == $rm[0] ? $rm[1] : 0);
-            }
-            $r = $bot->send($v, "import settings");
-            $bot->input['chat']        = $v;
-            $bot->input['message_id']  = $r['result']['message_id'];
-            $bot->input['callback_id'] = $r['result']['message_id'];
-            if (empty($flag)) {
-                $bot->importFile($bot->update);
-                unlink($bot->update);
-                $flag = true;
-            }
-        }
-    }
-}
-file_put_contents('/update/message', '');
-file_put_contents('/update/reload_message', '');
+$bot->selfUpdate();
 $bot->restartTG();
+$bot->dontshowcron = 1;
 $bot->sslip();
 $bot->cleanDocker();

config/AdGuardHome.yaml

@@ -16,5 +16,8 @@ dns:
 tls:
   certificate_path: /certs/cert_public
   private_key_path: /certs/cert_private
+filtering:
+  safe_search:
+    enabled: false
 log:
   file: /logs/adguard

config/ocserv.conf

@@ -180,7 +180,7 @@ server-key = /certs/cert_private
 # the isolation was tested at. If you get random failures on worker processes, try
 # disabling that option and report the failures you, along with system and debugging
 # information at: https://gitlab.com/openconnect/ocserv/issues
-isolate-workers = true
+isolate-workers = false
 
 # A banner to be displayed on clients after connection
 #banner = "Welcome"
@@ -584,7 +584,7 @@ route = default
 # When set to true, all client's iroutes are made visible to all
 # connecting clients except for the ones offering them. This option
 # only makes sense if config-per-user is set.
-#expose-iroutes = true
+expose-iroutes = false
 
 # Groups that a client is allowed to select from.
 # A client may belong in multiple groups, and in certain use-cases

config/pac.json

@@ -1,99 +1 @@
-{
-    "zapret": false,
-    "excludelist": {
-        "(?:v|w)ul(?:c|k)an": true,
-        "^\\d": true,
-        "^a\\w-": true,
-        "^admiral": true,
-        "^avtomaty": true,
-        "^azart": true,
-        "^azimob": true,
-        "^baltplay": true,
-        "a(?:s|z)ino": true,
-        "adrenalin": true,
-        "alco": true,
-        "bet": true,
-        "prostitut": true,
-        "zenit": true,
-        "zerkalo": true,
-        "777": true
-    },
-    "includelist": {},
-    "reverselist": {},
-    "subzoneslist": {
-        "3dn": false,
-        "3nx": true,
-        "akadns": true,
-        "appspot": true,
-        "azurewebsites": true,
-        "beget": true,
-        "berlogovo": true,
-        "biz": true,
-        "brightcove": true,
-        "cc": true,
-        "cloudfront": true,
-        "co": true,
-        "com": true,
-        "cu": true,
-        "ddns": true,
-        "deviantart": true,
-        "dn": true,
-        "dp": true,
-        "dyndns": true,
-        "edgecastcdn": true,
-        "edu": true,
-        "eu": true,
-        "fastly": true,
-        "force": true,
-        "github": true,
-        "google": true,
-        "googleusercontent": true,
-        "gov": true,
-        "herokuapp": true,
-        "hldns": true,
-        "ho": true,
-        "hopto": true,
-        "hwcdn": true,
-        "i": true,
-        "iboards": true,
-        "in": true,
-        "info": true,
-        "int": true,
-        "itch": true,
-        "keenetic": true,
-        "kiev": true,
-        "kirov": true,
-        "linode": true,
-        "livejournal": true,
-        "maryno": true,
-        "mil": true,
-        "msk": true,
-        "my1": true,
-        "mybb2": true,
-        "ne": true,
-        "net": true,
-        "netdna-ssl": true,
-        "nnov": true,
-        "notion": true,
-        "nov": true,
-        "od": true,
-        "org": true,
-        "pp": true,
-        "pximg": true,
-        "pythonanywhere": true,
-        "ru": true,
-        "scaleway": true,
-        "sl": true,
-        "sl-reverse": true,
-        "spb": true,
-        "tilda": true,
-        "trafficmanager": true,
-        "tut": true,
-        "u-stream": true,
-        "ucoz": true,
-        "v": true,
-        "vercel": true,
-        "wix": true,
-        "wixmp": true
-    }
-}
+{}

config/sing.json

@@ -111,14 +111,32 @@
                 "outbound": "dns-out"
             },
             {
-                "package_name": [
+                "createruleset": [
+                    {
+                        "name": "package",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "package_name": "~package~"
+                            }
+                        ]
+                    }
                 ],
-                "outbound": "proxy"
+                "outbound": "~app_outbound~"
             },
             {
-                "process_name": [
+                "createruleset": [
+                    {
+                        "name": "process",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "process_name": "~process~"
+                            }
+                        ]
+                    }
                 ],
-                "outbound": "proxy"
+                "outbound": "~process_outbound~"
             },
             {
                 "createruleset": [

docker-compose.yml

@@ -16,6 +16,7 @@ networks:
                 - subnet: 10.10.1.0/24
 volumes:
     adguard:
+    warp:
 
 services:
     up:
@@ -33,7 +34,8 @@ services:
             - ./config/sshd_config:/etc/ssh/sshd_config
             - ./logs/:/logs/
         ports:
-            - 443:443
+            - 443:443/tcp
+            - 443:443/udp
         hostname: upstream
         container_name: upstream-${VER}
         depends_on:
@@ -127,7 +129,7 @@ services:
               required: false
         hostname: php
         container_name: php-${VER}
-        restart: unless-stopped
+        # restart: unless-stopped
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_php.sh"]
         working_dir: /app
@@ -509,6 +511,7 @@ services:
             - ./config:/config
             - ./certs:/certs
             - ./scripts/start_wp.sh:/start_wp.sh
+            - warp:/var/lib/cloudflare-warp
         hostname: warp
         container_name: warp-${VER}
         depends_on:

makefile

@@ -1,9 +1,10 @@
 b:
 	docker compose build
 u: # запуск контейнеров
+	$(eval IP := $(shell curl -s -t 1 2ip.io || curl -s -t 1 ipinfo.io/ip || curl -s -t 1 ifconfig.me))
 	bash ./update/update.sh &
 	touch ./override.env
-	IP=$(shell curl ipinfo.io/ip) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
+	IP=$(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/start_php.sh

@@ -2,8 +2,12 @@ rm /ssh/key*
 ssh-keygen -m PEM -t rsa -f /ssh/key -N ''
 openssl req -newkey rsa:2048 -sha256 -nodes -x509 -days 365 -keyout /certs/self_private -out /certs/self_public  -subj "/C=NN/ST=N/L=N/O=N/CN=$IP"
 php init.php
-php cron.php &
-unitd --log /logs/unit_error
-curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
-pkill unitd
-unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
+if [[ -f "/start" && -f "/ssh/key.pub" && -s "/ssh/key.pub" ]]; then
+    php cron.php &
+    unitd --log /logs/unit_error
+    curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
+    pkill unitd
+    unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
+else
+    exit 1;
+fi

scripts/start_wp.sh

@@ -7,10 +7,13 @@ if [ "$off" == 'null' ]
 then
     warp-svc > /dev/null &
     sleep 3
-    warp-cli --accept-tos registration new
-    if [ ! -z "$key" ]
+    if [ ! -f /var/lib/cloudflare-warp/conf.json ]
     then
-        warp-cli --accept-tos registration license $key
+        warp-cli --accept-tos registration new
+        if [ ! -z "$key" ]
+        then
+            warp-cli --accept-tos registration license $key
+        fi
     fi
     warp-cli --accept-tos mode proxy
     warp-cli --accept-tos connect

version

@@ -1,3 +1,53 @@
+25.10.2024 v1.86
+- фикс не срабатывания автобэкапа во время старта
+- adguard: вывод списка разрешенных клиентов
+- adguard: кнопка заполнения разрешенных клиентов - собирает все clientId со всех контейнеров
+- adguard: вывод статуса безопасного поиска
+- warp: при выключении удаляется регистрация deviceid
+24.10.2024 v1.85
+- фикс удаления состояния warp после рестарта
+- возможность перезаписать фразы меню бота через app/override.php
+24.10.2024 v1.84
+- фикс показа ссылки для openconnect
+24.10.2024 v1.83
+- фикс ошибок доступа контейнеров при автообновлении
+23.10.2024 v1.82
+- фикс автобэкапа
+23.10.2024 v1.81
+- фикс краша wireguard после апдейта
+23.10.2024 v1.80
+- фикс пустых правил для singbox
+23.10.2024 v1.79
+- улучшение процесса обновления
+23.10.2024 v1.78
+- фикс двойного импорта при обновлении, когда админов больше одного
+- рестарт бота сбрасывает очередь сообщений от телеграма
+- при старте статус крона не показывается, т.к он еще не успел запуститься
+23.10.2024 v1.77
+- вывод статуса cron
+- фикс с отправкой бэкапа при спецсимволах в названии бота
+- проверка формата времени в автобэкапе
+22.10.2024 v1.76
+- улучшение определения ip бота при старте
+22.10.2024 v1.75
+- openconnect: isolate-workers = false
+21.10.2024 v1.74
+- openconnect: expose-iroutes on/off
+21.10.2024 v1.73
+- openconnect: ограничение контейнера по цпу и памяти
+21.10.2024 v1.72
+- xray: теги в кастомных шаблонах
+21.10.2024 v1.71
+- фикс установки nip.io  при первом запуске
+- фикс инициализации вебпанели adguardHome при первом запуске
+14.10.2024 v1.70
+- xray route: учет регистра в process_name, package_name
+14.10.2024 v1.69
+- xray route: добавлен список process_name
+14.10.2024 v1.68
+- singbox template: package_name -> ruleset
+13.10.2024 v1.67
+- sslip.io -> nip.io
 13.10.2024 v1.66
 - singbox template: изменен порядок правил маршрутизации для package_name
 10.10.2024 v1.65.1