fix domain for cdn

update version
fix nginx.conf init
2024-09-22 01:06:02 +04:00 · 2024-09-19 13:44:35 +04:00 · 2024-09-19 12:11:05 +04:00 · 2024-09-19 12:02:51 +04:00 · 2024-09-17 20:36:51 +04:00 · 2024-09-17 20:15:34 +04:00
4 changed files with 141 additions and 26 deletions
@@ -148,6 +148,9 @@ class Bot
            case preg_match('~^/addSubdomain$~', $this->input['callback'], $m):
                $this->addSubdomain();
                break;
+            case preg_match('~^/addLinkDomain$~', $this->input['callback'], $m):
+                $this->addLinkDomain();
+                break;
            case preg_match('~^/id$~', $this->input['message'], $m):
                $this->send($this->input['chat'], $this->input['from'], $this->input['message_id']);
                break;
@@ -1598,7 +1601,7 @@ class Bot
    {
        $conf    = $this->getPacConf();
        $ip      = $this->ip;
-        $domain  = $conf['domain'] ?: $ip;
+        $domain  = $this->getDomain();
        $scheme  = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https';
        $ss      = $this->getSSConfig();
        $port    = !empty($ss['plugin']) ? (!empty($ssl) ? 443 : 80) : getenv('SSPORT');
@@ -2085,10 +2088,41 @@ class Bot
        ];
    }

+    public function addLinkDomain()
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter domain for link",
+            $this->input['message_id'],
+            reply: 'enter domain for link',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message' => $this->input['message_id'],
+            'callback'      => 'setLinkDomain',
+            'args'          => [],
+        ];
+    }
+
+    public function setLinkDomain($text)
+    {
+        $c = $this->getPacConf();
+        if (empty($text)) {
+            unset($c['linkdomain']);
+        } else {
+            $c['linkdomain'] = trim($text);
+        }
+        $this->setPacConf($c);
+        $this->xray();
+    }
+
    public function setSubdomain($text)
    {
        $c = $this->getPacConf();
-        $c['subdomain'] = array_filter(explode(',', $text), fn($e) => !empty(trim($e)));
+        if (empty($text)) {
+            unset($c['subdomain']);
+        } else {
+            $c['subdomain'] = array_filter(explode(',', $text), fn($e) => !empty(trim($e)));
+        }
        $this->setPacConf($c);
        $this->menu('config');
    }
@@ -2194,10 +2228,10 @@ class Bot
                    'ids'      => [],
                ],
                'name'                        => $v['email'],
-                'ids'                         => [$v['email']],
+                'ids'                         => [$v['id']],
                'tags'                        => [],
                'upstreams'                   => [],
-                'uid'                         => $this->guidv4(),
+                'uid'                         => $v['id'],
                'upstreams_cache_size'        => 0,
                'upstreams_cache_enabled'     => false,
                'use_global_settings'         => true,
@@ -3238,7 +3272,7 @@ DNS-over-HTTPS with IP:
        $mpac   = stat(__DIR__ . '/zapretlists/mpac');
        $pac    = stat(__DIR__ . '/zapretlists/pac');
        $conf   = $this->getPacConf();
-        $ip     = $conf['domain'] ?: $this->ip;
+        $ip     = $this->getDomain();
        $hash   = substr(md5($this->key), 0, 8);
        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
        $text   = <<<text
