fix checkcert notify

update version
fix ipinfo case
2024-09-10 15:48:55 +04:00 · 2024-09-10 15:30:59 +04:00 · 2024-09-10 15:27:34 +04:00 · 2024-09-08 21:22:38 +04:00 · 2024-09-08 19:45:02 +04:00 · 2024-09-08 16:22:17 +04:00
36 changed files with 965 additions and 172 deletions
@@ -2,8 +2,8 @@

 $i = [
    'warp'             => [
-        'en' => 'Warp',
-        'ru' => 'Warp',
+        'en' => 'warp',
+        'ru' => 'warp',
    ],
    'wg_title'             => [
        'en' => 'Wireguard',
@@ -241,6 +241,10 @@ $i = [
        'en' => 'defaultDNS',
        'ru' => 'дефолтный днс',
    ],
+    'defaultMTU'  => [
+        'en' => 'defaultMTU',
+        'ru' => 'дефолтный MTU',
+    ],
    'debug'  => [
        'en' => 'debug mode',
        'ru' => 'режим отладки',
@@ -258,8 +262,8 @@ $i = [
        'ru' => 'очистить',
    ],
    'xray'  => [
-        'en' => 'XTLS-Reality',
-        'ru' => 'XTLS-Reality',
+        'en' => 'Xray',
+        'ru' => 'Xray',
    ],
    'geodb'  => [
        'en' => 'GeoIp/GeoSite',
@@ -17,10 +17,13 @@ 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)) {
    require __DIR__ . '/bot.php';
    require __DIR__ . '/i18n.php';
@@ -89,11 +89,14 @@ 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);
-    $domains = $include;
+    if (!empty($conf['includelist'])) {
+        $domains = array_filter($conf['includelist'], fn($x) => $x == true);
+    }
    if (empty($domains)) {
        $text = "Empty domains. Delete pac files";
        unlink(__DIR__ . '/zapretlists/mpac');
@@ -146,10 +149,13 @@ function start()
        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";
        unlink(__DIR__ . '/zapretlists/rmpac');
        unlink(__DIR__ . '/zapretlists/rpac');
@@ -197,6 +203,7 @@ function start()
        file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
        $text .= 'Create minified reverse pac 100%';
    }
+
    endScript($text);
 }

@@ -242,7 +249,6 @@ $load = [
    '-',
    '\\',
 ];
-
 switch ($_SERVER['argv'][1]) {
    case 'start':
        $bot                       = new Bot($c['key'], $i);
@@ -64,6 +64,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;
+    }
    location ~\.well-known {
      access_log /logs/nginx_certbot_access;
      root /certs/;
@@ -124,6 +135,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
@@ -64,6 +64,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;
+    }
    location ~\.well-known {
      access_log /logs/nginx_certbot_access;
      root /certs/;
@@ -124,6 +135,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
@@ -113,16 +113,42 @@
            {
                "createruleset": [
                    {
-                        "name": "selfpac",
+                        "name": "pac",
                        "interval": "15s",
                        "rules": [
                            {
                                "domain_suffix": "~pac~"
                            }
                        ]
+                    },
+                    {
+                        "name": "warp",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~warp~"
+                            }
+                        ]
                    }
                ],
                "outbound": "proxy"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "block",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~block~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "block"
+            },
+            {
+                "outbound": "direct"
            }
        ],
        "final": "direct"
@@ -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:
@@ -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"
@@ -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 \
@@ -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 \
@@ -3,7 +3,7 @@ b:
 u: # запуск контейнеров
 	bash ./update/update.sh &
 	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
