fix service for systemd

fix short link type
update version
2024-03-06 14:46:02 +04:00 · 2024-03-06 11:52:09 +04:00 · 2024-03-06 04:08:45 +04:00 · 2024-03-06 04:03:30 +04:00 · 2024-03-06 03:44:52 +04:00 · 2024-03-06 02:10:11 +04:00
11 changed files with 146 additions and 42 deletions
@@ -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)
@@ -1005,6 +1005,7 @@ class Bot
            'mtproto' => file_get_contents('/config/mtprotosecret'),
            'xray'    => json_decode(file_get_contents('/config/xray.json'), true),
            'oc'      => file_get_contents('/config/ocserv.conf'),
+            'ocu'     => file_get_contents('/config/ocserv.passwd'),

        ];
        return json_encode($conf, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
@@ -1061,6 +1062,9 @@ class Bot
                if ($this->getPacConf()['amnezia'] != $json['pac']['amnezia']) {
                    $switch_amnezia = 1;
                }
+                if ($this->getPacConf()['wg1_amnezia'] != $json['pac']['wg1_amnezia']) {
+                    $switch_wg1amnezia = 1;
+                }
                $this->setPacConf($json['pac']);
                $out[] = 'update naiveproxy';
                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
@@ -1082,7 +1086,7 @@ class Bot
                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
                $this->wg = 1;
                $this->saveClients($json['wg1']['clients']);
-                $this->restartWG($this->createConfig($json['wg1']['server']), $switch_amnezia);
+                $this->restartWG($this->createConfig($json['wg1']['server']), $switch_wg1amnezia);
                $this->iptablesWG();
            }
            // ad
@@ -1126,6 +1130,7 @@ class Bot
            if (!empty($json['oc'])) {
                $out[] = 'update ocserv';
                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+                file_put_contents('/config/ocserv.passwd', $json['ocu']);
                $this->restartOcserv($json['oc']);
            }
            if (!empty($json['pac']['domain'])) {
@@ -2227,7 +2232,7 @@ DNS-over-HTTPS with IP:
                if (!empty($v['# PublicKey'])) {
                    $conf['peers'][$k]['online'] = 'off';
                } else {
-                    $conf['peers'][$k]['status'] = $this->getStatusPeer($v['PublicKey'], $status['peers']);
+                    $conf['peers'][$k]['status'] = $status ? $this->getStatusPeer($v['PublicKey'], $status['peers']) : 'error';
                    $conf['peers'][$k]['online'] = preg_match('~^(\d+ seconds|[12] minute)~', $conf['peers'][$k]['status']['latest handshake']) ? 'online' : '';
                }
            }
@@ -2533,14 +2538,60 @@ DNS-over-HTTPS with IP:
        $this->menu('client', "{$k}_$page");
    }

