improve ip detect on start

xray: add user to AdH

.env

@@ -1,8 +1,11 @@
 TZ=Europe/Samara
 WGADDRESS=10.0.1.1/24
 WGPORT=51820
+WG1ADDRESS=10.0.3.1/24
+WG1PORT=51821
 SSPORT=8388
 TGPORT=4443
 IMAGE=alpine:3.18.2
 IP=
 VER=
+ENV=/root/.ashrc

.gitignore

@@ -16,3 +16,8 @@
 .vscode/
 .idea/
 mirror/.env
+update/*
+!update/update.sh
+
+override.env
+override.html

app/amnezia.py

@@ -0,0 +1,14 @@
+import sys
+from PyQt5.QtCore import *
+
+
+def enc(s):
+    ba = qCompress(QByteArray(s.encode()))
+    ba = ba.toBase64(QByteArray.Base64Option.Base64UrlEncoding | QByteArray.Base64Option.OmitTrailingEquals)
+    print('vpn://' + str(ba, 'utf-8'))
+
+s = ''
+for line in sys.stdin:
+    s += line
+s = s.strip()
+enc(s)

app/checkwebhook.php

@@ -0,0 +1,11 @@
+<?php
+
+require './config.php';
+
+$ch = curl_init();
+curl_setopt_array($ch, [
+    CURLOPT_URL            => "https://api.telegram.org/bot{$c['key']}/getWebhookInfo",
+    CURLOPT_RETURNTRANSFER => true,
+]);
+$res = curl_exec($ch);
+die(var_dump($res));

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

@@ -1,6 +1,10 @@
 <?php
 
 $i = [
+    'warp'             => [
+        'en' => 'warp',
+        'ru' => 'warp',
+    ],
     'wg_title'             => [
         'en' => 'Wireguard',
         'ru' => 'Wireguard',
@@ -166,12 +170,12 @@ $i = [
         'ru' => 'Некоторым клиентам требуется валидный сертификат при подключении, например Windows 11 DoH или ShadowSocks Android (URL-адрес PAC), для этого требуется домен',
     ],
     'self list explain'    => [
-        'en' => ' - domains that will work through a proxy',
-        'ru' => ' - домены, которые будут работать через прокси',
+        'en' => ' - domains that will work through a proxy, all others directly',
+        'ru' => ' - домены, которые будут работать через прокси, все остальные напрямую',
     ],
     'reverse list explain' => [
-        'en' => ' - domains that will work without a proxy, all others through a proxy',
-        'ru' => ' - домены которые будут работать без прокси, все остальные через прокси',
+        'en' => ' - domains that will work directly, all others through a proxy',
+        'ru' => ' - домены которые будут работать напрямую, все остальные через прокси',
     ],
     'timer'                => [
         'en' => 'set timer',
@@ -237,13 +241,17 @@ $i = [
         'en' => 'defaultDNS',
         'ru' => 'дефолтный днс',
     ],
+    'defaultMTU'  => [
+        'en' => 'defaultMTU',
+        'ru' => 'дефолтный MTU',
+    ],
     'debug'  => [
         'en' => 'debug mode',
         'ru' => 'режим отладки',
     ],
     'backup'  => [
         'en' => 'auto backup',
-        'ru' => 'бэкап',
+        'ru' => 'автобэкап',
     ],
     'logs'  => [
         'en' => 'logs',
@@ -254,8 +262,8 @@ $i = [
         'ru' => 'очистить',
     ],
     'xray'  => [
-        'en' => 'XTLS-Reality',
-        'ru' => 'XTLS-Reality',
+        'en' => 'Xray',
+        'ru' => 'Xray',
     ],
     'geodb'  => [
         'en' => 'GeoIp/GeoSite',
@@ -263,7 +271,11 @@ $i = [
     ],
     'changeFakeDomain'  => [
         'en' => 'changeFakeDomain',
-        'ru' => 'установить фейковый домен',
+        'ru' => 'фейковый домен',
+    ],
+    'selfFakeDomain'  => [
+        'en' => 'steal from yourself',
+        'ru' => 'steal from yourself',
     ],
     'page'  => [
         'en' => 'pagination',
@@ -301,4 +313,36 @@ $i = [
         'en' => 'download',
         'ru' => 'скачать',
     ],
+    'update bot'  => [
+        'en' => 'update bot',
+        'ru' => 'обновить бота',
+    ],
+    'third party browser'  => [
+        'en' => 'third party browser',
+        'ru' => 'сторонний браузер',
+    ],
+    'browser_notify_on'  => [
+        'en' => 'the web panel can be opened in any browser',
+        'ru' => 'веб панель может быть открыта в любом браузере',
+    ],
+    'browser_notify_off'  => [
+        'en' => 'web panel is only available from telegram',
+        'ru' => 'веб панель доступна только из телеграмма',
+    ],
+    'no updates'  => [
+        'en' => 'no updates',
+        'ru' => 'нет обновлений',
+    ],
+    'have updates'  => [
+        'en' => '🟢 have updates',
+        'ru' => '🟢 есть обновления',
+    ],
+    'fake html'  => [
+        'en' => 'fake html',
+        'ru' => 'фейк заглушка',
+    ],
+    'expose-iroutes'  => [
+        'en' => 'expose-iroutes',
+        'ru' => 'изоляция клиентов',
+    ],
 ];

app/index.php

@@ -17,29 +17,70 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
 }
 
 // pac
-$type = $_GET['t'] ?? 'pac';
+if (!empty($t = unserialize(base64_decode(explode('/', $_SERVER['REQUEST_URI'])[2])))) { // fix sing-box import
+    $_GET = array_merge($_GET, $t);
+}
+$type    = $_GET['t'] ?? 'pac';
 $address = $_GET['a'] ?: '127.0.0.1';
-$port = $_GET['p'] ?: '1080';
-$hash = $_GET['h'];
+$port    = $_GET['p'] ?: '1080';
+$hash    = $_GET['h'];
 if ($hash == substr(md5($c['key']), 0, 8)) {
-    if ($type == 'mirror') {
+    require __DIR__ . '/bot.php';
+    require __DIR__ . '/i18n.php';
+    $bot = new Bot($c['key'], $i);
+    switch ($type) {
+        case 'mirror':
+            $bot->getMirror();
+            break;
+        case 's':
+        case 'si':
+            $bot->subscription();
+            exit;
+
+        case 'te':
+            if (!empty($_GET['te'])) {
+                $t = $bot->getPacConf()["{$_GET['ty']}templates"][$_GET['te']];
+            } else {
+                $t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
+            }
+            if ($t) {
+                header('Content-Type: application/json');
+                echo json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                exit;
+            }
+
+        default:
+            if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
+                $pac = file_get_contents($file);
+                header('Content-Type: text/plain');
+                echo str_replace([
+                    '~address~',
+                    '~port~',
+                ], [
+                    $address,
+                    $port,
+                ], $pac);
+                exit;
+            }
+            break;
+    }
+}
+if (!empty($_GET['hash'])) {
+    $t = $_GET;
+    unset($t['hash']);
+    ksort($t);
+    foreach ($t as $k => $v) {
+        $s[] = "$k=$v";
+    }
+    $s  = implode("\n", $s);
+    $sk = hash_hmac('sha256', $c['key'], "WebAppData", true);
+    if (hash_hmac('sha256', $s, $sk) == $_GET['hash']) {
         require __DIR__ . '/bot.php';
         require __DIR__ . '/i18n.php';
         $bot = new Bot($c['key'], $i);
-        $bot->getMirror();
-    } else {
-        if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
-            $pac = file_get_contents($file);
-            header('Content-Type: text/plain');
-            echo str_replace([
-                '~address~',
-                '~port~',
-            ], [
-                $address,
-                $port,
-            ], $pac);
-            exit;
-        }
+        setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
+        setcookie('a', $bot->adguardBasicAuth(), 0, '/');
+        die('ok');
     }
 }
 

app/init.php

@@ -2,18 +2,17 @@
 
 require __DIR__ . '/timezone.php';
 
-// require __DIR__ . '/debug.php';
 require __DIR__ . '/bot.php';
 require __DIR__ . '/config.php';
 require __DIR__ . '/i18n.php';
+if ($c['debug']) {
+    require __DIR__ . '/debug.php';
+}
 
 $bot = new Bot($c['key'], $i);
 $bot->setwebhook();
-$bot->setcommands();
+$bot->selfUpdate();
+$bot->adguardCheckPswd();
+$bot->adguardProtect();
 $bot->syncPortClients();
-if (!empty($c['admin'])) {
-    $ip = getenv('IP');
-    foreach ($c['admin'] as $k => $v) {
-        $bot->send($v, "start $ip");
-    }
-}
+$bot->setcommands();

app/service.php

@@ -0,0 +1,17 @@
+<?php
+
+require __DIR__ . '/timezone.php';
+
+require __DIR__ . '/bot.php';
+require __DIR__ . '/config.php';
+require __DIR__ . '/i18n.php';
+
+if ($c['debug']) {
+    require __DIR__ . '/debug.php';
+}
+
+$bot = new Bot($c['key'], $i);
+
+$bot->restartTG();
+$bot->sslip();
+$bot->cleanDocker();

app/updatepac.php

@@ -89,98 +89,13 @@ function start()
 
     $conf = $bot->getPacConf();
 
-    $subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
+    if (!empty($conf['subzoneslist'])) {
+        $subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
+    }
 
     // check && exclude
-    $include = array_filter($conf['includelist'], fn($x) => $x == true);
-    if ($conf['zapret']) {
-        foreach ($source as $k => $v) {
-            $size = getSize($v['source']);
-            if ($size > 0) {
-                if (file_exists($v['dest'])) {
-                    unlink($v['dest']);
-                }
-                touch($v['dest']);
-                $percent  = 0;
-                $curr = 0;
-                exec("php updatepac.php download $k > /dev/null &");
-                $i = $j = 0;
-                while ($curr <= $size) {
-                    $rotate = $curr != $size ? $load[$j % count($load)] : '';
-                    $tail = <<<text
-                            Downloading {$v['source']}
-                            $curr/$size $percent% $rotate
-                            text;
-                    update($text . $tail);
-                    if ($curr == $size || $i > 50) {
-                        break;
-                    }
-                    usleep(50000);
-                    clearstatcache();
-                    if ($curr == filesize($v['dest'])) {
-                        $i++;
-                    }
-                    $curr = filesize($v['dest']);
-                    $percent  = (int) ceil($curr * 100 / $size);
-                    $j++;
-                }
-                if ($curr != $size) {
-                    $text .= "\nError downloading {$v['source']}\nabort script";
-                    endScript($text);
-                }
-            } else {
-                $text .= "\nError size {$v['source']}\nabort script";
-                endScript($text);
-            }
-            $text .= $tail ? "$tail\n" : '';
-        }
-        // prepare
-        $reg = '~^([^.*]+\.(?:(?:' . implode('|', $subzones) . ')\.)?[^.]+)$~';
-
-        foreach ($source as $k => $v) {
-            $size = filesize($v['dest']);
-            $curr = $j = 0;
-            $time = microtime(true);
-            $name = basename($v['dest']);
-            $f = fopen($v['dest'], 'r');
-            while (($s = fgets($f)) !== false) {
-                $curr += strlen($s);
-                $percent = (int) ceil($curr * 100 / $size);
-                $rotate = $curr != $size ? $load[$j % count($load)] : '';
-                $tail = <<<text
-                        Prepare $name $percent% $rotate
-                        text;
-                if (microtime(true) - $time > 0.1) {
-                    update($text . $tail);
-                    $time = microtime(true);
-                    $j++;
-                }
-                if ($name == 'dump.csv') {
-                    if (!preg_match('~;.*;~', $s)) {
-                        continue;
-                    }
-                    $t = explode(';', iconv('CP1251', 'utf-8', $s));
-                    if (empty($t[1])) {
-                        continue;
-                    }
-                    if (preg_match($reg, idn_to_ascii(trim($t[1])), $m)) {
-                        $domains[$m[1]] = 0;
-                    }
-                } else {
-                    if (preg_match($reg, idn_to_ascii(iconv('CP1251', 'utf-8', trim($s))), $m)) {
-                        $domains[$m[1]] = 0;
-                    }
-                }
-            }
-            fclose($f);
-            $text .= $tail ? "$tail\n" : '';
-        }
-        $exclude = array_keys(array_filter($conf['excludelist'], fn($x) => $x == true));
-        foreach ($include as $k => $v) {
-            $domains[$k] = 0;
-        }
-    } else {
-        $domains = $include;
+    if (!empty($conf['includelist'])) {
+        $domains = array_filter($conf['includelist'], fn($x) => $x == true);
     }
     if (empty($domains)) {
         $text = "Empty domains. Delete pac files";
@@ -218,16 +133,30 @@ function start()
         $text .= $tail ? "$tail\n" : '';
 
         // create pac
-        $domains = elzw(json_encode($t));
-        $pac     = 'function FindProxyForURL(t,e){"indexOf"in Array.prototype||(Array.prototype.indexOf=function(t,e){void 0===e&&(e=0),e<0&&(e+=this.length),e<0&&(e=0);for(var n=this.length;e<n;e++)if(e in this&&this[e]===t)return e;return -1}),"dlzw"in String.prototype||(String.prototype.dlzw=function(t){for(var e in text=this.split(""),code=256,o=phrase="",last=text.length,keys=[],text){if(o+=(cc="".charCodeAt.call(this[e],0))<256?text[e]:keys[cc],last==e)break;phrase&&phrase.length>0&&(keys[code]=phrase+(cc<256?text[e]:keys[cc][0]),code++),phrase=cc<256?text[e]:keys[cc]}return o});var n=JSON.parse(\'' . $domains . '\'.dlzw()),r=(/\.(' . implode('|', $subzones) . ')\.[^.]+$/.test(e)?e.replace(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/,"$2"):e.replace(/(.+)\.([^.]+\.[^.]+$)/,"$2")).replace(/^www\.(.+)/,"$1").match(/(.*)\.([^.]+$)/);if(console.log(n,r),!r||!r[2])return"DIRECT";var o=r[1],i=r[2],a=[];if(n.hasOwnProperty(i)&&n[i].hasOwnProperty(o.length)){if("string"==typeof n[i][o.length]){var l=RegExp(".{"+o.length.toString()+"}","g");n[i][o.length]=n[i][o.length].match(l)}a=n[i][o.length]}return -1!==a.indexOf(o)?"SOCKS5 ~address~:~port~; DIRECT":"DIRECT"}';
+        $domains = json_encode($t);
+        $pac     = <<<PAC
+                    function FindProxyForURL(t, e) {
+                        var n = JSON.parse('$domains'),
+                        r = e.match(/((?:.+\.)*(.+))\.([^.]+)$/);
+                        if (r && n.hasOwnProperty(r[3]) && (n[r[3]].hasOwnProperty(r[1].length) && (-1 !== n[r[3]][r[1].length].indexOf(r[1])) || n[r[3]].hasOwnProperty(r[2].length) && (-1 !== n[r[3]][r[2].length].indexOf(r[2])))) {
+                            return "SOCKS5 ~address~:~port~; DIRECT";
+                        }
+                        return "DIRECT";
+                    }
+                    PAC;
+        $pac = preg_replace("~\s{2,}~", '', $pac);
+        $pac = preg_replace("~\n~", '', $pac);
         file_put_contents(__DIR__ . '/zapretlists/pac', $pac);
         $text .= "Create minified pac 100%\n";
     }
-
     // create reverse PAC
-    $domains = array_filter($conf['reverselist'], fn($x) => $x == true);
+    unset($domains);
+    if (!empty($conf['reverselist'])) {
+        $domains = array_filter($conf['reverselist'], fn($x) => $x == true);
+    }
     if (empty($domains)) {
-        $text .= "Empty reverse domains. Delete reverse pac files";
+
+        // $text .= "Empty reverse domains. Delete reverse pac files";
         unlink(__DIR__ . '/zapretlists/rmpac');
         unlink(__DIR__ . '/zapretlists/rpac');
     } else {
@@ -258,11 +187,23 @@ function start()
         // fclose($f);
         $text .= $tail ? "$tail\n" : '';
 
-        $domains = elzw(json_encode($t));
-        $pac     = 'function FindProxyForURL(t,e){"indexOf"in Array.prototype||(Array.prototype.indexOf=function(t,e){void 0===e&&(e=0),e<0&&(e+=this.length),e<0&&(e=0);for(var n=this.length;e<n;e++)if(e in this&&this[e]===t)return e;return -1}),"dlzw"in String.prototype||(String.prototype.dlzw=function(t){for(var e in text=this.split(""),code=256,o=phrase="",last=text.length,keys=[],text){if(o+=(cc="".charCodeAt.call(this[e],0))<256?text[e]:keys[cc],last==e)break;phrase&&phrase.length>0&&(keys[code]=phrase+(cc<256?text[e]:keys[cc][0]),code++),phrase=cc<256?text[e]:keys[cc]}return o});var n=JSON.parse(\'' . $domains . '\'.dlzw()),r=(/\.(' . implode('|', $subzones) . ')\.[^.]+$/.test(e)?e.replace(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/,"$2"):e.replace(/(.+)\.([^.]+\.[^.]+$)/,"$2")).replace(/^www\.(.+)/,"$1").match(/(.*)\.([^.]+$)/);if(console.log(n,r),!r||!r[2])return"DIRECT";var o=r[1],i=r[2],a=[];if(n.hasOwnProperty(i)&&n[i].hasOwnProperty(o.length)){if("string"==typeof n[i][o.length]){var l=RegExp(".{"+o.length.toString()+"}","g");n[i][o.length]=n[i][o.length].match(l)}a=n[i][o.length]}return -1!==a.indexOf(o)?"DIRECT":"SOCKS5 ~address~:~port~"}';
+        $domains = json_encode($t);
+        $pac     = <<<PAC
+                    function FindProxyForURL(t, e) {
+                        var n = JSON.parse('$domains'),
+                        r = e.match(/((?:.+\.)*(.+))\.([^.]+)$/);
+                        if (r && n.hasOwnProperty(r[3]) && (n[r[3]].hasOwnProperty(r[1].length) && (-1 !== n[r[3]][r[1].length].indexOf(r[1])) || n[r[3]].hasOwnProperty(r[2].length) && (-1 !== n[r[3]][r[2].length].indexOf(r[2])))) {
+                            return "DIRECT";
+                        }
+                        return "SOCKS5 ~address~:~port~";
+                    }
+                    PAC;
+        $pac = preg_replace("~\s{2,}+~", '', $pac);
+        $pac = preg_replace("~\n~", '', $pac);
         file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
         $text .= 'Create minified reverse pac 100%';
     }
+
     endScript($text);
 }
 
@@ -308,7 +249,6 @@ $load = [
     '-',
     '\\',
 ];
-
 switch ($_SERVER['argv'][1]) {
     case 'start':
         $bot                       = new Bot($c['key'], $i);

app/webapp/donate.html

@@ -0,0 +1,26 @@
+<meta charset="utf-8">
+<script src="jquery-3.7.1.min.js"></script>
+<script>
+    jQuery(function($){
+        $('#copy').on('click', function (e){
+            $(this).text('copied');
+            var $temp = $("<input>");
+            $("body").append($temp);
+            $temp.val($(this).attr('data-id')).select();
+            document.execCommand("copy");
+            $temp.remove();
+        });
+    });
+</script>
+<div style="position:relative;width:100%;height:100%; background-color: white;">
+    <div style="position:absolute;top:0;right:0;width:35%;text-align:center;background-color: #17212b;">
+        <img src="toncoin.png" width="100%" alt="">
+        <a href="javascript:;" id="copy" style="color:white;text-decoration:none" data-id="UQCDDkaX3fCAFBek28Hx4TfvDDRqeizOW74blVMVAM4_m4OW">copy</a>
+        <!-- <iframe src="https://ghbtns.com/github-btn.html?user=mercurykd&repo=vpnbot&type=star&count=true" frameborder="0" scrolling="0" width="150" height="20" title="GitHub"></iframe> -->
+    </div>
+    <a style="background-color: #8B3FFD;height: 46px;display:inline-block;padding:0 54px;color: white;border-radius: 12px;text-decoration: none;font-size: 20px;line-height: 46px;font-family: arial;" href="https://yoomoney.ru/to/410011827900450">
+        <svg style="width: 24px;fill: white;position: relative;top: 4px;" class="qa-fundraise-button-logo mui-m0okdh" viewBox="0 0 16 16"><path d="M4.638 8.5a5.67 5.67 0 015.681-5.68A5.693 5.693 0 0116 8.5a5.693 5.693 0 01-5.68 5.682A5.67 5.67 0 014.637 8.5zm3.56 0c0 1.151.97 2.122 2.121 2.122 1.15 0 2.085-.97 2.121-2.121 0-1.15-.97-2.121-2.12-2.121-1.151 0-2.122.97-2.122 2.12zm-3.596 4.243v-8.27H0l2.589 8.27h2.013z" clip-rule="evenodd"></path></svg>
+        Перевести
+    </a>
+    <iframe style="width:100%;height:100%" src="https://pay.cloudtips.ru/p/757de378" frameborder="0"></iframe>
+</div>

app/webapp/index.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="https://telegram.org/js/telegram-web-app.js"></script>
+    <script src="jquery-3.7.1.min.js"></script>
+    <title>Document</title>
+</head>
+<body>
+    <script>
+        var tg = window.Telegram.WebApp;
+        jQuery(function($) {
+            $.ajax({
+                'url': 'check?' + tg.initData,
+            }).done(function (r) {
+                location.replace('/adguard/');
+            }).fail(function (r) {
+                location.replace('/');
+            });
+        });
+    </script>
+</body>
+</html>

app/webapp/login.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Login</title>
+    <style>
+        /* Design based on Blue Login Field of Kevin Sleger https://codepen.io/MurmeltierS/pen/macKb */
+
+        body {
+            background: #44c4e7 url("https://photos-6.dropbox.com/t/2/AAC_bdqR8LMkjEe-HPIf4K1DhtseMLRHPklBSzJSuzglvA/12/5714737/jpeg/1024x768/3/1418346000/0/2/bkg-blur.jpg/CLHm3AIgASgBKAI/b7RrveA2022yJyfO9RyRvv7LjJQESukGHssHUxVThzw") no-repeat center center fixed;
+            background-size: cover;
+            font-family: "Roboto";
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+
+            &::before {
+                z-index: -1;
+                content: '';
+                position: fixed;
+                top: 0;
+                left: 0;
+                background: #44c4e7;
+                /* IE Fallback */
+                background: rgba(68, 196, 231, 0.8);
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .form {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            background: #fff;
+            width: 285px;
+            margin: -140px 0 0 -182px;
+            padding: 40px;
+            box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
+
+            h2 {
+                margin: 0 0 20px;
+                line-height: 1;
+                color: #44c4e7;
+                font-size: 18px;
+                font-weight: 400;
+            }
+
+            input {
+                outline: none;
+                display: block;
+                width: 100%;
+                margin: 0 0 20px;
+                padding: 10px 15px;
+                border: 1px solid #ccc;
+                color: #ccc;
+                font-family: "Roboto";
+                box-sizing: border-box;
+                font-size: 14px;
+                font-wieght: 400;
+                -webkit-font-smoothing: antialiased;
+                -moz-osx-font-smoothing: grayscale;
+                transition: 0.2s linear;
+
+                &input:focus {
+                    color: #333;
+                    border: 1px solid #44c4e7;
+                }
+            }
+
+            button {
+                cursor: pointer;
+                background: #44c4e7;
+                width: 100%;
+                padding: 10px 15px;
+                border: 0;
+                color: #fff;
+                font-family: "Roboto";
+                font-size: 14px;
+                font-weight: 400;
+
+                &:hover {
+                    background: #369cb8;
+                }
+            }
+        }
+
+        .error,
+        .valid {
+            display: none;
+        }
+    </style>
+    <script src="jquery-3.7.1.min.js"></script>
+</head>
+
+<body>
+    <section class="form animated flipInX">
+        <h2>Login To Your Account</h2>
+        <p class="valid">Valid. Please wait a moment.</p>
+        <p class="error">Error. Please enter correct Username &amp; password.</p>
+        <form class="loginbox" autocomplete="off">
+            <input placeholder="Username" type="text" id="username"></input>
+            <input placeholder="Password" type="password" id="password"></input>
+            <button id="submit">Login</button>
+        </form>
+    </section>
+    <script>
+        $(document).ready(function() {
+            $('#submit').click(function () {
+                event.preventDefault(); // prevent PageReLoad
+                $('.error').css('display', 'block'); // show error msg
+            });
+        });
+    </script>
+</body>
+</html>

config/clients1.json

@@ -0,0 +1 @@
+[]

config/nginx.conf

@@ -22,15 +22,17 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 80 default_server;
-    listen 443 ssl http2 default_server proxy_protocol;
+    listen 10.10.0.2:80 default_server;
+    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
     access_log /logs/nginx_default_access;
 
     location / {
-      return 444;
+      root /app;
+      index override.html login.html;
+      try_files $uri $uri/ =404;
     }
     location /adguard/ {
       access_log /logs/nginx_adguard_access;
@@ -38,8 +40,15 @@ http {
       proxy_redirect / /adguard/;
       proxy_cookie_path / /adguard/;
     }
+    location /webapp {
+      access_log /logs/nginx_webapp_access;
+      alias /app;
+      index index.html;
+      try_files $uri $uri/ /pac?$query_string;
+    }
     location /pac {
       access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
       proxy_pass http://php;
     }
     location /tlgrm {
@@ -56,6 +65,38 @@ http {
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
     }
+    location /ws {
+        proxy_pass http://xr:443;
+        proxy_redirect off;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 5d;
+    }
+#-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/;
@@ -67,11 +108,12 @@ http {
 
 #-domain
   # server {
-  #   listen 80;
+  #   listen 10.10.0.2:80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 443 ssl http2 proxy_protocol;
+    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 10.10.1.2:443 ssl http2;
     # ssl_certificate /certs/cert_public;
     # ssl_certificate_key /certs/cert_private;
 #-ssl
@@ -80,7 +122,9 @@ http {
   #   access_log /logs/nginx_domain_access;
 
   #   location / {
-  #     return 444;
+  #     root /app;
+  #     index override.html login.html;
+  #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
   #     access_log /logs/nginx_adguard_access;
@@ -88,8 +132,15 @@ http {
   #     proxy_redirect / /adguard/;
   #     proxy_cookie_path / /adguard/;
   #   }
+  #   location /webapp {
+  #     access_log /logs/nginx_webapp_access;
+  #     alias /app;
+  #     index index.html;
+  #     try_files $uri $uri/ /pac?$query_string;
+  #   }
   #   location /pac {
   #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
   #     proxy_pass http://php;
   #   }
   #   location ~\.well-known {
@@ -107,6 +158,17 @@ http {
   #     proxy_set_header Upgrade $http_upgrade;
   #     proxy_set_header Connection "upgrade";
   #   }
+  #   location /ws {
+  #       proxy_pass http://xr:443;
+  #       proxy_redirect off;
+  #       proxy_http_version 1.1;
+  #       proxy_set_header Upgrade $http_upgrade;
+  #       proxy_set_header Connection "upgrade";
+  #       proxy_set_header Host $host;
+  #       proxy_set_header X-Real-IP $remote_addr;
+  #       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  #       proxy_read_timeout 5d;
+  #    }
 #-domain
 #-ssl
   #   # The DoH server block

config/nginx_default.conf

@@ -22,15 +22,17 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 80 default_server;
-    listen 443 ssl http2 default_server proxy_protocol;
+    listen 10.10.0.2:80 default_server;
+    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
     access_log /logs/nginx_default_access;
 
     location / {
-      return 444;
+      root /app;
+      index override.html login.html;
+      try_files $uri $uri/ =404;
     }
     location /adguard/ {
       access_log /logs/nginx_adguard_access;
@@ -38,8 +40,15 @@ http {
       proxy_redirect / /adguard/;
       proxy_cookie_path / /adguard/;
     }
+    location /webapp {
+      access_log /logs/nginx_webapp_access;
+      alias /app;
+      index index.html;
+      try_files $uri $uri/ /pac?$query_string;
+    }
     location /pac {
       access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
       proxy_pass http://php;
     }
     location /tlgrm {
@@ -56,6 +65,38 @@ http {
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
     }
+    location /ws {
+        proxy_pass http://xr:443;
+        proxy_redirect off;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 5d;
+    }
+#-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/;
@@ -67,11 +108,12 @@ http {
 
 #-domain
   # server {
-  #   listen 80;
+  #   listen 10.10.0.2:80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 443 ssl http2 proxy_protocol;
+    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 10.10.1.2:443 ssl http2;
     # ssl_certificate /certs/cert_public;
     # ssl_certificate_key /certs/cert_private;
 #-ssl
@@ -80,7 +122,9 @@ http {
   #   access_log /logs/nginx_domain_access;
 
   #   location / {
-  #     return 444;
+  #     root /app;
+  #     index override.html login.html;
+  #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
   #     access_log /logs/nginx_adguard_access;
@@ -88,8 +132,15 @@ http {
   #     proxy_redirect / /adguard/;
   #     proxy_cookie_path / /adguard/;
   #   }
+  #   location /webapp {
+  #     access_log /logs/nginx_webapp_access;
+  #     alias /app;
+  #     index index.html;
+  #     try_files $uri $uri/ /pac?$query_string;
+  #   }
   #   location /pac {
   #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
   #     proxy_pass http://php;
   #   }
   #   location ~\.well-known {
@@ -107,6 +158,17 @@ http {
   #     proxy_set_header Upgrade $http_upgrade;
   #     proxy_set_header Connection "upgrade";
   #   }
+  #   location /ws {
+  #       proxy_pass http://xr:443;
+  #       proxy_redirect off;
+  #       proxy_http_version 1.1;
+  #       proxy_set_header Upgrade $http_upgrade;
+  #       proxy_set_header Connection "upgrade";
+  #       proxy_set_header Host $host;
+  #       proxy_set_header X-Real-IP $remote_addr;
+  #       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  #       proxy_read_timeout 5d;
+  #    }
 #-domain
 #-ssl
   #   # The DoH server block

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

@@ -0,0 +1,184 @@
+{
+    "log": {
+        "level": "error",
+        "timestamp": true
+    },
+    "inbounds": [
+        {
+            "type": "tun",
+            "tag": "tun-in",
+            "domain_strategy": "prefer_ipv4",
+            "interface_name": "sing-tun",
+            "inet4_address": "172.19.0.1\/30",
+            "mtu": 1400,
+            "gso": true,
+            "auto_route": true,
+            "strict_route": true,
+            "sniff": true,
+            "endpoint_independent_nat": false,
+            "stack": "mixed",
+            "platform": {
+                "http_proxy": {
+                    "enabled": false,
+                    "server": "127.0.0.1",
+                    "server_port": 2080
+                }
+            }
+        },
+        {
+            "type": "mixed",
+            "tag": "mixed-in",
+            "domain_strategy": "prefer_ipv4",
+            "listen": "127.0.0.1",
+            "listen_port": 2080,
+            "tcp_fast_open": true,
+            "sniff": true,
+            "sniff_override_destination": false,
+            "users": []
+        }
+    ],
+    "dns": {
+        "servers": [
+            {
+                "tag": "dns_direct",
+                "address": "~dns~",
+                "address_resolver": "dns-remote",
+                "strategy": "prefer_ipv4",
+                "detour": "direct"
+            },
+            {
+                "tag": "dns-remote",
+                "address": "tcp:\/\/8.8.8.8",
+                "address_strategy": "prefer_ipv4",
+                "strategy": "prefer_ipv4",
+                "detour": "direct"
+            }
+        ],
+        "rules": [
+            {
+                "outbound": "any",
+                "server": "dns-direct",
+                "disable_cache": false
+            }
+        ],
+        "strategy": "ipv4_only",
+        "independent_cache": true
+    },
+    "outbounds": [
+        {
+            "flow": "xtls-rprx-vision",
+            "packet_encoding": "",
+            "server": "",
+            "server_port": 443,
+            "tls": {
+                "enabled": true,
+                "insecure": false,
+                "reality": {
+                    "enabled": true,
+                    "public_key": "",
+                    "short_id": ""
+                },
+                "server_name": "",
+                "utls": {
+                    "enabled": true,
+                    "fingerprint": "chrome"
+                }
+            },
+            "uuid": "",
+            "type": "vless",
+            "domain_strategy": "ipv4_only",
+            "tag": "proxy"
+        },
+        {
+            "type": "direct",
+            "tag": "direct"
+        },
+        {
+            "type": "block",
+            "tag": "block"
+        },
+        {
+            "type": "dns",
+            "tag": "dns-out"
+        }
+    ],
+    "route": {
+        "auto_detect_interface": true,
+        "override_android_vpn": true,
+        "rules": [
+            {
+                "protocol": "dns",
+                "outbound": "dns-out"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "package",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "package_name": "~package~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~app_outbound~"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "process",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "process_name": "~process~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~process_outbound~"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "block",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~block~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "block"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "pac",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~pac~"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "warp",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~warp~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "proxy"
+            },
+            {
+                "outbound": "direct"
+            }
+        ],
+        "final": "direct"
+    }
+}

config/upstream.conf

@@ -3,7 +3,7 @@ worker_processes  auto;
 
 load_module /usr/lib/nginx/modules/ngx_stream_module.so;
 
-error_log  /logs/nginx_error;
+error_log  /logs/upstream_error;
 pid        /var/run/nginx.pid;
 
 events {

config/v2ray.json

@@ -0,0 +1,95 @@
+{
+    "log": {
+        "access": "",
+        "error": "",
+        "loglevel": "warning"
+    },
+    "inbounds": [{
+        "tag": "socks",
+        "port": 10808,
+        "listen": "127.0.0.1",
+        "protocol": "socks",
+        "sniffing": {
+            "enabled": true,
+            "destOverride": ["http", "tls"],
+            "routeOnly": false
+        },
+        "settings": {
+            "auth": "noauth",
+            "udp": true,
+            "allowTransparent": false
+        }
+    }, {
+        "tag": "http",
+        "port": 10809,
+        "listen": "127.0.0.1",
+        "protocol": "http",
+        "sniffing": {
+            "enabled": true,
+            "destOverride": ["http", "tls"],
+            "routeOnly": false
+        },
+        "settings": {
+            "auth": "noauth",
+            "udp": true,
+            "allowTransparent": false
+        }
+    }],
+    "outbounds": [{
+        "tag": "proxy",
+        "protocol": "vless",
+        "settings": {
+            "vnext": [{
+                "address": "",
+                "port": 443,
+                "users": [{
+                    "id": "",
+                    "alterId": 0,
+                    "email": "t@t.tt",
+                    "security": "auto",
+                    "encryption": "none",
+                    "flow": "xtls-rprx-vision"
+                }]
+            }]
+        },
+        "streamSettings": {
+            "network": "tcp",
+            "security": "reality",
+            "realitySettings": {
+                "serverName": "",
+                "fingerprint": "chrome",
+                "show": false,
+                "publicKey": "",
+                "shortId": "",
+                "spiderX": ""
+            }
+        },
+        "mux": {
+            "enabled": false,
+            "concurrency": -1
+        }
+    }, {
+        "tag": "direct",
+        "protocol": "freedom"
+    }, {
+        "tag": "block",
+        "protocol": "blackhole",
+        "settings": {
+            "response": {
+                "type": "http"
+            }
+        }
+    }],
+    "routing": {
+        "domainStrategy": "AsIs",
+        "rules": [{
+            "type": "field",
+            "outboundTag": "proxy",
+            "domain": "~pac~"
+        }, {
+            "type": "field",
+            "port": "0-65535",
+            "outboundTag": "direct"
+        }]
+    }
+}

config/xray.json

@@ -5,11 +5,6 @@
             "protocol": "vless",
             "settings": {
                 "clients": [
-                    {
-                        "email": "user1@myserver",
-                        "flow": "xtls-rprx-vision",
-                        "id": ""
-                    }
                 ],
                 "decryption": "none"
             },

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 x-logging:
       &default-logging
       driver: "json-file"
@@ -12,12 +10,16 @@ networks:
         ipam:
             config:
                 - subnet: 10.10.0.0/24
+    xray:
+        ipam:
+            config:
+                - subnet: 10.10.1.0/24
 volumes:
     adguard:
 
 services:
     up:
-        image: mercurykd/vpnbot-up:1.1
+        image: mercurykd/vpnbot-ng:1.1
         build:
             context: dockerfile
             dockerfile: nginx.dockerfile
@@ -31,7 +33,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:
@@ -41,8 +44,11 @@ services:
                 condition: service_started
             ss:
                 condition: service_started
-        environment:
-            TZ: ${TZ}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_upstream.sh"]
         networks:
@@ -66,6 +72,7 @@ services:
             - ./ssh:/ssh
             - ./config/sshd_config:/etc/ssh/sshd_config
             - ./logs/:/logs/
+            - ./app/webapp:/app
         ports:
             - 80:80
         hostname: nginx
@@ -73,21 +80,27 @@ services:
         depends_on:
             up:
                 condition: service_started
-        environment:
-            TZ: ${TZ}
-            SSPORT: ${SSPORT}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_ng.sh"]
         networks:
             default:
                 ipv4_address: 10.10.0.2
+            xray:
+                ipv4_address: 10.10.1.2
         logging: *default-logging
     php:
-        image: mercurykd/vpnbot-php:1.1
+        image: mercurykd/vpnbot-php:1.5
         build:
             dockerfile: dockerfile/php.dockerfile
             args:
                 image: ${IMAGE}
+        ports:
+            - 127.0.0.1:8081:8080
         volumes:
             - ./config/.profile:/root/.ashrc:ro
             - ./config/php.ini:/etc/php81/php.ini
@@ -101,16 +114,21 @@ services:
             - ./version:/version
             - ./mirror:/mirror
             - ./.env:/mirror/.env
+            - ./update:/update
+            - ./.git:/.git
+            - ./singbox_windows:/singbox
+            - /var/run/docker.sock:/var/run/docker.sock:ro
         environment:
-            TZ: ${TZ}
             IP: ${IP}
-            ADDRESS: ${WGADDRESS}
-            WGPORT: ${WGPORT}
-            SSPORT: ${SSPORT}
-            TGPORT: ${TGPORT}
+            VER: ${VER}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              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
@@ -125,8 +143,56 @@ services:
             interval: 5s
             timeout: 5s
             retries: 5
+    service:
+        image: mercurykd/vpnbot-php:1.5
+        build:
+            dockerfile: dockerfile/php.dockerfile
+            args:
+                image: ${IMAGE}
+        volumes:
+            - ./config/.profile:/root/.ashrc:ro
+            - ./config/php.ini:/etc/php81/php.ini
+            - ./config/:/config/
+            - ./certs/:/certs/
+            - ./ssh:/ssh
+            - ./app:/app
+            - ./logs/:/logs/
+            - ./update:/update
+            - ./scripts/start_service.sh:/start_service.sh
+            - /var/run/docker.sock:/var/run/docker.sock:ro
+        environment:
+            IP: ${IP}
+            VER: ${VER}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
+        hostname: service
+        container_name: service-${VER}
+        # restart: unless-stopped
+        stop_grace_period: 1s
+        command: ["/bin/sh", "/start_service.sh"]
+        working_dir: /app
+        networks:
+            default:
+                ipv4_address: 10.10.0.15
+        logging: *default-logging
+        depends_on:
+            - up
+            - ng
+            - php
+            - proxy
+            - wg
+            - wg1
+            - ad
+            - ss
+            - tg
+            - xr
+            - oc
+            - np
     proxy:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
             args:
@@ -147,7 +213,11 @@ services:
                 ipv4_address: 10.10.0.3
         environment:
             TZ: ${TZ}
-            SSPORT: ${SSPORT}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_proxy.sh"]
         logging: *default-logging
@@ -164,9 +234,7 @@ services:
             - ./scripts/start_wg.sh:/start_wg.sh
             - ./scripts/reset_wg.sh:/reset_wg.sh
             - ./scripts/block_torrent.sh:/block_torrent.sh
-            - ./scripts/unblock_torrent.sh:/unblock_torrent.sh
             - ./scripts/block_exchange.sh:/block_exchange.sh
-            - ./scripts/unblock_exchange.sh:/unblock_exchange.sh
             - ./ssh:/ssh
             - ./config/sshd_config:/etc/ssh/sshd_config
         hostname: wireguard
@@ -176,9 +244,12 @@ services:
                 condition: service_healthy
         ports:
             - ${WGPORT}:${WGPORT}/udp
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         environment:
-            TZ: ${TZ}
-            WGPORT: ${WGPORT}
             ADDRESS: ${WGADDRESS}
         cap_add:
             - NET_ADMIN
@@ -190,6 +261,46 @@ services:
             default:
                 ipv4_address: 10.10.0.4
         logging: *default-logging
+    wg1:
+        image: mercurykd/vpnbot-wg:1.1
+        build:
+            dockerfile: dockerfile/wireguard.dockerfile
+            args:
+                image: ${IMAGE}
+        volumes:
+            - ./config/.profile:/root/.ashrc:ro
+            - ./config/wg1.conf:/etc/wireguard/wg0.conf
+            - ./config/pac.json:/pac.json
+            - ./scripts/start_wg.sh:/start_wg.sh
+            - ./scripts/reset_wg.sh:/reset_wg.sh
+            - ./scripts/block_torrent.sh:/block_torrent.sh
+            - ./scripts/block_exchange.sh:/block_exchange.sh
+            - ./ssh:/ssh
+            - ./config/sshd_config:/etc/ssh/sshd_config
+        hostname: wireguard1
+        container_name: wireguard1-${VER}
+        depends_on:
+            php:
+                condition: service_healthy
+        ports:
+            - ${WG1PORT}:${WG1PORT}/udp
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
+        environment:
+            ADDRESS: ${WG1ADDRESS}
+        cap_add:
+            - NET_ADMIN
+        devices:
+            - /dev/net/tun:/dev/net/tun
+        stop_grace_period: 1s
+        command: ["/bin/sh", "/start_wg.sh"]
+        networks:
+            default:
+                ipv4_address: 10.10.0.14
+        logging: *default-logging
     ad:
         image: mercurykd/vpnbot-ad:1.1
         build:
@@ -214,8 +325,11 @@ services:
         depends_on:
             php:
                 condition: service_healthy
-        environment:
-            TZ: ${TZ}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         networks:
             default:
@@ -225,7 +339,7 @@ services:
         entrypoint: ["/bin/sh", "/start_ad.sh"]
         logging: *default-logging
     ss:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
             args:
@@ -244,9 +358,11 @@ services:
         ports:
             - ${SSPORT}:${SSPORT}/tcp
             - ${SSPORT}:${SSPORT}/udp
-        environment:
-            TZ: ${TZ}
-            SSPORT: ${SSPORT}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_ss.sh"]
         networks:
@@ -271,9 +387,12 @@ services:
         ports:
             - ${TGPORT}:${TGPORT}
         environment:
-            TZ: ${TZ}
             IP: ${IP}
-            TGPORT: ${TGPORT}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_tg.sh"]
         networks:
@@ -281,7 +400,7 @@ services:
                 ipv4_address: 10.10.0.8
         logging: *default-logging
     xr:
-        image: mercurykd/vpnbot-xr:1.1
+        image: mercurykd/vpnbot-xr:1.3
         build:
             dockerfile: dockerfile/xray.dockerfile
             args:
@@ -297,16 +416,21 @@ services:
         depends_on:
             php:
                 condition: service_healthy
-        environment:
-            TZ: ${TZ}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_xray.sh"]
         networks:
             default:
                 ipv4_address: 10.10.0.9
+            xray:
+                ipv4_address: 10.10.1.9
         logging: *default-logging
     oc:
-        image: mercurykd/vpnbot-oc:1.1
+        image: mercurykd/vpnbot-oc:1.2
         build:
             dockerfile: dockerfile/ocserv.dockerfile
             args:
@@ -323,9 +447,11 @@ services:
         depends_on:
             php:
                 condition: service_healthy
-        environment:
-            TZ: ${TZ}
-            ENV: /root/.ashrc
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_oc.sh"]
         cap_add:
@@ -354,9 +480,11 @@ services:
         depends_on:
             php:
                 condition: service_healthy
-        environment:
-            TZ: ${TZ}
-            ENV: /root/.ashrc
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_np.sh"]
         cap_add:
@@ -365,3 +493,36 @@ services:
             default:
                 ipv4_address: 10.10.0.12
         logging: *default-logging
+    wp:
+        image: mercurykd/vpnbot-wp:1.2
+        build:
+            dockerfile: dockerfile/warp.dockerfile
+            args:
+                image: ${IMAGE}
+        cap_add:
+            - NET_ADMIN
+        devices:
+            - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ./config/.profile:/root/.ashrc:ro
+            - ./ssh:/ssh
+            - ./config/sshd_config:/etc/ssh/sshd_config
+            - ./config:/config
+            - ./certs:/certs
+            - ./scripts/start_wp.sh:/start_wp.sh
+        hostname: warp
+        container_name: warp-${VER}
+        depends_on:
+            php:
+                condition: service_healthy
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
+        stop_grace_period: 1s
+        command: ["/bin/sh", "/start_wp.sh"]
+        networks:
+            default:
+                ipv4_address: 10.10.0.13
+        logging: *default-logging

dockerfile/ocserv.dockerfile

@@ -1,21 +1,22 @@
 ARG image
 FROM $image
-RUN apk add --update openssh iptables \
-    && apk add --no-cache --virtual .build-deps \
-    curl \
-    g++ \
+RUN apk add --update openssh \
+    iptables \
     gnutls-dev \
-    gpgme \
     libev-dev \
-    libnl3-dev \
-    libseccomp-dev \
-    linux-headers \
     linux-pam-dev \
     lz4-dev \
+    libseccomp-dev \
+    && apk add --no-cache --virtual .build-deps \
+    xz \
+    linux-headers \
+    libnl3-dev \
+    g++ \
+    gpgme \
+    curl \
     make \
     readline-dev \
     tar \
-    xz \
     autoconf \
     automake \
     gperf \

dockerfile/php.dockerfile

@@ -4,6 +4,7 @@ RUN apk add --no-cache --update php81 \
     php81-mbstring \
     php81-session \
     php81-phar \
+    php81-zip \
     php81-curl \
     php81-opcache \
     php81-openssl \
@@ -19,9 +20,16 @@ RUN apk add --no-cache --update php81 \
     openssh \
     openssl \
     curl \
+    git \
+    py3-qt5 \
     && wget https://github.com/ameshkov/dnslookup/releases/download/v1.9.1/dnslookup-linux-amd64-v1.9.1.tar.gz \
     && tar -xf dnslookup-linux-amd64-v1.9.1.tar.gz \
     && mv linux-amd64/dnslookup /usr/bin \
     && rm dnslookup-linux-amd64-v1.9.1.tar.gz \
-    && rm -rf /linux-amd64
+    && rm -rf /linux-amd64 \
+    && wget https://github.com/SagerNet/sing-box/releases/download/v1.8.11/sing-box-1.8.11-linux-amd64.tar.gz \
+    && tar -xf sing-box-1.8.11-linux-amd64.tar.gz \
+    && mv sing-box-1.8.11-linux-amd64/sing-box /usr/bin \
+    && rm sing-box-1.8.11-linux-amd64.tar.gz \
+    && rm -rf /sing-box-1.8.11-linux-amd64
 ENV ENV="/root/.ashrc"

dockerfile/shadowsocks.dockerfile

@@ -2,16 +2,16 @@ ARG image
 FROM $image
 RUN apk add openssh git xz \
     && mkdir /root/.ssh \
-    && wget https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.15.3/shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
-    && tar -xf shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
-    && wget https://github.com/teddysun/v2ray-plugin/releases/download/v5.7.0/v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
-    && tar -xf v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
+    && wget -O shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz $(wget -q -O - https://api.github.com/repos/shadowsocks/shadowsocks-rust/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep '.x86_64-unknown-linux-musl.tar.xz$') \
+    && tar -xf shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz \
+    && wget -O v2ray-plugin-linux-amd64.tar.gz $(wget -q -O - https://api.github.com/repos/teddysun/v2ray-plugin/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'v2ray-plugin-linux-amd64') \
+    && tar -xf v2ray-plugin-linux-amd64.tar.gz \
     && mv sslocal /usr/bin/ \
     && mv ssserver /usr/bin/ \
     && mv ssmanager /usr/bin/ \
     && mv ssservice /usr/bin/ \
     && mv ssurl /usr/bin/ \
     && mv v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \
-    && rm v2ray-plugin-linux-amd64-v5.7.0.tar.gz\
-    && rm shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz
+    && rm v2ray-plugin-linux-amd64.tar.gz \
+    && rm shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz
 ENV ENV="/root/.ashrc"

dockerfile/warp.dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:22.04 AS build
+RUN apt update && apt install -y curl gpg lsb-release \
+    && curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list \
+    && apt update && apt install -y cloudflare-warp
+
+FROM alpine:3.17
+ARG GLIBC_VERSION=2.34-r0
+COPY --from=build /usr/bin/warp-cli /usr/bin/warp-svc /usr/local/bin/
+RUN apk add --no-cache dbus-libs wget socat openssh-server jq curl \
+    && mkdir /tmp/glibc-pkgs \
+    && for PKG in glibc-$GLIBC_VERSION.apk glibc-bin-$GLIBC_VERSION.apk; do wget -q --directory-prefix /tmp/glibc-pkgs https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/$PKG; done \
+    && apk add --no-cache --allow-untrusted --force-overwrite /tmp/glibc-pkgs/* \
+    && rm -rf /tmp/glibc-pkgs \
+    && /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib \
+    && mkdir /root/.ssh

dockerfile/wireguard.dockerfile

@@ -1,6 +1,8 @@
 ARG image
 FROM $image
-RUN apk add --no-cache --virtual .build-deps alpine-sdk git go \
+COPY --from=golang:1.22.3-alpine /usr/local/go/ /usr/local/go/
+ENV PATH="/usr/local/go/bin:${PATH}"
+RUN apk add --no-cache --virtual .build-deps alpine-sdk git \
     && apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq bash htop \
     && git clone https://github.com/amnezia-vpn/amneziawg-go \
     && git clone https://github.com/amnezia-vpn/amneziawg-tools.git \

dockerfile/xray.dockerfile

@@ -2,7 +2,7 @@ ARG image
 FROM $image
 RUN apk add openssh openssl jq \
     && mkdir /root/.ssh \
-    && wget https://github.com/XTLS/Xray-core/releases/download/v1.8.3/Xray-linux-64.zip \
+    && wget -O Xray-linux-64.zip $(wget -q -O - https://api.github.com/repos/XTLS/Xray-core/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'Xray-linux-64.zip$') \
     && unzip Xray-linux-64.zip \
     && mv xray /usr/bin/ \
     && rm Xray-linux-64.zip \

makefile

@@ -1,12 +1,16 @@
 b:
 	docker compose build
 u: # запуск контейнеров
-	IP=$(shell ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$$|\1|p' | awk '{print $1}' | head -1) VER=$(shell git describe --tags) docker compose up -d --force-recreate
+	$(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=$(IP) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
 d: # остановка контейнеров
-	docker compose down
+	-kill -9 $(shell cat ./update/update_pid) > /dev/null
+	docker compose down --remove-orphans
 dv: # остановка контейнеров
 	docker compose down -v
-r: cleanf d u cleanf
+r: d u
 ps: # список контейнеров
 	docker compose ps
 l: # логи из контейнеров
@@ -15,6 +19,8 @@ php: # консоль сервиса
 	docker compose exec php /bin/sh
 wg: # консоль сервиса
 	docker compose exec wg /bin/sh
+wg1: # консоль сервиса
+	docker compose exec wg1 /bin/sh
 ss: # консоль сервиса
 	docker compose exec ss /bin/sh
 ng: # консоль сервиса
@@ -25,12 +31,14 @@ up: # консоль сервиса
 	docker compose exec up /bin/sh
 ad: # консоль сервиса
 	docker compose exec ad /bin/sh
+wp: # консоль сервиса
+	docker compose exec wp /bin/sh
 proxy: # консоль сервиса
 	docker compose exec proxy /bin/sh
 tg: # консоль сервиса
 	docker compose exec tg /bin/sh
 xr: # консоль сервиса
-	docker compose exec xr /bin/shec tg /bin/sh
+	docker compose exec xr /bin/sh
 oc: # консоль сервиса
 	docker compose exec oc /bin/sh
 clean:
@@ -42,12 +50,13 @@ cleanf:
 cleanall:
 	docker image prune -a -f
 	docker builder prune -a -f
-p:
-	git stash
-	git pull
-	git stash pop stash@{0}
-update: p r
-cn:
-	docker compose exec ng nginx -t
 push:
 	docker compose push
+s:
+	git status -su
+c:
+	git add config/
+	git checkout .
+	git reset
+webhook:
+	docker compose exec php php checkwebhook.php

readme.md

@@ -6,6 +6,10 @@ telegram bot to manage servers (inside the bot)
 - change secret
 - qr/config
 - change fake domain
+- multiple users
+- subscriptions with routing
+- routing templates per user
+- steal from yourself
 <img src="https://github.com/mercurykd/vpnbot/assets/30900414/39bdf4e0-96a6-4257-b61e-30a14122e236" width="200">
 
 ### NaiveProxy
@@ -62,19 +66,17 @@ telegram bot to manage servers (inside the bot)
 <img src="https://github.com/mercurykd/vpnbot/assets/30900414/431ec09d-9c14-4c74-b8f6-e49c142132e8" width="200">
 
 ---
-environment: ubuntu 18.04/20.04/22.04, debian 11
+environment: ubuntu 18.04/20.04/22.04, debian 11/12
 
-install:
-
-`wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY`
-
----
-
-additional options:
-
-install as service(autoload on start):
+### Install:
 
+```shell
+wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY
 ```
+
+### Install as service (autoload on start):
+
+```shell
 cd /root/vpnbot
 bash scripts/install_as_service.sh
 ```

scripts/check_file.sh

@@ -1,4 +1,4 @@
-if [[ -f "/ssh/key.pub" && -s "/ssh/key.pub" ]]; then
+if [[ -f "/start" && -f "/ssh/key.pub" && -s "/ssh/key.pub" ]]; then
     exit 0;
 else
     exit 1;

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/install_as_service.sh

@@ -1,3 +1,4 @@
-cp scripts/vpnbot.service /etc/systemd/system/vpnbot.service
+path=`pwd`
+sed "s|path|$path|g" "$path/scripts/vpnbot.service" > /etc/systemd/system/vpnbot.service
 systemctl daemon-reload
 systemctl enable vpnbot

scripts/start_ad.sh

@@ -1,4 +1,5 @@
 route add -net 10.0.1.0 netmask 255.255.255.0 gw wg
+route add -net 10.0.3.0 netmask 255.255.255.0 gw wg1
 route add -net 10.0.2.0 netmask 255.255.255.0 gw oc
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A

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 --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_service.sh

@@ -0,0 +1 @@
+php service.php

scripts/start_tg.sh

@@ -4,9 +4,4 @@ ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
 curl -s https://core.telegram.org/getProxySecret -o proxy-secret
 curl -s https://core.telegram.org/getProxyConfig -o proxy-multi.conf
-if [ $(cat /mtprotosecret | wc -c) -gt 0 ]
-then
-    SECRET=$(cat /mtprotosecret)
-    mtproto-proxy -u nobody -H $TGPORT --nat-info 10.10.0.8:$IP -S $SECRET --aes-pwd /proxy-secret /proxy-multi.conf -M 1
-fi
 tail -f /dev/null

scripts/start_wg.sh

@@ -1,33 +1,67 @@
+cat /ssh/key.pub > /root/.ssh/authorized_keys
+ssh-keygen -A
+exec /usr/sbin/sshd -D -e "$@" &
+
 INTERFACE=$(route | grep '^default' | grep -o '[^ ]*$')
-if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
+if [ "$HOSTNAME" = "wireguard1" ]
 then
-    PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
-    echo "[Interface]" > /etc/wireguard/wg0.conf
-    echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
-    echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
-    echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
+    if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
+    then
+        PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
+        echo "[Interface]" > /etc/wireguard/wg0.conf
+        echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
+        echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
+        echo "ListenPort = $WG1PORT" >> /etc/wireguard/wg0.conf
+    else
+        sed "s/ListenPort = [0-9]\+/ListenPort = $WG1PORT/" /etc/wireguard/wg0.conf > change_port
+        cat change_port > /etc/wireguard/wg0.conf
+    fi
 else
-    sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
-    cat change_port > /etc/wireguard/wg0.conf
+    if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
+    then
+        PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
+        echo "[Interface]" > /etc/wireguard/wg0.conf
+        echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
+        echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
+        echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
+    else
+        sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
+        cat change_port > /etc/wireguard/wg0.conf
+    fi
 fi
 iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT
 iptables -t nat -A POSTROUTING -o $INTERFACE -j MASQUERADE
 ln -s /etc/wireguard/wg0.conf /etc/amnezia/amneziawg/wg0.conf
-if [ $(cat /pac.json | jq .amnezia) -eq 1 ]
+if [ "$HOSTNAME" = "wireguard1" ]
 then
-    awg-quick up wg0
+    if [ $(cat /pac.json | jq .wg1_amnezia) -eq 1 ]
+    then
+        awg-quick up wg0
+    else
+        wg-quick up wg0
+    fi
+    if [ $(cat /pac.json | jq .wg1_blocktorrent) -eq 1 ]
+    then
+        sh /block_torrent.sh
+    fi
+    if [ $(cat /pac.json | jq .wg1_exchange) -eq 1 ]
+    then
+        sh /block_exchange.sh
+    fi
 else
-    wg-quick up wg0
-fi
-cat /ssh/key.pub > /root/.ssh/authorized_keys
-ssh-keygen -A
-exec /usr/sbin/sshd -D -e "$@" &
-if [ $(cat /pac.json | jq .blocktorrent) -eq 1 ]
-then
-    sh /block_torrent.sh
-fi
-if [ $(cat /pac.json | jq .exchange) -eq 1 ]
-then
-    sh /block_exchange.sh
+    if [ $(cat /pac.json | jq .amnezia) -eq 1 ]
+    then
+        awg-quick up wg0
+    else
+        wg-quick up wg0
+    fi
+    if [ $(cat /pac.json | jq .blocktorrent) -eq 1 ]
+    then
+        sh /block_torrent.sh
+    fi
+    if [ $(cat /pac.json | jq .exchange) -eq 1 ]
+    then
+        sh /block_exchange.sh
+    fi
 fi
 tail -f /dev/null

scripts/start_wp.sh

@@ -0,0 +1,18 @@
+cat /ssh/key.pub > /root/.ssh/authorized_keys
+ssh-keygen -A
+exec /usr/sbin/sshd -D -e "$@" &
+off=$(cat /config/pac.json | jq -r .warpoff)
+key=$(cat /config/pac.json | jq -r .warp)
+if [ "$off" == 'null' ]
+then
+    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
+socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000

scripts/unblock_exchange.sh

@@ -1 +0,0 @@
-iptables -D FORWARD -i wg0 -o wg0 -j REJECT

scripts/unblock_torrent.sh

@@ -1,12 +0,0 @@
-iptables -D FORWARD -p tcp -m ipp2p --bit -j DROP
-iptables -D FORWARD -p udp -m ipp2p --bit -j DROP
-iptables -D FORWARD -m string --algo bm --string "BitTorrent" -j DROP
-iptables -D FORWARD -m string --algo bm --string "BitTorrent protocol" -j DROP
-iptables -D FORWARD -m string --algo bm --string "peer_id=" -j DROP
-iptables -D FORWARD -m string --algo bm --string ".torrent" -j DROP
-iptables -D FORWARD -m string --algo bm --string "announce.php?passkey=" -j DROP
-iptables -D FORWARD -m string --algo bm --string "torrent" -j DROP
-iptables -D FORWARD -m string --algo bm --string "announce" -j DROP
-iptables -D FORWARD -m string --algo bm --string "info_hash" -j DROP
-iptables -D OUTPUT -p tcp -m ipp2p --bit -j DROP
-iptables -D OUTPUT -p udp -m ipp2p --bit -j DROP

scripts/vpnbot.service

@@ -3,10 +3,14 @@ Description=VPN: Docker Compose Application Service
 Requires=docker.service
 After=docker.service
 [Service]
-WorkingDirectory=/root/vpnbot
-ExecStart=/bin/sh -c "IP=$(ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$|\1|p' | awk '{print $1}' | head -1) docker compose up --build --force-recreate"
-ExecStop=/usr/bin/docker compose down
+Type=oneshot
+RemainAfterExit=yes
+WorkingDirectory=path
+ExecStartPre=/bin/sh -c "touch ./override.env"
+ExecStart=/bin/sh -c "IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate"
+ExecStartPost=/bin/sh -c "bash ./update/update.sh &"
+ExecStop=/bin/sh -c "docker compose down --remove-orphans"
+ExecStopPost=/bin/sh -c "kill -9 $(cat ./update/update_pid) > /dev/null"
 TimeoutStartSec=0
-Restart=on-failure
 [Install]
 WantedBy=multi-user.target

singbox_windows/winsw3.xml

@@ -0,0 +1,17 @@
+<service>
+    <id>singbox</id>
+    <name>singbox</name>
+    <description>singbox</description>
+    <executable>%BASE%\sing-box.exe</executable>
+    <arguments>run -c %BASE%\config.json</arguments>
+    <logmode>rotate</logmode>
+    <onfailure action="restart" delay="10 sec" />
+    <onfailure action="restart" delay="20 sec" />
+    <onfailure action="restart" delay="30 sec" />
+    <onfailure action="none" />
+    <onexit action="restart" />
+    <onexit action="restart" />
+    <onexit action="restart" />
+    <onexit action="none" />
+    <download from="~url~" to="%BASE%\config.json"/>
+</service>

unit.rest

@@ -0,0 +1,6 @@
+@url = http://127.0.0.1:8081
+###
+
+GET {{url}}/status
+###
+GET {{url}}/config

update/update.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+pwd=`pwd`
+> $pwd/update/pipe
+echo "$$" > $pwd/update/update_pid
+
+while true
+do
+    cmd=$(cat $pwd/update/pipe)
+    branch=$(cat $pwd/update/branch 2>/dev/null)
+    if [[ -n "$cmd" ]]
+    then
+        key=$(cat $pwd/update/key)
+        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": "останавливаю бота"/')"
+        docker compose down --remove-orphans
+        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 reset --hard && git clean -fd
+        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 fetch
+        if [[ -n "$branch" ]]
+        then
+            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 checkout -t origin/$branch || git checkout $branch
+        fi
+        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 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
+        exit 0
+    fi
+    sleep 1
+done

version

@@ -1,3 +1,219 @@
+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
+- фикс создания архива windows service singbox 2
+09.10.2024 v1.65
+- фикс создания архива windows service singbox
+06.10.2024 v1.64.1
+- добавление html заглушки через меню
+06.10.2024 v1.64
+- возможность установить свою html-заглушку
+06.10.2024 v1.63
+- приоритет правила block над остальными в стандартном шаблоне sing-box
+30.09.2024 v1.62
+- импорт профиля xray в karing
+30.09.2024 v1.61.1
+- фикс удаления ключа варпа через ноль
+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
+- fix link v2ray
+03.09.2024 v1.46.1
+- fix import
+- fix websocket domain
+03.09.2024 v1.46
+- возможность добавить кастомный поддомен для Letsencrypt
+03.09.2024 v1.45
+- выбор транспорта reality/websocket
+26.08.2024 v1.44
+- qr для xtls
+- фикс действий на элементом списков
+21.08.2024 v1.43
+- singbox:поддержка кастомных outbound для ruleset
+16.08.2024 v1.42.1
+- фикс добавления рулсетов с длинными урл
+16.08.2024 v1.42
+- добавлена возможность сохранять/восстанавливать список доменов/правил маршрутизации
+- изменена ссылка на сингбокс-конфиг для совместимости с клиентом сингбокса (фикс импорта в sing-box)
+- sing-box: добавлена возможность добавлять свои packagename (outbound:proxy)
+- sing-box: добавлена возможность добавлять свои ruleset с указанием outbound и временем обновления
+- sing-box: списки доменов pac/warp/block трансформируются в собственный ruleset и присутствуют в шаблоне origin всегда, даже если они пустые. это дает возможность не ждать перезагрузки конфига клиентом
+09.08.2024 v1.41.1
+- фикс для "удалить все" в списках доменов
+06.08.2024 v1.41
+- возможность очистить РАС лист
+03.08.2024 v1.40
+- возможность менять MTU для Wireguard/Amnezia
+- раздельный qr для AmneziaWG + AmneziaVPN
+18.05.2024 v1.39
+- изменен автобэкап
+04.05.2024 v1.38
+- changelog в сообщении новой версии
+04.05.2024 v1.37.1
+- warp на образе alpine (thx @zmeyzloy)
+- фикс выбора шаблона singbox
+22.04.2024 v1.35
+- очистка старых образов
+19.04.2024 v1.34
+- формирование rule_set из шаблона singbox
+18.04.2024 v1.33
+- вывод статуса warp в меню
+18.04.2024 v1.32
+- фиксы в названии и отображении выбранного шаблона xtls
+18.04.2024 v1.31
+- возможность устанавливать ключ для warp
+16.04.2024 v1.30.1
+- улучшение сообщения об обновлениях
+16.04.2024 v1.30
+- улучшение скрипта обновления
+16.04.2024 v1.29
+- рефакторинг подписок
+- кнопки импорта для различных клиентов
+- шаблоны для v2ray
+15.04.2024 v1.28
+- xtls: список блокировки, список warp
+- улучшение отображения таймера
+14.04.2024 v1.27.1
+- singbox windows: замена winsw на winsw3, + скрипт обновления подписки
+13.04.2024 v1.27
+- архив сингбокса для windows, работает как служба
+12.04.2024 v1.26
+- имя клиента xtls подтягивается по подписке из бота
+11.04.2024 v1.25
+- подпись дефолтного шаблона в разделе пользователя xtls
+11.04.2024 v1.24
+- обновлен раздел PAC, добавлена возможность добавить домены из https://community.antifilter.download/
+11.04.2024 v1.23
+- фикс совместимости старого конфига xray из бэкапа
+11.04.2024 v1.22
+- улучшение гибкости выбора шаблона sing-box
+11.04.2024 v1.21
+- фикс доступности адгвард панели при первом запуске
+10.04.2024 v1.20
+- выбор дефолтного шаблона sing-box
+10.04.2024 v1.19
+- загрузка шаблонов sing-box
+- выбор шаблона sing-box для пользователя
+10.04.2024 v1.18
+- включение/выключение xtls юзеров
+09.04.2024 v1.17
+- редактируемые конфиги v2ray/sing-box
+09.04.2024 v1.16
+- редактируемые конфиги v2ray/sing-box
+09.04.2024 v1.15.4
+- замена domain на domain_suffix
+09.04.2024 v1.15.2
+- фикс подписки v2ray
+09.04.2024 v1.15.2
+- редиректы вместо кнопки-подписки
+- фикс добавления подписки
+09.04.2024 v1.15.1
+- кнопка sing-box
+- фикс пустого списка РАС для sing-box
+09.04.2024 v1.15.1
+- кнопка sing-box
+- фикс пустого списка РАС для sing-box
+08.04.2024 v1.15
+- подписка с маршрутизацией для singbox
+07.04.2024 v1.14
+- раздельные пользователи для XTLS-Reality
+- подписка с маршрутизацией для v2rayN/nginx
+- обновление ядра xray 1.8.10
+- упрощение PAC
+28.03.2024 v1.13
+- кнопка обновления показывает есть ли обновления
+21.03.2024 v1.12
+- доработка скрипта обновления
+20.03.2024 v1.11
+- XTLS-Reality steal from yourself
+18.03.2024 v1.10
+- MTProto Fake-TLS
+17.03.2024 v1.9
+- автоматический технический домен sslip
+13.03.2024 v1.8.10
+- фикс override.env
+10.03.2024 v1.8.9
+- веб морда адгварда "встроена" в телеграм
+- мелкие улучшения меню
+07.03.2024 v1.8.8
+- фикс не работающего wireguard
+07.03.2024 v1.8.7
+- фикс порта амнезии
+- у кого ошибка запуска обновите докер и докер композ
+07.03.2024 v1.8.6
+- фикс синхронизации клиентов амнезии, бот падал после рестарта, клиенты пропадали
+- возможность переназначить порты в override.env, файл не отслеживаемый, обновление не будет его сбрасывать
+- убрал дублирование образа php
+06.03.2024
+- короткие ссылки для амнезии
+- фикс работы openconnect
+- фикс экспорта пользователей openconnect
+- фикс скрипта установки бота как сервиса
+04.03.2024
+- решение "серого айпи" при запуске
+- фикс стартового скрипта второго контейнера wireguard
+03.03.2024 возможность обновления бота по кнопке из самого бота
+- <code>git pull && make r</code>
+02.03.2024 2 сервера wireguard, для возможности один запускать как wireguard а второй как amnezia
+- <code>git pull && make r</code>
+01.03.2024 фикс блокировок торрентов и обмена между пользователями
+- <code>git pull && make r</code>
 01.03.2024 фикс установки домена с длинным названием
 - <code>make update</code>
 29.02.2024 образы теперь будут скачиваться с docker hub