+	IP=$(shell curl 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
@@ -1,3 +1,46 @@
+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
Author	SHA1	Message	Date
mercury	e172868f39	fix checkcert notify	2024-09-10 15:48:55 +04:00
mercury	4ef38775b0	update version	2024-09-10 15:30:59 +04:00
mercury	abdb4d791a	fix ipinfo case	2024-09-10 15:27:34 +04:00
mercury	6948239144	xray subscriptions: get['cdn'] -> domain without dns	2024-09-08 21:22:38 +04:00
mercury	ff0fd177c7	xray subscriptions: get['cdn'] -> domain	2024-09-08 19:45:02 +04:00
mercury	28e66d46fd	fix import with transport	2024-09-08 16:22:17 +04:00
mercury	edee9c78c5	fix add user xray with transport	2024-09-08 14:54:43 +04:00
mercury	6ad8b3aa92	update version	2024-09-08 12:50:21 +04:00
mercury	31f1825d37	fix change transport	2024-09-08 12:40:51 +04:00
mercury	10d84da53e	fix websocket -> reality	2024-09-08 00:58:37 +04:00
mercury	c7cc0f31ad	fix v2ray links	2024-09-03 19:23:38 +04:00
mercury	e3ddb642d7	fix import, fix ws transport	2024-09-03 18:27:26 +04:00
mercury	589823e45d	custom subdomain	2024-09-03 13:15:34 +04:00
mercury	0364188fe8	chat link	2024-09-03 10:48:15 +04:00
mercury	72edcc4757	websocket transport for xray	2024-09-03 10:19:00 +04:00
mercury	5988c4fcee	display warp+ key	2024-08-27 13:46:08 +04:00
mercury	a82147eeda	update version	2024-08-26 23:23:09 +04:00
mercury	6bd21d06c0	fix list actions	2024-08-26 23:19:31 +04:00
mercury	3416cda826	qr for singbox	2024-08-25 23:30:19 +04:00
mercury	2e40daf0c4	update version	2024-08-21 23:04:58 +04:00
mercury	9c40b04392	custom outbound for ruleset	2024-08-18 20:01:53 +04:00
mercury	1217ea7a09	fix empty packagelist	2024-08-18 11:54:12 +04:00
mercury	7f6d462f22	fix name for short link vless	2024-08-18 02:11:05 +04:00
mercury	47876ecdb4	rule package_name separately	2024-08-18 02:00:09 +04:00
mercury	66f03709fc	Merge branch 'master' into dev	2024-08-16 22:27:14 +04:00
mercury	42aafc6427	update version	2024-08-16 22:26:42 +04:00
mercury	1674f6929e	fix ruleset list key	2024-08-16 22:24:23 +04:00
mercury	5791cabfb5	update version	2024-08-16 12:12:07 +04:00
mercury	49d2d21f41	fix changelist	2024-08-16 11:41:42 +04:00
mercury	5263de514e	fix naming ruleset	2024-08-16 11:24:51 +04:00
mercury	9da810ba3d	fix empty rules route	2024-08-16 02:21:29 +04:00
mercury	b663eca445	routes for sinbox	2024-08-16 02:08:44 +04:00
mercury	f8f95e22ac	backup for domain lists	2024-08-15 10:40:20 +04:00
mercury	30f0f8c5f0	fix selfpac update	2024-08-15 01:07:31 +04:00
mercury	741f402ca1	fix singbox import	2024-08-15 00:13:41 +04:00
mercury	ef3d40c098	update version	2024-08-09 23:59:48 +04:00
mercury	ded85fb79f	fix "delete all"	2024-08-09 23:56:57 +04:00
mercury	b5ca5fbf93	mirror	2024-08-08 17:11:26 +04:00
mercury	570420274e	improve updatepac	2024-08-08 12:45:44 +04:00
mercury	baaf0e2d01	clear pac list button	2024-08-06 21:58:08 +04:00
mercury	be8bec6a7d	fix ocserv pass	2024-08-04 11:51:01 +04:00
mercury	acaec83877	update version	2024-08-03 11:19:00 +04:00
mercury	8cf6c512cb	extended qr for wireguard	2024-08-03 11:14:53 +04:00
mercury	880a8de7e5	set mtu for wg	2024-08-03 10:39:15 +04:00
mercury	9662fc9d55	fix autobackup hint	2024-07-07 15:35:43 +04:00
mercury	561bcb7023	Merge branch 'dev'	2024-06-05 10:37:39 +04:00
mercury	9d7c735f79	Merge branch 'dev' of github.com:mercurykd/vpnbot into dev	2024-06-05 10:36:42 +04:00
mercury	8091eb4971	fix go version	2024-06-05 10:35:15 +04:00
mercury	967353bcd6	Merge branch 'dev'	2024-05-22 17:21:07 +04:00
mercury	9f218c9f32	chmod +x *.sh	2024-05-22 17:19:32 +04:00
mercury	6a6bd3a4d2	delete debug	2024-05-19 21:26:56 +04:00
mercury	bc8b0ff033	Merge branch 'dev'	2024-05-18 17:05:44 +04:00
mercury	624713347a	change autobackup	2024-05-18 17:00:04 +04:00
mercury	52738c0491	update version xray, shadowsocks	2024-05-17 12:56:56 +04:00
runalsh	277b00da87	Remove absolute versions for shadowsocks.dockerfile (#15 ) * 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>	2024-05-17 12:47:28 +04:00
runalsh	455b9cea07	Remove absolute versions for xray.dockerfile (#16 ) * 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 xray.dockerfile --------- Co-authored-by: mercury <mercury.kd@gmail.com>	2024-05-17 12:46:57 +04:00
mercury	6017bc4008	Merge branch 'dev'	2024-05-04 13:00:53 +04:00
mercury	0c3a6cc90e	Merge branch 'dev'	2024-05-01 18:42:24 +04:00
mercury	c0750c930a	Merge branch 'dev'	2024-05-01 17:53:13 +04:00
mercury	45e1455d48	Revert "edge repo for sing-box (#13 )" This reverts commit `bb1ac60acc`.	2024-04-29 23:13:47 +04:00
mercury	7582dc50c2	Revert "added sing-box from repo (#12 )" This reverts commit `256e43352a`.	2024-04-29 23:13:27 +04:00
runalsh	bb1ac60acc	edge repo for sing-box (#13 ) * added sing-box from repo * add testing repo for sing-box	2024-04-29 20:48:25 +04:00
runalsh	256e43352a	added sing-box from repo (#12 )	2024-04-29 16:06:52 +04:00