@@ -3650,7 +3684,7 @@ DNS-over-HTTPS with IP:
    {
        $conf    = $this->getPacConf();
        $ip      = $this->ip;
-        $domain  = $conf['domain'] ?: $ip;
+        $domain  = $this->getDomain();
        $scheme  = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https';
        $ss      = $this->getSSConfig();
        $v2ray   = !empty($ss['plugin']) ? 'ON' : 'OFF';
@@ -3830,7 +3864,7 @@ DNS-over-HTTPS with IP:
    {
        $c      = $this->getXray();
        $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
+        $domain = $this->getDomain($pac['transport'] == 'Websocket');
        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
        $hash   = substr(md5($this->key), 0, 8);
        $si     = "$scheme://{$domain}/pac/" . base64_encode(serialize([
@@ -3904,8 +3938,9 @@ DNS-over-HTTPS with IP:
    public function naiveMenu()
    {
        $pac    = $this->getPacConf();
+        $domain = $this->getDomain();
        $text[] = "Menu -> NaiveProxy";
-        $text[] = "<code>https://{$pac['naive']['user']}:{$pac['naive']['pass']}@np.{$pac['domain']}</code>";
+        $text[] = "<code>https://{$pac['naive']['user']}:{$pac['naive']['pass']}@np.$domain</code>";
        $data[] = [
            [
                'text'          => $this->i18n('change login'),
@@ -3997,6 +4032,7 @@ DNS-over-HTTPS with IP:
    public function ocMenu()
    {
        $pac    = $this->getPacConf();
+        $domain = $this->getDomain();
        $ocserv = file_get_contents('/config/ocserv.conf');
        preg_match('~^camouflage_secret[^\n]+?"([^"]+)*"~sm', $ocserv, $m);
        $cs = $m[1];
@@ -4005,7 +4041,7 @@ DNS-over-HTTPS with IP:
        $pass   = htmlspecialchars($pac['ocserv']);
        $text[] = "Menu -> OpenConnect";
        if (!empty($m[1])) {
-            $text[] = "<code>https://oc.{$pac['domain']}/?$cs</code>";
+            $text[] = "<code>https://oc.$domain/?$cs</code>";
        }
        $text[] = "password: <span class='tg-spoiler'>$pass</span>";
        $data[] = [
@@ -4225,7 +4261,7 @@ DNS-over-HTTPS with IP:
    public function templates($type)
    {
        $pac       = $this->getPacConf();
-        $domain    = $pac['domain'] ?: $this->ip;
+        $domain    = $this->getDomain();
        $hash      = substr(md5($this->key), 0, 8);
        $text[]    = "Menu -> " . $this->i18n('xray') . " -> $type templates";
        $templates = $pac["{$type}templates"];
@@ -4293,6 +4329,12 @@ DNS-over-HTTPS with IP:
            $text[] = "fake domain: <code>$fake</code>";
        }
        $text[] = 'transport: ' . ($p['transport'] ?: 'Reality');
+        $data[] = [
+            [
+                'text'          => $p['linkdomain'] ?: $this->i18n('cdn'),
+                'callback_data' => '/addLinkDomain',
+            ],
+        ];
        $data[] = [
            [
                'text'          => $this->i18n('Reality') . ' ' . ($p['transport'] != 'Websocket' ? $this->i18n('on') : $this->i18n('off')),
@@ -4548,7 +4590,7 @@ DNS-over-HTTPS with IP:
    {
        $c      = $this->getXray()['inbounds'][0]['settings']['clients'][$i];
        $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
+        $domain = $this->getDomain($pac['transport'] == 'Websocket');
        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
        $hash   = substr(md5($this->key), 0, 8);

@@ -4635,17 +4677,26 @@ DNS-over-HTTPS with IP:
        );
    }

+    public function getDomain($cdn = false)
+    {
+        $c = $this->getPacConf();
+        if ($cdn && $c['linkdomain']) {
+            return $c['linkdomain'];
+        }
+        return $c['domain'] ?: $this->ip;
+    }
+
    public function v2raySubscription($key, $fs = 0)
    {
        $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
+        $domain = $this->getDomain();
        $xr     = $this->getXray();

        $flag = true;
        foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
            if ($v['id'] == $key) {
                if (!empty($fs)) {
-                    return $this->userXr($k, 0, 1);
+                    return $this->userXr($k);
                }
                if (empty($v['off'])) {
                    $flag = false;
@@ -4678,7 +4729,7 @@ DNS-over-HTTPS with IP:
    {
        $type   = $_GET['t'] == 's' ? 'v2ray' : 'sing';
        $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
+        $domain = $_GET['cdn'] ?: ($_SERVER['SERVER_NAME'] ?: $this->getDomain($pac['transport'] == 'Websocket'));
        $xr     = $this->getXray();
        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
        $hash   = substr(md5($this->key), 0, 8);
@@ -4759,7 +4810,7 @@ DNS-over-HTTPS with IP:

        switch ($_GET['t']) {
            case 's':
-                $c['outbounds'][0]['settings']['vnext'][0]['address']  = $_GET['cdn'] ?: $domain;
+                $c['outbounds'][0]['settings']['vnext'][0]['address']  = $domain;
                $c['outbounds'][0]['settings']['vnext'][0]['users'][0] = [
                    'id'         => $uid,
                    'encryption' => 'none',
@@ -4773,7 +4824,7 @@ DNS-over-HTTPS with IP:
                        ],
                        "tlsSettings" => [
                            "allowInsecure" => false,
-                            "serverName"    => $_GET['cdn'] ?: $domain,
+                            "serverName"    => $domain,
                            "fingerprint"   => "chrome"
                        ]
                    ];
@@ -4808,10 +4859,10 @@ DNS-over-HTTPS with IP:
                break;
            case 'si':
                if ($c['dns']['servers'][0]['address'] == '~dns~') {
-                    $c['dns']['servers'][0]['address'] = "https://$domain/dns-query/$email";
+                    $c['dns']['servers'][0]['address'] = "https://$domain/dns-query/$uid";
                }

-                $c['outbounds'][0]['server'] = $_GET['cdn'] ?: $domain;
+                $c['outbounds'][0]['server'] = $domain;
                $c['outbounds'][0]['uuid']   = $uid;
                if ($pac['transport'] == 'Websocket') {
                    unset($c['outbounds'][0]['tls']['reality']);
@@ -4820,7 +4871,7 @@ DNS-over-HTTPS with IP:
                        "type" => "ws",
                        "path" => "/ws"
                    ];
-                    $c['outbounds'][0]['tls']['server_name'] = $_GET['cdn'] ?: $domain;
+                    $c['outbounds'][0]['tls']['server_name'] = $domain;
                } else {
                    unset($c['outbounds'][0]["transport"]);
                    $c['outbounds'][0]['flow']                         = 'xtls-rprx-vision';
@@ -4840,7 +4891,7 @@ DNS-over-HTTPS with IP:
                $c['route']['rules'] = array_values($c['route']['rules']);
                $c['route']          = $this->addRuleSet($c['route']);
                $c['route']          = $this->addPackageRule($c['route']);
-                $c['route']          = $this->createRuleSet($c['route'], $uid);
+                $c['route']          = $this->createRuleSet($c['route'], $uid, $domain);
                $c['route']          = $this->clearEmptyRules($c['route']);
                break;
        }
@@ -4897,10 +4948,9 @@ DNS-over-HTTPS with IP:
        return $route;
    }

-    public function createRuleSet($route, $uid)
+    public function createRuleSet($route, $uid, $domain)
    {
        $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
        $hash   = substr(md5($this->key), 0, 8);

@@ -5117,7 +5167,7 @@ DNS-over-HTTPS with IP:
    {
        $conf   = $this->getPacConf();
        $ip     = $this->ip;
-        $domain = $conf['domain'] ?: $ip;
+        $domain = $this->getDomain();
        $scheme = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https';
        $text   = "$scheme://$domain/adguard\nLogin: admin\nPass: <span class='tg-spoiler'>{$conf['adpswd']}</span>\n\n";
        if ($ssl) {
@@ -5221,6 +5271,15 @@ DNS-over-HTTPS with IP:
        return openssl_x509_parse($c)["validTo_time_t"] ?: false;
    }

+    public function domainsCert()
+    {
+        $domains = openssl_x509_parse(openssl_x509_read(file_get_contents("/certs/cert_public")))['extensions']["subjectAltName"];
+        if (empty($domains)) {
+            return false;
+        }
+        return implode("\n", array_map(fn($e) => trim($e), explode(',', str_replace('DNS:', '', $domains))));
+    }
+
    public function updatebot()
    {
        $b = exec('git -C / rev-parse --abbrev-ref HEAD');
@@ -5283,7 +5342,7 @@ DNS-over-HTTPS with IP:
        }
        $text[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\nnp.{$conf['domain']} (for naiveproxy)\noc.{$conf['domain']} (for openconnect)" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']} (for adguard DoT)" : '') . $custom : $this->i18n('domain explain');
        $ssl    = $this->expireCert();
-        $text[] = $conf['domain'] ? "\nSSL: " . ($ssl ? date('Y-m-d H:i:s', $this->expireCert()) : 'none') : '';
+        $text[] = $conf['domain'] ? "\nSSL: " . ($ssl ? date('Y-m-d H:i:s', $this->expireCert()) . "\n" . $this->domainsCert() : 'none') : '';

        $data = [
            [
@@ -5292,7 +5351,7 @@ DNS-over-HTTPS with IP:
                    'callback_data' => $conf['domain'] ? '/deldomain' : '/domain',
                ],
                [
-                    'text'          => $this->i18n('subdomain'),
+                    'text'          => $this->i18n('+ subdomain'),
                    'callback_data' => '/addSubdomain',
                ],
            ],
@@ -5790,7 +5849,7 @@ DNS-over-HTTPS with IP:
                $conf[] = '';
                $conf[] = $peer['# PublicKey'] ? '# [Peer]' : '[Peer]';
                if (!empty($peer['Endpoint'])) {
-                    $peer['Endpoint'] = ($pac['domain'] ? $pac['domain'] : $this->ip) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
+                    $peer['Endpoint'] = $this->getDomain() . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
                }
                foreach ($peer as $k => $v) {
                    $conf[] = "$k = $v";
@@ -48,6 +48,7 @@ http {
    }
    location /pac {
      access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
      proxy_pass http://php;
    }
    location /tlgrm {
@@ -75,6 +76,27 @@ http {
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_read_timeout 5d;
    }
+#-ssl
+#   # The DoH server block
+#   location /dns-query {
+#     access_log /logs/nginx_doh_access;
+#     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
+#     proxy_http_version 1.1;
+#     proxy_set_header Connection "";
+#     proxy_set_header  Host $host;
+#     proxy_set_header  X-Real-IP $remote_addr;
+#     proxy_set_header  X-Forwarded-Proto https;
+#     proxy_set_header  X-Forwarded-For $remote_addr;
+#     proxy_set_header  X-Forwarded-Host $remote_addr;
+
+#     # Enable Cache, and set the cache_key to include the request_body
+#     proxy_cache doh_cache;
+#     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+
+#     # proxy pass to the dohloop upstream
+#     proxy_pass https://ad/dns-query;
+#   }
+#-ssl
    location ~\.well-known {
      access_log /logs/nginx_certbot_access;
      root /certs/;
@@ -118,6 +140,7 @@ http {
  #   }
  #   location /pac {
  #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
  #     proxy_pass http://php;
  #   }
  #   location ~\.well-known {
@@ -48,6 +48,7 @@ http {
    }
    location /pac {
      access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
      proxy_pass http://php;
    }
    location /tlgrm {
@@ -75,6 +76,27 @@ http {
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_read_timeout 5d;
    }
+#-ssl
+#   # The DoH server block
+#   location /dns-query {
+#     access_log /logs/nginx_doh_access;
+#     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
+#     proxy_http_version 1.1;
+#     proxy_set_header Connection "";
+#     proxy_set_header  Host $host;
+#     proxy_set_header  X-Real-IP $remote_addr;
+#     proxy_set_header  X-Forwarded-Proto https;
+#     proxy_set_header  X-Forwarded-For $remote_addr;
+#     proxy_set_header  X-Forwarded-Host $remote_addr;
+
+#     # Enable Cache, and set the cache_key to include the request_body
+#     proxy_cache doh_cache;
+#     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+
+#     # proxy pass to the dohloop upstream
+#     proxy_pass https://ad/dns-query;
+#   }
+#-ssl
    location ~\.well-known {
      access_log /logs/nginx_certbot_access;
      root /certs/;
@@ -118,6 +140,7 @@ http {
  #   }
  #   location /pac {
  #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
  #     proxy_pass http://php;
  #   }
  #   location ~\.well-known {
@@ -1,3 +1,13 @@
+22.09.2024 v1.56.2
+- фикс разных доменов при указании cdn для xray
+19.09.2024 v1.56.1
+- cdn для xray
+17.09.2024 v1.55
+- возможность подменить домен в ссылках на конфиги
+16.09.2024 v1.54.2
+- фикс нэйминга клиентов в adguardHome: замена на uuid
+16.09.2024 v1.54.1
+- фикс нэйминга клиентов в adguardHome
 16.09.2024 v1.54
 - ~dns~ в шаблоне сингбокса подменяятся на https://DOMAIN/dns-query/USERNAME
 - при добавлении пользователя в XRAY, он также добавляется в AdguardHome как сохраненый клиент
Author	SHA1	Message	Date
mercury	b10aaff459	fix domain for cdn	2024-09-22 01:06:02 +04:00
mercury	3271561418	update version	2024-09-19 13:44:35 +04:00
mercury	295ee6f2aa	fix nginx.conf init	2024-09-19 12:11:05 +04:00
mercury	7ce7c56c1b	domain for links -> cdn for xray	2024-09-19 12:02:51 +04:00
mercury	dca34de723	fix config menu	2024-09-17 20:36:51 +04:00
mercury	eb1ad21c88	domain for links	2024-09-17 20:15:34 +04:00
mercury	a3ca7d9ed8	fix naming clients AdgHome + xray	2024-09-16 13:07:32 +04:00
mercury	60ba3cf15c	fix name clients AdguardHome	2024-09-16 12:17:20 +04:00