update version

.env

@@ -8,3 +8,4 @@ TGPORT=4443
 IMAGE=alpine:3.18.2
 IP=
 VER=
+ENV=/root/.ashrc

.gitignore

@@ -18,3 +18,5 @@
 mirror/.env
 update/*
 !update/update.sh
+
+override.env

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/i18n.php

@@ -166,12 +166,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',
@@ -243,7 +243,7 @@ $i = [
     ],
     'backup'  => [
         'en' => 'auto backup',
-        'ru' => 'бэкап',
+        'ru' => 'автобэкап',
     ],
     'logs'  => [
         'en' => 'logs',
@@ -263,7 +263,11 @@ $i = [
     ],
     'changeFakeDomain'  => [
         'en' => 'changeFakeDomain',
-        'ru' => 'установить фейковый домен',
+        'ru' => 'фейковый домен',
+    ],
+    'selfFakeDomain'  => [
+        'en' => 'steal from yourself',
+        'ru' => 'steal from yourself',
     ],
     'page'  => [
         'en' => 'pagination',
@@ -305,4 +309,24 @@ $i = [
         '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' => '🟢 есть обновления',
+    ],
 ];

app/index.php

@@ -22,24 +22,71 @@ $address = $_GET['a'] ?: '127.0.0.1';
 $port = $_GET['p'] ?: '1080';
 $hash = $_GET['h'];
 if ($hash == substr(md5($c['key']), 0, 8)) {
-    if ($type == 'mirror') {
+    switch ($type) {
+        case 'mirror':
+            require __DIR__ . '/bot.php';
+            require __DIR__ . '/i18n.php';
+            $bot = new Bot($c['key'], $i);
+            $bot->getMirror();
+            break;
+
+        case 's':
+            require __DIR__ . '/bot.php';
+            require __DIR__ . '/i18n.php';
+            $bot = new Bot($c['key'], $i);
+            $bot->v2raySubscription($_GET['s']);
+            exit;
+
+        case 'si':
+            require __DIR__ . '/bot.php';
+            require __DIR__ . '/i18n.php';
+            $bot = new Bot($c['key'], $i);
+            if (!empty($_GET['b'])) {
+                    $fs  = $bot->singboxSubscription($_GET['s'], 1);
+                    $r   = <<<HTML
+                        <div style='width:100%;height:100%;text-align:center;'>
+                            <a style='padding: 20px; border: 1px outset buttonborder; border-radius: 3px; color: buttontext; background-color: buttonface; text-decoration: none; height: 30px; display: inline-block; width: 50%; line-height: 30px;' href='$fs' target='_blank'>sing-box</a>
+                        </div>
+                        HTML;
+            } else {
+                header('Content-Type: application/json');
+                $r = $bot->singboxSubscription($_GET['s']);
+            }
+            echo $r;
+            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

@@ -8,6 +8,7 @@ require __DIR__ . '/config.php';
 require __DIR__ . '/i18n.php';
 
 $bot = new Bot($c['key'], $i);
-$bot->setwebhook();
+$bot->adguardProtect();
 $bot->setcommands();
 $bot->syncPortClients();
+$bot->setwebhook();

app/service.php

@@ -35,4 +35,5 @@ if (!empty($c['admin'])) {
 }
 file_put_contents('/update/message', '');
 file_put_contents('/update/reload_message', '');
-$bot->menu();
+$bot->restartTG();
+$bot->sslip();

app/updatepac.php

@@ -218,8 +218,19 @@ 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";
     }
@@ -227,7 +238,7 @@ function start()
     // create reverse PAC
     $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,8 +269,19 @@ 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%';
     }

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/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 login.html;
+      try_files $uri $uri/ =404;
     }
     location /adguard/ {
       access_log /logs/nginx_adguard_access;
@@ -38,6 +40,12 @@ 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_pass http://php;
@@ -67,11 +75,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 +89,9 @@ http {
   #   access_log /logs/nginx_domain_access;
 
   #   location / {
-  #     return 444;
+  #     root /app;
+  #     index login.html;
+  #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
   #     access_log /logs/nginx_adguard_access;
@@ -88,6 +99,12 @@ 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_pass http://php;

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 login.html;
+      try_files $uri $uri/ =404;
     }
     location /adguard/ {
       access_log /logs/nginx_adguard_access;
@@ -38,6 +40,12 @@ 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_pass http://php;
@@ -67,11 +75,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 +89,9 @@ http {
   #   access_log /logs/nginx_domain_access;
 
   #   location / {
-  #     return 444;
+  #     root /app;
+  #     index login.html;
+  #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
   #     access_log /logs/nginx_adguard_access;
@@ -88,6 +99,12 @@ 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_pass http://php;

docker-compose.yml

@@ -12,6 +12,10 @@ networks:
         ipam:
             config:
                 - subnet: 10.10.0.0/24
+    xray:
+        ipam:
+            config:
+                - subnet: 10.10.1.0/24
 volumes:
     adguard:
 
@@ -41,8 +45,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 +73,7 @@ services:
             - ./ssh:/ssh
             - ./config/sshd_config:/etc/ssh/sshd_config
             - ./logs/:/logs/
+            - ./app/webapp:/app
         ports:
             - 80:80
         hostname: nginx
@@ -73,21 +81,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.3
         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
@@ -102,16 +116,15 @@ services:
             - ./mirror:/mirror
             - ./.env:/mirror/.env
             - ./update:/update
+            - ./.git:/.git
         environment:
-            TZ: ${TZ}
             IP: ${IP}
-            ADDRESS: ${WGADDRESS}
-            WGPORT: ${WGPORT}
-            WG1ADDRESS: ${WG1ADDRESS}
-            WG1PORT: ${WG1PORT}
-            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
@@ -130,7 +143,7 @@ services:
             timeout: 5s
             retries: 5
     service:
-        image: mercurykd/vpnbot-php:1.1
+        image: mercurykd/vpnbot-php:1.2
         build:
             dockerfile: dockerfile/php.dockerfile
             args:
@@ -146,15 +159,13 @@ services:
             - ./update:/update
             - ./scripts/start_service.sh:/start_service.sh
         environment:
-            TZ: ${TZ}
             IP: ${IP}
-            ADDRESS: ${WGADDRESS}
-            WGPORT: ${WGPORT}
-            WG1ADDRESS: ${WG1ADDRESS}
-            WG1PORT: ${WG1PORT}
-            SSPORT: ${SSPORT}
-            TGPORT: ${TGPORT}
             VER: ${VER}
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         hostname: service
         container_name: service-${VER}
         # restart: unless-stopped
@@ -200,7 +211,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
@@ -227,11 +242,13 @@ 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}
-            ENV: /root/.ashrc
         cap_add:
             - NET_ADMIN
         devices:
@@ -265,11 +282,13 @@ services:
                 condition: service_healthy
         ports:
             - ${WG1PORT}:${WG1PORT}/udp
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         environment:
-            TZ: ${TZ}
-            WGPORT: ${WG1PORT}
             ADDRESS: ${WG1ADDRESS}
-            ENV: /root/.ashrc
         cap_add:
             - NET_ADMIN
         devices:
@@ -304,8 +323,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:
@@ -334,9 +356,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:
@@ -361,9 +385,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:
@@ -371,7 +398,7 @@ services:
                 ipv4_address: 10.10.0.8
         logging: *default-logging
     xr:
-        image: mercurykd/vpnbot-xr:1.1
+        image: mercurykd/vpnbot-xr:1.2
         build:
             dockerfile: dockerfile/xray.dockerfile
             args:
@@ -387,16 +414,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:
@@ -413,9 +445,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:
@@ -444,9 +478,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:

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

@@ -19,6 +19,8 @@ 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 \

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 https://github.com/XTLS/Xray-core/releases/download/v1.8.10/Xray-linux-64.zip \
     && unzip Xray-linux-64.zip \
     && mv xray /usr/bin/ \
     && rm Xray-linux-64.zip \

makefile

@@ -2,7 +2,8 @@ b:
 	docker compose build
 u: # запуск контейнеров
 	bash ./update/update.sh &
-	IP=$(shell curl https://ipinfo.io/ip) VER=$(shell git describe --tags) docker compose up -d --force-recreate
+	touch ./override.env
+	IP=$(shell curl https://ipinfo.io/ip) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
 d: # остановка контейнеров
 	-kill -9 $(shell cat ./update/update_pid) > /dev/null
 	docker compose down --remove-orphans
@@ -55,4 +56,6 @@ s:
 c:
 	git add config/
 	git checkout .
-	git reset
+	git reset
+webhook:
+	docker compose exec php php checkwebhook.php

readme.md

@@ -62,19 +62,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/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_php.sh

@@ -6,4 +6,4 @@ 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
+unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error

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

@@ -3,16 +3,31 @@ 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

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

unit.rest

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

update/update.sh

@@ -6,10 +6,16 @@ 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
         docker compose down --remove-orphans
-        git reset --hard
+        git reset --hard && git clean -fd
+        git fetch
+        if [[ -n "$branch" ]]
+        then
+            git checkout -t origin/$branch || git checkout $branch
+        fi
         git pull > ./update/message
         IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose up -d --force-recreate
         bash $pwd/update/update.sh &

version

@@ -1,3 +1,45 @@
+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