add html fake from settings menu

override html mock
sing-box template: block rule first
2024-10-06 23:19:05 +04:00 · 2024-10-06 21:04:13 +04:00 · 2024-10-06 20:49:24 +04:00 · 2024-09-30 17:13:32 +04:00 · 2024-09-30 09:58:48 +04:00 · 2024-09-29 16:10:16 +04:00
18 changed files with 181 additions and 60 deletions
@@ -19,4 +19,5 @@ mirror/.env
 update/*
 !update/update.sh

-override.env
+override.env
+override.html
@@ -145,6 +145,9 @@ class Bot
            case preg_match('~^/appOutbound$~', $this->input['callback'], $m):
                $this->appOutbound();
                break;
+            case preg_match('~^/offWarp$~', $this->input['callback'], $m):
+                $this->offWarp();
+                break;
            case preg_match('~^/addSubdomain$~', $this->input['callback'], $m):
                $this->addSubdomain();
                break;
@@ -343,6 +346,9 @@ class Bot
            case preg_match('~^/switchTorrent (\d+)$~', $this->input['callback'], $m):
                $this->switchTorrent($m[1]);
                break;
+            case preg_match('~^/switchEndpoint (\d+)$~', $this->input['callback'], $m):
+                $this->switchEndpoint($m[1]);
+                break;
            case preg_match('~^/switchAmnezia (-?\d+)$~', $this->input['callback'], $m):
                $this->switchAmnezia($m[1]);
                break;
@@ -476,8 +482,8 @@ class Bot
            case preg_match('~^/proxy$~', $this->input['callback'], $m):
                $this->proxy();
                break;
-            case preg_match('~^/showpac$~', $this->input['callback'], $m):
-                $this->showpac();
+            case preg_match('~^/addOverrideHtml$~', $this->input['callback'], $m):
+                $this->addOverrideHtml();
                break;
            case preg_match('~^/export$~', $this->input['callback'], $m):
                $this->exportManual();
@@ -803,6 +809,30 @@ class Bot
        ];
    }

+    public function addOverrideHtml()
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} attach html",
+            $this->input['message_id'],
+            reply: 'attach html',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'setOverrideHtml',
+            'args'           => [],
+        ];
+    }
+
+    public function setOverrideHtml()
+    {
+        $r = $this->request('getFile', ['file_id' => $this->input['file_id']]);
+        if (!empty($f = file_get_contents($this->file . $r['result']['file_path']))) {
+            file_put_contents('/app/webapp/override.html', $f);
+        }
+    }
+
    public function restartOcserv($conf)
    {
        file_put_contents('/config/ocserv.conf', $conf);
@@ -1537,6 +1567,14 @@ class Bot
        $this->menu('wg', $page);
    }

+    public function switchEndpoint($page = 0)
+    {
+        $c = $this->getPacConf();
+        $c[$this->getInstanceWG(1) . 'endpoint'] = $c[$this->getInstanceWG(1) . 'endpoint'] ? 0 : 1;
+        $this->setPacConf($c);
+        $this->menu('wg', $page);
+    }
+
    public function iptablesWG()
    {
        $c = $this->getPacConf();
@@ -2675,6 +2713,7 @@ DNS-over-HTTPS with IP:
        $dns     = $c[$this->getInstanceWG(1) . 'dns'];
        $mtu     = $c[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
        $am      = $c[$this->getInstanceWG(1) . 'amnezia'];
+        $end     = $c[$this->getInstanceWG(1) . 'endpoint'];
        $data    = [
            [
                [
@@ -2706,6 +2745,12 @@ DNS-over-HTTPS with IP:
                    'callback_data' => "/defaultMTU $page",
                ],
            ],
+            [
+                [
+                    'text'          => $this->i18n('endpoint') . ': ' . ($end ? $this->ip : $this->getDomain()),
+                    'callback_data' => "/switchEndpoint $page",
+                ],
+            ],
            [
                [
                    'text'          =>  $this->i18n('add peer'),
@@ -4492,33 +4537,67 @@ DNS-over-HTTPS with IP:

    public function addWarpPlus($key)
    {
-        $c         = $this->getPacConf();
-        $c['warp'] = $key;
+        $c = $this->getPacConf();
+        if (!empty($key)) {
+            $c['warp'] = $key;
+            $this->send($this->input['chat'], 'Warp registration license: ' . $this->ssh("warp-cli --accept-tos registration license $key 2>&1", 'wp'));
+        } else {
+            unset($c['warp']);
+        }
        $this->setPacConf($c);
-        $this->send($this->input['chat'], 'Warp registration license: ' . $this->ssh("warp-cli --accept-tos registration license $key", 'wp'));
        sleep(1);
        $this->warp();
    }

    public function warpStatus()
    {
-        $st = $this->ssh('curl -m 1 -x socks5://127.0.0.1:40000 https://cloudflare.com/cdn-cgi/trace', 'wp');
-        preg_match('~warp=(\w+)~', $st, $m);
-        return $m[1];
+        if (!empty($this->ssh('pgrep warp-svc', 'wp'))) {
+            $st = $this->ssh('curl -m 1 -x socks5://127.0.0.1:40000 https://cloudflare.com/cdn-cgi/trace', 'wp');
+            preg_match('~warp=(\w+)~', $st, $m);
+            return $m[1];
+        }
+        return 'off';
+    }
+
+    public function offWarp()
+    {
+        $p = $this->getPacConf();
+        if (empty($p['warpoff'])) {
+            $this->ssh('pkill warp-svc', 'wp');
+            $p['warpoff'] = 1;
+        } else {
+            $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
+            sleep(3);
+            $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
+            if (!empty($p['warp'])) {
+                $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
+            }
+            $this->send($this->input['chat'], 'Proxy mode: ' . $this->ssh('warp-cli --accept-tos mode proxy 2>&1', 'wp'));
+            $this->send($this->input['chat'], 'Connect: ' . $this->ssh('warp-cli --accept-tos connect 2>&1', 'wp'));
+            unset($p['warpoff']);
+        }
+        $this->setPacConf($p);
+        $this->warp();
    }

    public function warp()
    {
+        $p      = $this->getPacConf();
        $text[] = "Menu -> " . $this->i18n('warp');
        $text[] = "status: " . $this->warpStatus();
        $text[] = "key: " . $this->getPacConf()['warp'];
+        $data[] = [
+            [
+                'text'          => $this->i18n($p['warpoff'] ? 'off' : 'on'),
+                'callback_data' => "/offWarp",
+            ],
+        ];
        $data[] = [
            [
                'text'          => $this->i18n('set key'),
                'callback_data' => "/warpPlus",
            ],
        ];
-
        $data[] = [
            [
                'text'          => $this->i18n('back'),
@@ -4602,14 +4681,27 @@ DNS-over-HTTPS with IP:
        $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=si&r=si&s={$c['id']}#{$c['email']}'>sing-box</a>";
        $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=s&r=st&s={$c['id']}#{$c['email']}'>streisand</a>";
        $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=si&r=h&s={$c['id']}#{$c['email']}'>hiddify</a>";
+        $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=si&r=k&s={$c['id']}#{$c['email']}'>karing</a>";
+
+        $si = "$scheme://{$domain}/pac/" . base64_encode(serialize([
+            'h' => $hash,
+            't' => 'si',
+            's' => $c['id'],
+        ]));
+        $xr = "$scheme://{$domain}/pac/" . base64_encode(serialize([
+            'h' => $hash,
+            't' => 's',
+            's' => $c['id'],
+        ]));
+
+        $text[] = "\nxray config: <pre><code>$xr</code></pre>";
+        $text[] = "sing-box config: <pre><code>$si</code></pre>";

-        $text[] = "\nv2ray config: <pre><code>$scheme://{$domain}/pac?h=$hash&t=s&s={$c['id']}</code></pre>";
-        $text[] = "sing-box config: <pre><code>$scheme://{$domain}/pac?h=$hash&t=si&s={$c['id']}</code></pre>";
        $text[] = "sing-box windows: <a href='$scheme://{$domain}/pac?h=$hash&t=si&r=w&s={$c['id']}'>windows service</a>";

        $data[] = [
            [
-                'text'    => 'v2ray',
+                'text'    => 'xray',
                'web_app' => ['url' => "https://{$domain}/pac?h=$hash&t=s&s={$c['id']}"],
            ],
            [
@@ -4771,20 +4863,20 @@ DNS-over-HTTPS with IP:
                case 'v':
                    header("Location: v2rayng://install-config?url=$v2");
                    exit;
+                case 'k':
+                    header("Location: karing://install-config?url=$si");
+                    exit;
                case 'h':
                    header("Location: hiddify://install-config/?url=$si");
                    exit;
                case 'w':
                    $link = htmlspecialchars($si, ENT_XML1, 'UTF-8');
                    file_put_contents('/singbox/winsw3.xml', preg_replace('#~url~#', $link, file_get_contents('/singbox/winsw3.xml')));
-                    $zip = new ZipArchive();
                    $n   = "singbox_$uid.zip";
-                    $zip->open($n, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-                    foreach (scandir('/singbox') as $k => $v) {
-                        if (!empty(!in_array($v, ['.', '..']))) {
-                            $zip->addFile("/singbox/$v", $v);
-                        }
-                    }
+                    copy('/singbox/singbox.zip', $n);
+                    $zip = new ZipArchive();
+                    $zip->open($n, ZipArchive::CREATE);
+                    $zip->addFile('/singbox/winsw3.xml', 'winsw3.xml');
                    $zip->close();
                    header('Content-Disposition: attachment; filename="singbox.zip"');
                    echo file_get_contents($n);
@@ -4993,12 +5085,12 @@ DNS-over-HTTPS with IP:
                    }
                    $ruleset[] = [
                        "tag"             => $r['name'],
-                        "url"             => "$scheme://{$domain}/pac?" . http_build_query([
+                        "url"             => "$scheme://{$domain}/pac/" . base64_encode(serialize([
                            'h' => $hash,
                            't' => 'si',
                            's' => $uid,
                            'r' => $r['name'],
-                        ]),
+                        ])),
                        "update_interval" => $r['interval'],
                        "type"            => "remote",
                        "format"          => "binary",
@@ -5450,6 +5542,12 @@ DNS-over-HTTPS with IP:
                'callback_data' => "/backup",
            ],
        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('fake html'),
+                'callback_data' => "/addOverrideHtml",
+            ],
+        ];
        $data[] = [
            [
                'text'          => $this->i18n('logs'),
@@ -5849,7 +5947,7 @@ DNS-over-HTTPS with IP:
                $conf[] = '';
                $conf[] = $peer['# PublicKey'] ? '# [Peer]' : '[Peer]';
                if (!empty($peer['Endpoint'])) {
-                    $peer['Endpoint'] = $this->getDomain() . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
+                    $peer['Endpoint'] = ($this->getPacConf()[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
                }
                foreach ($peer as $k => $v) {
                    $conf[] = "$k = $v";
@@ -337,4 +337,8 @@ $i = [
        'en' => '🟢 have updates',
        'ru' => '🟢 есть обновления',
    ],
+    'fake html'  => [
+        'en' => 'fake html',
+        'ru' => 'фейк заглушка',
+    ],
 ];
@@ -31,7 +31,7 @@ http {

    location / {
      root /app;
-      index login.html;
+      index override.html login.html;
      try_files $uri $uri/ =404;
    }
    location /adguard/ {
@@ -123,7 +123,7 @@ http {

  #   location / {
  #     root /app;
-  #     index login.html;
+  #     index override.html login.html;
  #     try_files $uri $uri/ =404;
  #   }
  #   location /adguard/ {
@@ -31,7 +31,7 @@ http {

    location / {
      root /app;
-      index login.html;
+      index override.html login.html;
      try_files $uri $uri/ =404;
    }
    location /adguard/ {
@@ -123,7 +123,7 @@ http {

  #   location / {
  #     root /app;
-  #     index login.html;
+  #     index override.html login.html;
  #     try_files $uri $uri/ =404;
  #   }
  #   location /adguard/ {
@@ -110,6 +110,20 @@
                "protocol": "dns",
                "outbound": "dns-out"
            },
+            {
+                "createruleset": [
+                    {
+                        "name": "block",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~block~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "block"
+            },
            {
                "createruleset": [
                    {
@@ -133,20 +147,6 @@
                ],
                "outbound": "proxy"
            },
-            {
-                "createruleset": [
-                    {
-                        "name": "block",
-                        "interval": "15s",
-                        "rules": [
-                            {
-                                "domain_suffix": "~block~"
-                            }
-                        ]
-                    }
-                ],
-                "outbound": "block"
-            },
            {
                "outbound": "direct"
            }
@@ -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
@@ -1,14 +1,18 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-warp-svc > /dev/null &
-sleep 3
-warp-cli --accept-tos registration new
+off=$(cat /config/pac.json | jq -r .warpoff)
 key=$(cat /config/pac.json | jq -r .warp)
-if [ ! -z "$key" ]
+if [ "$off" == 'null' ]
 then
-    warp-cli --accept-tos registration license $key
+    warp-svc > /dev/null &
+    sleep 3
+    warp-cli --accept-tos registration new
+    if [ ! -z "$key" ]
+    then
+        warp-cli --accept-tos registration license $key
+    fi
+    warp-cli --accept-tos mode proxy
+    warp-cli --accept-tos connect
 fi
-warp-cli --accept-tos mode proxy
-warp-cli --accept-tos connect
 socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000
@@ -1,2 +0,0 @@
-winsw3.exe install
-pause
@@ -1,2 +0,0 @@
-winsw3.exe stop
-winsw3.exe start
@@ -1 +0,0 @@
-winsw3.exe start
@@ -1,2 +0,0 @@
-winsw3.exe status
-pause
@@ -1 +0,0 @@
-winsw3.exe stop
@@ -1,2 +0,0 @@
-winsw3.exe uninstall
-pause
@@ -24,7 +24,7 @@ do
        curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "применяю обновления"/')"
        git pull > ./update/message
        curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "запускаю бота"/')"
-        IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose up -d --force-recreate
+        IP=$(curl ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
        bash $pwd/update/update.sh &
        > $pwd/update/key
        > $pwd/update/curl
@@ -1,3 +1,23 @@
+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
Author	SHA1	Message	Date
mercury	39643bf681	add html fake from settings menu	2024-10-06 23:19:05 +04:00
mercury	5f1fc6d912	override html mock	2024-10-06 21:04:13 +04:00
mercury	0538d04397	sing-box template: block rule first	2024-10-06 20:49:24 +04:00
mercury	af9933676d	karing import url	2024-09-30 17:13:32 +04:00
mercury	7bfebe8096	fix unset warp key	2024-09-30 09:58:48 +04:00
mercury	ae61a38dbc	on/off warp-svc	2024-09-29 16:10:16 +04:00
mercury	e727f6552c	create singbox archive improve	2024-09-29 13:48:26 +04:00
mercury	cfd500d48a	update version	2024-09-23 23:44:32 +04:00
mercury	ff87ee1055	latest docker compose	2024-09-23 23:11:02 +04:00
mercury	3375293be5	fix update start	2024-09-22 21:05:48 +04:00
mercury	6e5f198e23	switch endpoint for wg/amnezia	2024-09-22 14:31:10 +04:00