clear pac list button

* added sing-box from repo (#12)

* edge repo for sing-box (#13)

* added sing-box from repo

* add testing repo for sing-box

* Revert "added sing-box from repo (#12)"

This reverts commit 256e43352a.

* Revert "edge repo for sing-box (#13)"

This reverts commit bb1ac60acc.

* Update shadowsocks.dockerfile

---------

Co-authored-by: mercury <mercury.kd@gmail.com>

app/bot.php

@@ -9,6 +9,8 @@ class Bot
     public $limit;
     public $key;
     public $file;
+    public $dns;
+    public $mtu;
 
     public function __construct($key, $i18n)
     {
@@ -22,6 +24,7 @@ class Bot
         $this->i18n     = $i18n;
         $this->language = $this->getPacConf()['language'] ?: 'en';
         $this->dns      = '1.1.1.1, 8.8.8.8';
+        $this->mtu      = 1350;
         $this->limit    = $this->getPacConf()['limitpage'] ?: 5;
         $this->adguard  = '/config/AdGuardHome.yaml';
         $this->update   = '/update/json';
@@ -139,6 +142,12 @@ class Bot
             case preg_match('~^/mtproto$~', $this->input['callback'], $m):
                 $this->mtproto();
                 break;
+            case preg_match('~^/deletePac$~', $this->input['callback'], $m):
+                $this->deletePac();
+                break;
+            case preg_match('~^/deletePacYes$~', $this->input['callback'], $m):
+                $this->deletePacYes();
+                break;
             case preg_match('~^/addCommunityFilter$~', $this->input['callback'], $m):
                 $this->addCommunityFilter();
                 break;
@@ -184,6 +193,9 @@ class Bot
             case preg_match('~^/defaultDNS (?P<arg>\d+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
                 $this->defaultDNS(...explode('_', $m['arg']));
                 break;
+            case preg_match('~^/defaultMTU (?P<arg>\d+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
+                $this->defaultMTU(...explode('_', $m['arg']));
+                break;
             case preg_match('~^/subnet (?P<arg>-?\d+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
                 $this->subnet(...explode('_', $m['arg']));
                 break;
@@ -199,6 +211,9 @@ class Bot
             case preg_match('~^/changeAllowedIps (?P<arg>\d+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
                 $this->changeAllowedIps(...explode('_', $m['arg']));
                 break;
+            case preg_match('~^/changeMTU (?P<arg>\d+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
+                $this->changeMTU(...explode('_', $m['arg']));
+                break;
             case preg_match('~^/calc$~', $this->input['callback'], $m):
                 $this->calc();
                 break;
@@ -948,22 +963,16 @@ class Bot
 
     public function checkBackup()
     {
-        $c    = time();
-        $conf = $this->getPacConf();
-        $time = $conf['backup'];
-        if ($time) {
-            preg_match('~(\d+\s\w+)(?:\s+)?/(?:\s+)?(\d{2}:\d{2})~', $time, $m);
-            $period = strtotime($m[1]) - $c;
-            $start  = strtotime($m[2]);
-            $last   = $conf['pinbackup'];
-            if ($last) {
-                [$pin, $time] = explode('/', $last);
-                if ($c - $time >= $period) {
-                    $this->pinAdmin($pin, 1);
-                    $this->pinBackup();
-                    return;
+        $c   = $this->getPacConf();
+        $now = strtotime(date('Y-m-d H:i'));
+        if (!empty($c['backup'])) {
+            [$start, $period] = explode('/', $c['backup']);
+            $start  = strtotime($start);
+            $period = strtotime($period, 0);
+            if ($now - $start >= $period && ($now - $start) % $period == 0) {
+                if (!empty($c['pinbackup'])) {
+                    $this->pinAdmin($c['pinbackup'], 1);
                 }
-            } elseif ($c - $start > 0 && $c - $start < 30) {
                 $this->pinBackup();
             }
         }
@@ -984,10 +993,10 @@ class Bot
         require __DIR__ . '/config.php';
         $conf              = $this->getPacConf();
         $bot               = $this->request('getMyName', [])['result']['name'];
-        $pin               = $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $this->export(), $c['admin'][0])['result']['message_id'];
-        $conf['pinbackup'] = "$pin/" . time();
+        $conf['pinbackup'] = $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $this->export(), $c['admin'][0])['result']['message_id'];
+        $conf['backup']    = implode(' / ', [date('Y-m-d H:i'), trim(explode('/', $conf['backup'])[1])]);
         $this->setPacConf($conf);
-        $this->pinAdmin($pin);
+        $this->pinAdmin($conf['pinbackup']);
     }
 
     public function checkVersion()
@@ -1005,7 +1014,14 @@ class Bot
                     $diff       = array_slice($diff, 0, 10);
                     if (!empty($diff)) {
                         foreach ($c['admin'] as $k => $v) {
-                            $this->send($v, implode("\n", $diff));
+                            $this->send($v, implode("\n", $diff), 0, [
+                                [
+                                    [
+                                        'text' => 'changelog',
+                                        'web_app' => ['url' => "https://raw.githubusercontent.com/mercurykd/vpnbot/$b/version"],
+                                    ]
+                                ]
+                            ]);
                         }
                     }
                 }
@@ -1472,26 +1488,30 @@ class Bot
         $this->menu('config');
     }
 
-    public function qrPeer($client)
+    public function sendQr($name, $code, $title = false)
     {
-        $cl      = $client;
-        $client  = $this->readClients()[$client];
-        $name    = $this->getName($client['interface']);
-        if ($this->getWGType() == 'awg') {
-            $sl     = $this->getAmneziaShortLink($client);
-            $code   = preg_replace('/^vpn:\/\//', '', $sl);
-        } else {
-            $code   = $this->createConfig($client);
-        }
         $qr      = preg_replace(['~\s+~', '~\(~', '~\)~'], ['_'], $name);
         $qr_file = __DIR__ . "/qr/$qr.png";
         exec("qrencode -t png -o $qr_file '$code'");
         $r = $this->sendPhoto(
             $this->input['chat'],
             curl_file_create($qr_file),
-            ($this->getWGType() == 'awg') ? "$name for AmneziaVPN" : $name
+            $title ?: $name
         );
         unlink($qr_file);
+    }
+
+    public function qrPeer($client)
+    {
+        $cl      = $client;
+        $client  = $this->readClients()[$client];
+        $name    = $this->getName($client['interface']);
+        if ($this->getWGType() == 'awg') {
+            $this->sendQr($name, preg_replace('/^vpn:\/\//', '', $this->getAmneziaShortLink($client)), "$name for AmneziaVPN");
+            $this->sendQr($name, $this->createConfig($client), "$name for AmneziaWG");
+        } else {
+            $this->sendQr($name, $this->createConfig($client), "$name for Wireguard");
+        }
         if ($this->getPacConf()['blinkmenu']) {
             $this->delete($this->input['chat'], $this->input['message_id']);
             $this->input['message_id'] = $this->send($this->input['chat'], '.')['result']['message_id'];
@@ -2436,6 +2456,7 @@ DNS-over-HTTPS with IP:
         $bt      = $c[$this->getInstanceWG(1) . 'blocktorrent'];
         $ex      = $c[$this->getInstanceWG(1) . 'exchange'];
         $dns     = $c[$this->getInstanceWG(1) . 'dns'];
+        $mtu     = $c[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
         $am      = $c[$this->getInstanceWG(1) . 'amnezia'];
         $data    = [
             [
@@ -2463,6 +2484,10 @@ DNS-over-HTTPS with IP:
                     'text'          =>  $this->i18n('defaultDNS') . ': ' . ($dns ?: $this->dns),
                     'callback_data' => "/defaultDNS $page",
                 ],
+                [
+                    'text'          =>  $this->i18n('defaultMTU') . ': ' . $mtu,
+                    'callback_data' => "/defaultMTU $page",
+                ],
             ],
             [
                 [
@@ -2550,6 +2575,38 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function defaultMTU($page = 0)
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter MTU",
+            $this->input['message_id'],
+            reply: 'enter MTU',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'setMTU',
+            'args'           => [$page],
+        ];
+    }
+
+    public function changeMTU($client, $page = 0)
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter MTU",
+            $this->input['message_id'],
+            reply: 'enter MTU',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'changeClientMTU',
+            'args'           => [$client, $page],
+        ];
+    }
+
     public function setDNS($text, $page = 0)
     {
         $c = $this->getPacConf();
@@ -2562,6 +2619,30 @@ DNS-over-HTTPS with IP:
         $this->menu('wg', $page);
     }
 
+    public function setMTU($text, $page = 0)
+    {
+        $c = $this->getPacConf();
+        if ($text) {
+            $c[$this->getInstanceWG(1) . 'mtu'] = $text;
+        } else {
+            unset($c[$this->getInstanceWG(1) . 'mtu']);
+        }
+        $this->setPacConf($c);
+        $this->menu('wg', $page);
+    }
+
+    public function changeClientMTU($text, $client, $page = 0)
+    {
+        $clients = $this->readClients();
+        if (!empty((int) $text)) {
+            $clients[$client]['interface']['MTU'] = $text;
+        } else {
+            unset($clients[$client]['interface']['MTU']);
+        }
+        $this->saveClients($clients);
+        $this->menu('client', "{$client}_$page");
+    }
+
     public function subnetAdd($wgpage, $page)
     {
         $r = $this->send(
@@ -2880,6 +2961,12 @@ DNS-over-HTTPS with IP:
                             'callback_data' => "/changeAllowedIps {$client}_$page",
                         ],
                     ],
+                    [
+                        [
+                            'text'          => $this->i18n('MTU') . " " . ($clients[$client]['interface']['MTU'] ?: $this->getPacConf()[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu),
+                            'callback_data' => "/changeMTU {$client}_$page",
+                        ],
+                    ],
                     [
                         [
                             'text'          => $this->i18n('delete'),
@@ -3058,6 +3145,40 @@ DNS-over-HTTPS with IP:
         );
     }
 
+    public function deletePacYes()
+    {
+        $c = $this->getPacConf();
+        unset($c['includelist']);
+        $this->setPacConf($c);
+        $this->pacUpdate();
+        $this->menu('pac');
+    }
+
+    public function deletePac($page = 0)
+    {
+        $text   = <<<text
+                Menu -> PAC -> delete all
+                text;
+        $data[] = [
+            [
+                'text'          => $this->i18n('yes'),
+                'callback_data' => "/deletePacYes",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/pacMenu 0",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            $text,
+            $data ?: false,
+        );
+    }
+
     public function xtlsblock($page = 0)
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> block list';
@@ -3135,6 +3256,12 @@ DNS-over-HTTPS with IP:
                     ]
                 ];
             }
+            $data[] = [
+                [
+                    'text'          => $this->i18n('delete all'),
+                    'callback_data' => "/deletePac",
+                ],
+            ];
         }
         return $data;
     }
@@ -3514,12 +3641,13 @@ DNS-over-HTTPS with IP:
         preg_match('~^camouflage_secret[^\n]+?"([^"]+)*"~sm', $ocserv, $m);
         $cs = $m[1];
         preg_match('~^dns = ([^\n]+)~sm', $ocserv, $m);
-        $dns = $m[1];
+        $dns    = $m[1];
+        $pass   = htmlspecialchars($pac['ocserv']);
         $text[] = "Menu -> OpenConnect";
         if (!empty($m[1])) {
             $text[] = "<code>https://oc.{$pac['domain']}/?$cs</code>";
         }
-        $text[] = "password: <span class='tg-spoiler'>{$pac['ocserv']}</span>";
+        $text[] = "password: <span class='tg-spoiler'>$pass</span>";
         $data[] = [
             [
                 'text'          => $this->i18n('change secret'),
@@ -4700,15 +4828,21 @@ DNS-over-HTTPS with IP:
                 'text'          => $this->i18n('export'),
                 'callback_data' => "/export",
             ],
-            [
-                'text'          => $this->i18n('backup') . ': ' . (implode(' / ', explode('/', $conf['backup'])) ?: $this->i18n('off')),
-                'callback_data' => "/backup",
-            ],
             [
                 'text'          => $this->i18n('import'),
                 'callback_data' => "/import",
             ],
         ];
+        $backup = array_filter(explode('/', $conf['backup']));
+        if (!empty($backup)) {
+            $backup = "{$backup[0]} start / {$backup[1]} period";
+        }
+        $data[] = [
+            [
+                'text'          => $this->i18n('backup') . ': ' . ($backup ?: $this->i18n('off')),
+                'callback_data' => "/backup",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('logs'),
@@ -4844,9 +4978,9 @@ DNS-over-HTTPS with IP:
     {
         $r = $this->send(
             $this->input['chat'],
-            "@{$this->input['username']} enter like 1 day/00:00",
+            "@{$this->input['username']} enter like start / period",
             $this->input['message_id'],
-            reply: 'enter like 1 day/00:00',
+            reply: 'enter like now / 12:00',
         );
         $_SESSION['reply'][$r['result']['message_id']] = [
             'start_message'  => $this->input['message_id'],
@@ -4911,16 +5045,15 @@ DNS-over-HTTPS with IP:
     public function setBackup($text)
     {
         $text = trim($text);
-        $c = $this->getPacConf();
+        $c    = $this->getPacConf();
         if (empty($text)) {
             $c['backup'] = '';
-        } elseif (preg_match('~(\d+\s\w+)(?:\s+)?/(?:\s+)?(\d{2}:\d{2})~', $text, $m)) {
-            $period = $m[1];
-            $start  = $m[2];
-            $c['backup'] = $text;
+        } else {
+            [$start, $period] = explode('/', $text);
+            $c['backup'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
         }
-        if ($pin = explode('/', $c['pinbackup'])[0]) {
-            $this->pinAdmin($pin, 1);
+        if ($c['pinbackup']) {
+            $this->pinAdmin($c['pinbackup'], 1);
             $c['pinbackup'] = '';
         }
         $this->setPacConf($c);
@@ -5040,6 +5173,9 @@ DNS-over-HTTPS with IP:
             if (empty($data['interface']['DNS'])) {
                 $data['interface']['DNS'] = $this->getPacConf()[$this->getInstanceWG(1) . 'dns'] ?: $this->dns;
             }
+            if (empty($data['interface']['MTU'])) {
+                $data['interface']['MTU'] = $this->getPacConf()[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
+            }
         }
         foreach ($data['interface'] as $k => $v) {
             $conf[] = "$k = $v";
@@ -5129,7 +5265,6 @@ DNS-over-HTTPS with IP:
                     '## name'    => $name,
                     'PrivateKey' => $private_peer_key,
                     'Address'    => "$client_ip/32",
-                    'MTU'        => 1350,
                 ],
                 $this->getPacConf()[$this->getInstanceWG(1) . 'amnezia'] ? $this->amneziaKeys() : []
             ),

app/i18n.php

@@ -241,6 +241,10 @@ $i = [
         'en' => 'defaultDNS',
         'ru' => 'дефолтный днс',
     ],
+    'defaultMTU'  => [
+        'en' => 'defaultMTU',
+        'ru' => 'дефолтный MTU',
+    ],
     'debug'  => [
         'en' => 'debug mode',
         'ru' => 'режим отладки',

docker-compose.yml

@@ -191,7 +191,7 @@ services:
             - oc
             - np
     proxy:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
             args:
@@ -338,7 +338,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:
@@ -399,7 +399,7 @@ services:
                 ipv4_address: 10.10.0.8
         logging: *default-logging
     xr:
-        image: mercurykd/vpnbot-xr:1.2
+        image: mercurykd/vpnbot-xr:1.3
         build:
             dockerfile: dockerfile/xray.dockerfile
             args:

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/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.10/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 \

version

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