+    public function getAmneziaShortLink($client)
+    {
+        $dns = explode(',', $client['interface']['DNS']);
+        $c   = json_encode([
+            "containers" => [
+                [
+                    "awg" => [
+                        "isThirdPartyConfig" => True,
+                        "last_config" => json_encode([
+                            "H1"              => "{$client['interface']['H1']}",
+                            "H2"              => "{$client['interface']['H2']}",
+                            "H3"              => "{$client['interface']['H3']}",
+                            "H4"              => "{$client['interface']['H4']}",
+                            "Jc"              => "{$client['interface']['Jc']}",
+                            "Jmax"            => "{$client['interface']['Jmax']}",
+                            "Jmin"            => "{$client['interface']['Jmin']}",
+                            "S1"              => "{$client['interface']['S1']}",
+                            "S2"              => "{$client['interface']['S2']}",
+                            "client_ip"       => explode('/', $client['interface']['Address'])[0],
+                            "client_priv_key" => $client['interface']['PrivateKey'],
+                            "client_pub_key"  => "0",
+                            "config"          => $this->createConfig($client),
+                            "hostName"        => $this->ip,
+                            "port"            => (int) getenv('WG1PORT'),
+                            "psk_key"         => $client['peers'][0]['PresharedKey'],
+                            "server_pub_key"  => $client['peers'][0]['PublicKey']
+                        ]),
+                        "port" => (int) getenv('WG1PORT'),
+                        "transport_proto" => "udp"
+                    ],
+                    "container" => "amnezia-awg"
+                ]
+            ],
+            "defaultContainer" => "amnezia-awg",
+            "description"      => $client['interface']['## name'],
+            "dns1"             => $dns[0],
+            "dns2"             => $dns[1] ?: '',
+            "hostName"         => $this->ip
+        ]);
+        exec("echo '$c' | python amnezia.py", $o);
+        return $o[0];
+    }
+
    public function getClient($client, $page)
    {
        $clients = $this->readClients();
        if ($clients) {
            $name = $this->getName($clients[$client]['interface']);
            $conf = $this->createConfig($clients[$client]);
+            if ($this->getWGType() == 'awg') {
+                $sl = $this->getAmneziaShortLink($clients[$client]);
+            }
            return [
-                'text' => "<code>$conf</code>\n\n<b>$name</b> ({$this->getTitleWG()})",
+                'text' => "<pre>$conf</pre>\n\n<code>$sl</code>\n\n<b>$name</b> ({$this->getTitleWG()})",
                'data' => [
                    [
                        [
@@ -3829,7 +3880,6 @@ DNS-over-HTTPS with IP:

    public function readStatus()
    {
-        // $this->sd([$this->getWGType(), $this->getInstanceWG()]);
        $r = $this->ssh($this->getWGType(), $this->getInstanceWG());
        $r = explode(PHP_EOL, $r);
        $r = array_filter($r);
@@ -4002,14 +4052,21 @@ DNS-over-HTTPS with IP:

    public function syncPortClients()
    {
-        $endpoint = $this->ip . ':' . getenv('WGPORT');
-        $clients  = $this->readClients();
-        foreach ($clients as $k => $v) {
-            foreach ($v['peers'] as $i => $j) {
-                $clients[$k]['peers'][$i]['Endpoint'] = $endpoint;
+        $endpoint = [
+            $this->ip . ':' . getenv('WGPORT'),
+            $this->ip . ':' . getenv('WG1PORT'),
+        ];
+        for ($i=0; $i < 2; $i++) {
+            $this->wg = $i;
+            $clients  = $this->readClients();
+            foreach ($clients as $k => $v) {
+                foreach ($v['peers'] as $i => $j) {
+                    $clients[$k]['peers'][$i]['Endpoint'] = $endpoint[$i];
+                }
            }
+            $this->saveClients($clients);
        }
-        $this->saveClients($clients);
+        unset($this->wg);
    }

    public function saveClients(array $clients)
@@ -243,7 +243,7 @@ $i = [
    ],
    'backup'  => [
        'en' => 'auto backup',
-        'ru' => 'бэкап',
+        'ru' => 'автобэкап',
    ],
    'logs'  => [
        'en' => 'logs',
@@ -83,7 +83,7 @@ services:
                ipv4_address: 10.10.0.2
        logging: *default-logging
    php:
-        image: mercurykd/vpnbot-php:1.1
+        image: mercurykd/vpnbot-php:1.2
        build:
            dockerfile: dockerfile/php.dockerfile
            args:
@@ -396,7 +396,7 @@ services:
                ipv4_address: 10.10.0.9
        logging: *default-logging
    oc:
-        image: mercurykd/vpnbot-oc:1.1
+        image: mercurykd/vpnbot-oc:1.2
        build:
            dockerfile: dockerfile/ocserv.dockerfile
            args:
@@ -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 \
@@ -19,6 +19,7 @@ RUN apk add --no-cache --update php81 \
    openssh \
    openssl \
    curl \
+    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 \
@@ -2,7 +2,7 @@ b:
 	docker compose build
 u: # запуск контейнеров
 	bash ./update/update.sh &
-	IP=$(shell ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$$|\1|p' | awk '{print $1}' | head -1) VER=$(shell git describe --tags) docker compose up -d --force-recreate
+	IP=$(shell curl https://ipinfo.io/ip) VER=$(shell git describe --tags) docker compose up -d --force-recreate
 d: # остановка контейнеров
 	-kill -9 $(shell cat ./update/update_pid) > /dev/null
 	docker compose down --remove-orphans
@@ -54,4 +54,5 @@ s:
 	git status -su
 c:
 	git add config/
-	git checkout .
+	git checkout .
+	git reset
@@ -1,3 +1,7 @@
+cat /ssh/key.pub > /root/.ssh/authorized_keys
+ssh-keygen -A
+exec /usr/sbin/sshd -D -e "$@" &
+
 INTERFACE=$(route | grep '^default' | grep -o '[^ ]*$')
 if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
 then
@@ -13,21 +17,36 @@ fi
 iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT
 iptables -t nat -A POSTROUTING -o $INTERFACE -j MASQUERADE
 ln -s /etc/wireguard/wg0.conf /etc/amnezia/amneziawg/wg0.conf
-if [ $(cat /pac.json | jq .amnezia) -eq 1 ]
+if [ "$HOSTNAME" = "wireguard1" ]
 then
-    awg-quick up wg0
+    if [ $(cat /pac.json | jq .wg1_amnezia) -eq 1 ]
+    then
+        awg-quick up wg0
+    else
+        wg-quick up wg0
+    fi
+    if [ $(cat /pac.json | jq .wg1_blocktorrent) -eq 1 ]
+    then
+        sh /block_torrent.sh
+    fi
+    if [ $(cat /pac.json | jq .wg1_exchange) -eq 1 ]
+    then
+        sh /block_exchange.sh
+    fi
 else
-    wg-quick up wg0
-fi
-cat /ssh/key.pub > /root/.ssh/authorized_keys
-ssh-keygen -A
-exec /usr/sbin/sshd -D -e "$@" &
-if [ $(cat /pac.json | jq .blocktorrent) -eq 1 ]
-then
-    sh /block_torrent.sh
-fi
-if [ $(cat /pac.json | jq .exchange) -eq 1 ]
-then
-    sh /block_exchange.sh
+    if [ $(cat /pac.json | jq .amnezia) -eq 1 ]
+    then
+        awg-quick up wg0
+    else
+        wg-quick up wg0
+    fi
+    if [ $(cat /pac.json | jq .blocktorrent) -eq 1 ]
+    then
+        sh /block_torrent.sh
+    fi
+    if [ $(cat /pac.json | jq .exchange) -eq 1 ]
+    then
+        sh /block_exchange.sh
+    fi
 fi
 tail -f /dev/null
@@ -3,10 +3,13 @@ Description=VPN: Docker Compose Application Service
 Requires=docker.service
 After=docker.service
 [Service]
+Type=oneshot
+RemainAfterExit=yes
 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
+ExecStart=/bin/sh -c "IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose 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
@@ -11,7 +11,7 @@ do
        docker compose down --remove-orphans
        git reset --hard
        git pull > ./update/message
-        IP=$(ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$|\1|p' | awk '{print $1}' | head -1) VER=$(git describe --tags) docker compose up -d --force-recreate
+        IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose up -d --force-recreate
        bash $pwd/update/update.sh &
        exit 0
    fi
@@ -1,3 +1,11 @@
+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
Author	SHA1	Message	Date
mercury	3e3684eb34	fix service for systemd	2024-03-06 14:46:02 +04:00
mercury	7ee47db8e2	fix short link type	2024-03-06 11:52:09 +04:00
mercury	b390fe7dd8	update version	2024-03-06 04:08:45 +04:00
mercury	fe0414cc59	fix export ocserv users	2024-03-06 04:03:30 +04:00
mercury	48a1eba67e	fix ocserv	2024-03-06 03:44:52 +04:00
mercury	714cff7d76	fix lib for short link	2024-03-06 02:10:11 +04:00
mercury	0e8bab5c4c	fix service script	2024-03-06 01:45:31 +04:00
mercury	387e6e4986	short link for amnezia	2024-03-06 01:35:40 +04:00
mercury	6a7af1c30f	fix import wg1	2024-03-05 00:14:36 +04:00
mercury	2a17b4f1f3	update version	2024-03-04 23:30:46 +04:00
mercury	d005ccc919	fix start wg1	2024-03-04 23:26:09 +04:00
mercury	5df89e7f89	syncport fix	2024-03-04 16:51:18 +04:00
mercury	f6d72800cb	white ip	2024-03-04 16:38:37 +04:00
mercury	4ff1929a22	improve makefile	2024-03-03 19:53:52 +04:00