Compare commits
38 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f1b3d84f4 | |||
| e81c6a5dfb | |||
| c00dafa6d1 | |||
| cab00f4aed | |||
| 4082dac97b | |||
| 7317d418de | |||
| b7a1f9bbd6 | |||
| fcc165b4be | |||
| a9d16eadce | |||
| 82b95ccb85 | |||
| e01ef61b62 | |||
| 367bfc0fbc | |||
| 524c52e326 | |||
| 3bbb8290e5 | |||
| 1e8ac34370 | |||
| 2332e5ea71 | |||
| 796fa57330 | |||
| ce91b1152e | |||
| 64d44428d0 | |||
| 860fdc883f | |||
| f2f2066e99 | |||
| 3e343ce2b7 | |||
| 3c16620a7d | |||
| b1efd9f400 | |||
| cbe0ef8a12 | |||
| 24026d3678 | |||
| dea46815c7 | |||
| 11e34d8c4e | |||
| 3e3684eb34 | |||
| 7ee47db8e2 | |||
| b390fe7dd8 | |||
| fe0414cc59 | |||
| 48a1eba67e | |||
| 714cff7d76 | |||
| 0e8bab5c4c | |||
| 387e6e4986 | |||
| 6a7af1c30f | |||
| 2a17b4f1f3 |
@@ -18,3 +18,5 @@
|
||||
mirror/.env
|
||||
update/*
|
||||
!update/update.sh
|
||||
|
||||
override.env
|
||||
@@ -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)
|
||||
+230
-35
@@ -5,6 +5,7 @@ class Bot
|
||||
public $input;
|
||||
public $adguard;
|
||||
public $update;
|
||||
public $ip;
|
||||
|
||||
public function __construct($key, $i18n)
|
||||
{
|
||||
@@ -130,6 +131,9 @@ class Bot
|
||||
case preg_match('~^/id$~', $this->input['message'], $m):
|
||||
$this->send($this->input['chat'], $this->input['from'], $this->input['message_id']);
|
||||
break;
|
||||
case preg_match('~^/adguardChBr$~', $this->input['callback'], $m):
|
||||
$this->adguardChBr();
|
||||
break;
|
||||
case preg_match('~^/mtproto$~', $this->input['callback'], $m):
|
||||
$this->mtproto();
|
||||
break;
|
||||
@@ -332,6 +336,12 @@ class Bot
|
||||
case preg_match('~^/changeFakeDomain$~', $this->input['callback'], $m):
|
||||
$this->changeFakeDomain();
|
||||
break;
|
||||
case preg_match('~^/selfFakeDomain$~', $this->input['callback'], $m):
|
||||
$this->selfFakeDomain();
|
||||
break;
|
||||
case preg_match('~^/changeTGDomain$~', $this->input['callback'], $m):
|
||||
$this->changeTGDomain();
|
||||
break;
|
||||
case preg_match('~^/include (\d+)$~', $this->input['callback'], $m):
|
||||
$this->include($m[1]);
|
||||
break;
|
||||
@@ -397,17 +407,26 @@ class Bot
|
||||
|
||||
public function secretSet($secret)
|
||||
{
|
||||
$this->restartTG($secret);
|
||||
file_put_contents('/config/mtprotosecret', $secret);
|
||||
$this->restartTG();
|
||||
$this->mtproto();
|
||||
}
|
||||
|
||||
public function restartTG($secret)
|
||||
public function setTelegramDomain($domain)
|
||||
{
|
||||
file_put_contents('/config/mtprotosecret', $secret ?: '');
|
||||
file_put_contents('/config/mtprotodomain', $domain);
|
||||
$this->restartTG();
|
||||
$this->mtproto();
|
||||
}
|
||||
|
||||
public function restartTG()
|
||||
{
|
||||
$secret = file_get_contents('/config/mtprotosecret');
|
||||
$fakedomain = file_get_contents('/config/mtprotodomain') ?: 'vk.com';
|
||||
$this->ssh('pkill mtproto-proxy', 'tg');
|
||||
if (preg_match('~^\w{32}$~', $secret)) {
|
||||
$p = getenv('TGPORT');
|
||||
$this->ssh("mtproto-proxy -u nobody -H $p --nat-info 10.10.0.8:{$this->ip} -S $secret --aes-pwd /proxy-secret /proxy-multi.conf -M 1 >/dev/null 2>&1 &", 'tg');
|
||||
$this->ssh("mtproto-proxy --domain $fakedomain -u nobody -H $p --nat-info 10.10.0.8:{$this->ip} -S $secret --aes-pwd /proxy-secret /proxy-multi.conf -M 1 >/dev/null 2>&1 &", 'tg');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -422,18 +441,22 @@ class Bot
|
||||
{
|
||||
$s = file_get_contents('/config/mtprotosecret');
|
||||
$p = getenv('TGPORT');
|
||||
$d = trim(file_get_contents('/config/mtprotodomain') ?: 'vk.com');
|
||||
$d = exec("echo $d | tr -d '\\n' | xxd -ps -c 200");
|
||||
$ip = $this->getPacConf()['domain'] ?: $this->ip;
|
||||
return "https://t.me/proxy?server=$ip&port=$p&secret=$s";
|
||||
return "https://t.me/proxy?server=$ip&port=$p&secret=ee$s$d";
|
||||
}
|
||||
|
||||
public function mtproto()
|
||||
{
|
||||
$s = file_get_contents('/config/mtprotosecret');
|
||||
$d = file_get_contents('/config/mtprotodomain') ?: 'vk.com';
|
||||
$p = getenv('TGPORT');
|
||||
$ip = $this->getPacConf()['domain'] ?: $this->ip;
|
||||
$st = $this->ssh('pgrep mtproto-proxy', 'tg') ? 'on' : 'off';
|
||||
$text[] = "Menu -> MTProto\n";
|
||||
$text[] = "status: $st\n";
|
||||
$text[] = "fake domain: <code>$d</code>\n";
|
||||
if ($st == 'on') {
|
||||
$text[] = $this->linkMtproto();
|
||||
}
|
||||
@@ -449,6 +472,12 @@ class Bot
|
||||
'callback_data' => "/setSecret",
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('changeFakeDomain'),
|
||||
'callback_data' => "/changeTGDomain",
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('show QR'),
|
||||
@@ -1002,9 +1031,11 @@ class Bot
|
||||
'private' => file_get_contents('/certs/cert_private'),
|
||||
'public' => file_get_contents('/certs/cert_public'),
|
||||
] : false,
|
||||
'mtproto' => file_get_contents('/config/mtprotosecret'),
|
||||
'xray' => json_decode(file_get_contents('/config/xray.json'), true),
|
||||
'oc' => file_get_contents('/config/ocserv.conf'),
|
||||
'mtproto' => file_get_contents('/config/mtprotosecret'),
|
||||
'mtprotodomain' => file_get_contents('/config/mtprotodomain'),
|
||||
'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 +1092,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 +1116,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
|
||||
@@ -1113,7 +1147,9 @@ class Bot
|
||||
if (!empty($json['mtproto'])) {
|
||||
$out[] = 'update mtproto';
|
||||
$this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
|
||||
$this->restartTG($json['mtproto']);
|
||||
file_put_contents('/config/mtprotosecret', $json['mtproto']);
|
||||
file_put_contents('/config/mtprotodomain', $json['mtprotodomain'] ?: '');
|
||||
$this->restartTG();
|
||||
}
|
||||
// xray
|
||||
if (!empty($json['xray'])) {
|
||||
@@ -1126,6 +1162,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'])) {
|
||||
@@ -1153,6 +1190,7 @@ class Bot
|
||||
}
|
||||
}
|
||||
file_put_contents('/config/nginx.conf', $t);
|
||||
$this->adguardProtect();
|
||||
$out[] = $this->ssh("nginx -s reload 2>&1", 'ng');
|
||||
$this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
|
||||
|
||||
@@ -1442,7 +1480,7 @@ class Bot
|
||||
}
|
||||
}
|
||||
|
||||
public function addDomain($domain)
|
||||
public function addDomain($domain, $nomenu = false)
|
||||
{
|
||||
$domain = trim($domain);
|
||||
if (!empty($domain)) {
|
||||
@@ -1469,8 +1507,21 @@ class Bot
|
||||
file_put_contents('/config/nginx.conf', $nginx);
|
||||
}
|
||||
}
|
||||
sleep(3);
|
||||
$this->menu('config');
|
||||
if (empty($nomenu)) {
|
||||
sleep(3);
|
||||
$this->menu('config');
|
||||
}
|
||||
}
|
||||
|
||||
public function sslip()
|
||||
{
|
||||
$c = $this->getPacConf();
|
||||
if (empty($c['domain'])) {
|
||||
$this->addDomain(str_replace('.', '-', $this->ip) . '.sslip.io', 1);
|
||||
$this->setSSL('letsencrypt');
|
||||
} else {
|
||||
$this->menu();
|
||||
}
|
||||
}
|
||||
|
||||
public function comment($text, $tag)
|
||||
@@ -2176,6 +2227,17 @@ DNS-over-HTTPS with IP:
|
||||
$c = $this->getPacConf();
|
||||
$conf = $this->readConfig();
|
||||
$status = $this->readStatus();
|
||||
if (empty($status)) {
|
||||
return [
|
||||
'text' => "Menu -> " . $this->getTitleWG() . "\n\nerror status",
|
||||
'data' => [[
|
||||
[
|
||||
'text' => $this->i18n('back'),
|
||||
'callback_data' => "/menu",
|
||||
],
|
||||
]],
|
||||
];
|
||||
}
|
||||
$clients = $this->getClients($page);
|
||||
$bt = $c[$this->getInstanceWG(1) . 'blocktorrent'];
|
||||
$ex = $c[$this->getInstanceWG(1) . 'exchange'];
|
||||
@@ -2227,7 +2289,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 +2595,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' => [
|
||||
[
|
||||
[
|
||||
@@ -3024,7 +3132,9 @@ DNS-over-HTTPS with IP:
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('donate'),
|
||||
'url' => "https://yoomoney.ru/to/410011827900450",
|
||||
'web_app' => [
|
||||
'url' => "https://www.donationalerts.com/r/mercurykd",
|
||||
]
|
||||
],
|
||||
],
|
||||
],
|
||||
@@ -3282,6 +3392,10 @@ DNS-over-HTTPS with IP:
|
||||
'text' => $this->i18n('changeFakeDomain'),
|
||||
'callback_data' => "/changeFakeDomain",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('selfFakeDomain'),
|
||||
'callback_data' => "/selfFakeDomain",
|
||||
],
|
||||
];
|
||||
if ($c['inbounds'][0]['settings']['clients'][0]['id']) {
|
||||
$data[] = [
|
||||
@@ -3393,37 +3507,95 @@ DNS-over-HTTPS with IP:
|
||||
];
|
||||
}
|
||||
|
||||
public function adguardProtect()
|
||||
{
|
||||
$h = substr(hash('sha256', $this->key), 0, 8);
|
||||
$s = empty($this->getPacConf()['adgbrowser']) ? '' : '#';
|
||||
$a = $this->adguardBasicAuth();
|
||||
$r = <<<CONF
|
||||
location /adguard/ {
|
||||
access_log /logs/nginx_adguard_access;
|
||||
if (\$cookie_c != "$h") {
|
||||
$s rewrite .* /webapp redirect;
|
||||
}
|
||||
proxy_pass http://ad:80/;
|
||||
proxy_redirect / /adguard/;
|
||||
proxy_cookie_path / /adguard/;
|
||||
proxy_set_header Authorization "Basic \$cookie_a";
|
||||
}
|
||||
location
|
||||
CONF;
|
||||
$f = '/config/nginx.conf';
|
||||
$c = file_get_contents($f);
|
||||
$t = preg_replace('~(location /adguard.+?})\s*location~s', $r, $c);
|
||||
file_put_contents($f, $t);
|
||||
}
|
||||
|
||||
public function adguardBasicAuth()
|
||||
{
|
||||
return base64_encode('admin:' . $this->getPacConf()['adpswd']);
|
||||
}
|
||||
|
||||
public function adguardChBr()
|
||||
{
|
||||
$c = $this->getPacConf();
|
||||
$c['adgbrowser'] = $c['adgbrowser'] ? 0 : 1;
|
||||
$this->setPacConf($c);
|
||||
$this->adguardProtect();
|
||||
$this->ssh('nginx -s reload', 'ng');
|
||||
$this->answer($this->input['callback_id'], $this->i18n($c['adgbrowser'] ? 'browser_notify_on' : 'browser_notify_off'), true);
|
||||
$this->menu('adguard');
|
||||
}
|
||||
|
||||
public function adguardMenu()
|
||||
{
|
||||
$conf = $this->getPacConf();
|
||||
$ip = $this->ip;
|
||||
$domain = $conf['domain'] ?: $ip;
|
||||
$scheme = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https';
|
||||
$text = "$scheme://$domain/adguard\nLogin: admin\nPass: <span class='tg-spoiler'>{$conf['adpswd']}</span>\n\n";
|
||||
$text = "$scheme://$domain/adguard\nLogin: admin\nPass: <span class='tg-spoiler'>{$conf['adpswd']}</span>\n\n";
|
||||
if ($ssl) {
|
||||
$text .= "DNS over HTTPS:\n<code>$ip</code>\n<code>$scheme://$domain/dns-query" . ($conf['adguardkey'] ? "/{$conf['adguardkey']}" : '') . "</code>\n\n";
|
||||
$text .= "DNS over TLS:\n<code>tls://" . ($conf['adguardkey'] ? "{$conf['adguardkey']}." : '') . "$domain</code>";
|
||||
}
|
||||
$data = [
|
||||
[
|
||||
[
|
||||
'text' => 'web panel',
|
||||
'web_app' => [
|
||||
"url" => "https://$domain/adguard"
|
||||
],
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('third party browser') . ': ' . $this->i18n($conf['adgbrowser'] ? 'on' : 'off'),
|
||||
'callback_data' => '/adguardChBr'
|
||||
],
|
||||
],
|
||||
[
|
||||
[
|
||||
'text' => $this->i18n('change password'),
|
||||
'callback_data' => "/adguardpsswd",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('reset settings'),
|
||||
'callback_data' => "/adguardreset",
|
||||
'text' => 'ClientID' . ($conf['adguardkey'] ? ": {$conf['adguardkey']}" : ''),
|
||||
'callback_data' => "/setAdguardKey",
|
||||
],
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('reset settings'),
|
||||
'callback_data' => "/adguardreset",
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('add upstream'),
|
||||
'callback_data' => "/addupstream",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('setSecret') . ($conf['adguardkey'] ? ": {$conf['adguardkey']}" : ''),
|
||||
'callback_data' => "/setAdguardKey",
|
||||
'text' => $this->i18n('check DNS'),
|
||||
'callback_data' => "/checkdns",
|
||||
],
|
||||
];
|
||||
$upstreams = yaml_parse_file($this->adguard)['dns']['upstream_dns'];
|
||||
@@ -3441,12 +3613,6 @@ DNS-over-HTTPS with IP:
|
||||
];
|
||||
}
|
||||
}
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('check DNS'),
|
||||
'callback_data' => "/checkdns",
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('back'),
|
||||
@@ -3506,8 +3672,11 @@ DNS-over-HTTPS with IP:
|
||||
|
||||
public function configMenu()
|
||||
{
|
||||
$conf = $this->getPacConf();
|
||||
$text = $this->i18n('domain explain');
|
||||
$conf = $this->getPacConf();
|
||||
$text[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\nnp.{$conf['domain']}\noc.{$conf['domain']}" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']}" : '') : $this->i18n('domain explain');
|
||||
$ssl = $this->expireCert();
|
||||
$text[] = $conf['domain'] ? "\nSSL: " . ($ssl ? date('Y-m-d H:i:s', $this->expireCert()) : 'none') : '';
|
||||
|
||||
$data = [
|
||||
[
|
||||
[
|
||||
@@ -3522,7 +3691,7 @@ DNS-over-HTTPS with IP:
|
||||
case 'letsencrypt':
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('renew SSL') . ': ' . date('Y-m-d H:i:s', $this->expireCert()),
|
||||
'text' => $this->i18n('renew SSL'),
|
||||
'callback_data' => "/setSSL letsencrypt",
|
||||
],
|
||||
[
|
||||
@@ -3627,7 +3796,7 @@ DNS-over-HTTPS with IP:
|
||||
],
|
||||
];
|
||||
return [
|
||||
'text' => $text,
|
||||
'text' => implode("\n", $text),
|
||||
'data' => $data,
|
||||
];
|
||||
}
|
||||
@@ -3734,16 +3903,42 @@ DNS-over-HTTPS with IP:
|
||||
];
|
||||
}
|
||||
|
||||
public function setFakeDomain($domain)
|
||||
public function changeTGDomain()
|
||||
{
|
||||
$r = $this->send(
|
||||
$this->input['chat'],
|
||||
"@{$this->input['username']} enter domain",
|
||||
$this->input['message_id'],
|
||||
reply: 'enter domain',
|
||||
);
|
||||
$_SESSION['reply'][$r['result']['message_id']] = [
|
||||
'start_message' => $this->input['message_id'],
|
||||
'start_callback' => $this->input['callback_id'],
|
||||
'callback' => 'setTelegramDomain',
|
||||
'args' => [],
|
||||
];
|
||||
}
|
||||
|
||||
public function setFakeDomain($domain, $self = false)
|
||||
{
|
||||
$c = $this->getXray();
|
||||
$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0] = $domain;
|
||||
$c['inbounds'][0]['streamSettings']['realitySettings']['dest'] = "$domain:443";
|
||||
$c['inbounds'][0]['streamSettings']['realitySettings']['dest'] = $self ? "10.10.1.2:443" : "$domain:443";
|
||||
$this->restartXray($c);
|
||||
$this->setUpstreamDomain($domain);
|
||||
$this->xray();
|
||||
}
|
||||
|
||||
public function selfFakeDomain()
|
||||
{
|
||||
$c = $this->getPacConf();
|
||||
if (!empty($c['domain'])) {
|
||||
$this->setFakeDomain($c['domain'], 1);
|
||||
} else{
|
||||
$this->answer($this->input['callback_id'], 'empty domain', true);
|
||||
}
|
||||
}
|
||||
|
||||
public function setBackup($text)
|
||||
{
|
||||
$text = trim($text);
|
||||
@@ -4009,8 +4204,8 @@ DNS-over-HTTPS with IP:
|
||||
$this->wg = $i;
|
||||
$clients = $this->readClients();
|
||||
foreach ($clients as $k => $v) {
|
||||
foreach ($v['peers'] as $i => $j) {
|
||||
$clients[$k]['peers'][$i]['Endpoint'] = $endpoint[$i];
|
||||
foreach ($v['peers'] as $n => $j) {
|
||||
$clients[$k]['peers'][$n]['Endpoint'] = $endpoint[$i];
|
||||
}
|
||||
}
|
||||
$this->saveClients($clients);
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
<?php
|
||||
|
||||
require './config.php';
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt_array($ch, [
|
||||
CURLOPT_URL => "https://api.telegram.org/bot{$c['key']}/getWebhookInfo",
|
||||
CURLOPT_RETURNTRANSFER => true,
|
||||
]);
|
||||
$res = curl_exec($ch);
|
||||
die(var_dump($res));
|
||||
+18
-2
@@ -243,7 +243,7 @@ $i = [
|
||||
],
|
||||
'backup' => [
|
||||
'en' => 'auto backup',
|
||||
'ru' => 'бэкап',
|
||||
'ru' => 'автобэкап',
|
||||
],
|
||||
'logs' => [
|
||||
'en' => 'logs',
|
||||
@@ -263,7 +263,11 @@ $i = [
|
||||
],
|
||||
'changeFakeDomain' => [
|
||||
'en' => 'changeFakeDomain',
|
||||
'ru' => 'установить фейковый домен',
|
||||
'ru' => 'фейковый домен',
|
||||
],
|
||||
'selfFakeDomain' => [
|
||||
'en' => 'selfFakeDomain',
|
||||
'ru' => 'домен бота',
|
||||
],
|
||||
'page' => [
|
||||
'en' => 'pagination',
|
||||
@@ -305,4 +309,16 @@ $i = [
|
||||
'en' => 'update bot',
|
||||
'ru' => 'обновить бота',
|
||||
],
|
||||
'third party browser' => [
|
||||
'en' => 'third party browser',
|
||||
'ru' => 'сторонний браузер',
|
||||
],
|
||||
'browser_notify_on' => [
|
||||
'en' => 'the web panel can be opened in any browser',
|
||||
'ru' => 'веб панель может быть открыта в любом браузере',
|
||||
],
|
||||
'browser_notify_off' => [
|
||||
'en' => 'web panel is only available from telegram',
|
||||
'ru' => 'веб панель доступна только из телеграмма',
|
||||
],
|
||||
];
|
||||
|
||||
@@ -42,6 +42,24 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!empty($_GET['hash'])) {
|
||||
$t = $_GET;
|
||||
unset($t['hash']);
|
||||
ksort($t);
|
||||
foreach ($t as $k => $v) {
|
||||
$s[] = "$k=$v";
|
||||
}
|
||||
$s = implode("\n", $s);
|
||||
$sk = hash_hmac('sha256', $c['key'], "WebAppData", true);
|
||||
if (hash_hmac('sha256', $s, $sk) == $_GET['hash']) {
|
||||
require __DIR__ . '/bot.php';
|
||||
require __DIR__ . '/i18n.php';
|
||||
$bot = new Bot($c['key'], $i);
|
||||
setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
|
||||
setcookie('a', $bot->adguardBasicAuth(), 0, '/');
|
||||
die('ok');
|
||||
}
|
||||
}
|
||||
|
||||
header('500', true, 500);
|
||||
exit;
|
||||
|
||||
+2
-1
@@ -8,6 +8,7 @@ require __DIR__ . '/config.php';
|
||||
require __DIR__ . '/i18n.php';
|
||||
|
||||
$bot = new Bot($c['key'], $i);
|
||||
$bot->setwebhook();
|
||||
$bot->adguardProtect();
|
||||
$bot->setcommands();
|
||||
$bot->syncPortClients();
|
||||
$bot->setwebhook();
|
||||
|
||||
+117
@@ -0,0 +1,117 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Login</title>
|
||||
<style>
|
||||
/* Design based on Blue Login Field of Kevin Sleger https://codepen.io/MurmeltierS/pen/macKb */
|
||||
|
||||
body {
|
||||
background: #44c4e7 url("https://photos-6.dropbox.com/t/2/AAC_bdqR8LMkjEe-HPIf4K1DhtseMLRHPklBSzJSuzglvA/12/5714737/jpeg/1024x768/3/1418346000/0/2/bkg-blur.jpg/CLHm3AIgASgBKAI/b7RrveA2022yJyfO9RyRvv7LjJQESukGHssHUxVThzw") no-repeat center center fixed;
|
||||
background-size: cover;
|
||||
font-family: "Roboto";
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
|
||||
&::before {
|
||||
z-index: -1;
|
||||
content: '';
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background: #44c4e7;
|
||||
/* IE Fallback */
|
||||
background: rgba(68, 196, 231, 0.8);
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.form {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
background: #fff;
|
||||
width: 285px;
|
||||
margin: -140px 0 0 -182px;
|
||||
padding: 40px;
|
||||
box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
|
||||
|
||||
h2 {
|
||||
margin: 0 0 20px;
|
||||
line-height: 1;
|
||||
color: #44c4e7;
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
input {
|
||||
outline: none;
|
||||
display: block;
|
||||
width: 100%;
|
||||
margin: 0 0 20px;
|
||||
padding: 10px 15px;
|
||||
border: 1px solid #ccc;
|
||||
color: #ccc;
|
||||
font-family: "Roboto";
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
font-wieght: 400;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
transition: 0.2s linear;
|
||||
|
||||
&input:focus {
|
||||
color: #333;
|
||||
border: 1px solid #44c4e7;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
cursor: pointer;
|
||||
background: #44c4e7;
|
||||
width: 100%;
|
||||
padding: 10px 15px;
|
||||
border: 0;
|
||||
color: #fff;
|
||||
font-family: "Roboto";
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
|
||||
&:hover {
|
||||
background: #369cb8;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.error,
|
||||
.valid {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
<script src="jquery-3.7.1.min.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<section class="form animated flipInX">
|
||||
<h2>Login To Your Account</h2>
|
||||
<p class="valid">Valid. Please wait a moment.</p>
|
||||
<p class="error">Error. Please enter correct Username & password.</p>
|
||||
<form class="loginbox" autocomplete="off">
|
||||
<input placeholder="Username" type="text" id="username"></input>
|
||||
<input placeholder="Password" type="password" id="password"></input>
|
||||
<button id="submit">Login</button>
|
||||
</form>
|
||||
</section>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$('#submit').click(function () {
|
||||
event.preventDefault(); // prevent PageReLoad
|
||||
$('.error').css('display', 'block'); // show error msg
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
+2
-1
@@ -35,4 +35,5 @@ if (!empty($c['admin'])) {
|
||||
}
|
||||
file_put_contents('/update/message', '');
|
||||
file_put_contents('/update/reload_message', '');
|
||||
$bot->menu();
|
||||
$bot->restartTG();
|
||||
$bot->sslip();
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<script src="https://telegram.org/js/telegram-web-app.js"></script>
|
||||
<script src="jquery-3.7.1.min.js"></script>
|
||||
<title>Document</title>
|
||||
</head>
|
||||
<body>
|
||||
<script>
|
||||
var tg = window.Telegram.WebApp;
|
||||
jQuery(function($) {
|
||||
$.ajax({
|
||||
'url': 'check?' + tg.initData,
|
||||
}).done(function (r) {
|
||||
location.replace('/adguard/');
|
||||
}).fail(function (r) {
|
||||
location.replace('/');
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Vendored
+2
File diff suppressed because one or more lines are too long
+23
-6
@@ -22,15 +22,17 @@ http {
|
||||
set_real_ip_from 10.10.0.10;
|
||||
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen 443 ssl http2 default_server proxy_protocol;
|
||||
listen 10.10.0.2:80 default_server;
|
||||
listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
|
||||
ssl_certificate /certs/self_public;
|
||||
ssl_certificate_key /certs/self_private;
|
||||
|
||||
access_log /logs/nginx_default_access;
|
||||
|
||||
location / {
|
||||
return 444;
|
||||
root /app;
|
||||
index login.html;
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
location /adguard/ {
|
||||
access_log /logs/nginx_adguard_access;
|
||||
@@ -38,6 +40,12 @@ http {
|
||||
proxy_redirect / /adguard/;
|
||||
proxy_cookie_path / /adguard/;
|
||||
}
|
||||
location /webapp {
|
||||
access_log /logs/nginx_webapp_access;
|
||||
alias /app;
|
||||
index index.html;
|
||||
try_files $uri $uri/ /pac?$query_string;
|
||||
}
|
||||
location /pac {
|
||||
access_log /logs/nginx_pac_access;
|
||||
proxy_pass http://php;
|
||||
@@ -67,11 +75,12 @@ http {
|
||||
|
||||
#-domain
|
||||
# server {
|
||||
# listen 80;
|
||||
# listen 10.10.0.2:80;
|
||||
# server_name ;
|
||||
#-domain
|
||||
#-ssl
|
||||
# listen 443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.0.2:443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.1.2:443 ssl http2;
|
||||
# ssl_certificate /certs/cert_public;
|
||||
# ssl_certificate_key /certs/cert_private;
|
||||
#-ssl
|
||||
@@ -80,7 +89,9 @@ http {
|
||||
# access_log /logs/nginx_domain_access;
|
||||
|
||||
# location / {
|
||||
# return 444;
|
||||
# root /app;
|
||||
# index login.html;
|
||||
# try_files $uri $uri/ =404;
|
||||
# }
|
||||
# location /adguard/ {
|
||||
# access_log /logs/nginx_adguard_access;
|
||||
@@ -88,6 +99,12 @@ http {
|
||||
# proxy_redirect / /adguard/;
|
||||
# proxy_cookie_path / /adguard/;
|
||||
# }
|
||||
# location /webapp {
|
||||
# access_log /logs/nginx_webapp_access;
|
||||
# alias /app;
|
||||
# index index.html;
|
||||
# try_files $uri $uri/ /pac?$query_string;
|
||||
# }
|
||||
# location /pac {
|
||||
# access_log /logs/nginx_pac_access;
|
||||
# proxy_pass http://php;
|
||||
|
||||
@@ -22,15 +22,17 @@ http {
|
||||
set_real_ip_from 10.10.0.10;
|
||||
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen 443 ssl http2 default_server proxy_protocol;
|
||||
listen 10.10.0.2:80 default_server;
|
||||
listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
|
||||
ssl_certificate /certs/self_public;
|
||||
ssl_certificate_key /certs/self_private;
|
||||
|
||||
access_log /logs/nginx_default_access;
|
||||
|
||||
location / {
|
||||
return 444;
|
||||
root /app;
|
||||
index login.html;
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
location /adguard/ {
|
||||
access_log /logs/nginx_adguard_access;
|
||||
@@ -38,6 +40,12 @@ http {
|
||||
proxy_redirect / /adguard/;
|
||||
proxy_cookie_path / /adguard/;
|
||||
}
|
||||
location /webapp {
|
||||
access_log /logs/nginx_webapp_access;
|
||||
alias /app;
|
||||
index index.html;
|
||||
try_files $uri $uri/ /pac?$query_string;
|
||||
}
|
||||
location /pac {
|
||||
access_log /logs/nginx_pac_access;
|
||||
proxy_pass http://php;
|
||||
@@ -67,11 +75,12 @@ http {
|
||||
|
||||
#-domain
|
||||
# server {
|
||||
# listen 80;
|
||||
# listen 10.10.0.2:80;
|
||||
# server_name ;
|
||||
#-domain
|
||||
#-ssl
|
||||
# listen 443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.0.2:443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.1.2:443 ssl http2;
|
||||
# ssl_certificate /certs/cert_public;
|
||||
# ssl_certificate_key /certs/cert_private;
|
||||
#-ssl
|
||||
@@ -80,7 +89,9 @@ http {
|
||||
# access_log /logs/nginx_domain_access;
|
||||
|
||||
# location / {
|
||||
# return 444;
|
||||
# root /app;
|
||||
# index login.html;
|
||||
# try_files $uri $uri/ =404;
|
||||
# }
|
||||
# location /adguard/ {
|
||||
# access_log /logs/nginx_adguard_access;
|
||||
@@ -88,6 +99,12 @@ http {
|
||||
# proxy_redirect / /adguard/;
|
||||
# proxy_cookie_path / /adguard/;
|
||||
# }
|
||||
# location /webapp {
|
||||
# access_log /logs/nginx_webapp_access;
|
||||
# alias /app;
|
||||
# index index.html;
|
||||
# try_files $uri $uri/ /pac?$query_string;
|
||||
# }
|
||||
# location /pac {
|
||||
# access_log /logs/nginx_pac_access;
|
||||
# proxy_pass http://php;
|
||||
|
||||
+80
-44
@@ -12,6 +12,10 @@ networks:
|
||||
ipam:
|
||||
config:
|
||||
- subnet: 10.10.0.0/24
|
||||
xray:
|
||||
ipam:
|
||||
config:
|
||||
- subnet: 10.10.1.0/24
|
||||
volumes:
|
||||
adguard:
|
||||
|
||||
@@ -41,8 +45,11 @@ services:
|
||||
condition: service_started
|
||||
ss:
|
||||
condition: service_started
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_upstream.sh"]
|
||||
networks:
|
||||
@@ -66,6 +73,8 @@ services:
|
||||
- ./ssh:/ssh
|
||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||
- ./logs/:/logs/
|
||||
- ./app/webapp:/app
|
||||
- ./app/login.html:/app/login.html
|
||||
ports:
|
||||
- 80:80
|
||||
hostname: nginx
|
||||
@@ -73,21 +82,27 @@ services:
|
||||
depends_on:
|
||||
up:
|
||||
condition: service_started
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
SSPORT: ${SSPORT}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_ng.sh"]
|
||||
networks:
|
||||
default:
|
||||
ipv4_address: 10.10.0.2
|
||||
xray:
|
||||
ipv4_address: 10.10.1.2
|
||||
logging: *default-logging
|
||||
php:
|
||||
image: mercurykd/vpnbot-php:1.1
|
||||
image: mercurykd/vpnbot-php:1.2
|
||||
build:
|
||||
dockerfile: dockerfile/php.dockerfile
|
||||
args:
|
||||
image: ${IMAGE}
|
||||
ports:
|
||||
- 127.0.0.1:8081:8080
|
||||
volumes:
|
||||
- ./config/.profile:/root/.ashrc:ro
|
||||
- ./config/php.ini:/etc/php81/php.ini
|
||||
@@ -103,15 +118,13 @@ services:
|
||||
- ./.env:/mirror/.env
|
||||
- ./update:/update
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
IP: ${IP}
|
||||
ADDRESS: ${WGADDRESS}
|
||||
WGPORT: ${WGPORT}
|
||||
WG1ADDRESS: ${WG1ADDRESS}
|
||||
WG1PORT: ${WG1PORT}
|
||||
SSPORT: ${SSPORT}
|
||||
TGPORT: ${TGPORT}
|
||||
VER: ${VER}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
hostname: php
|
||||
container_name: php-${VER}
|
||||
restart: unless-stopped
|
||||
@@ -130,7 +143,7 @@ services:
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
service:
|
||||
image: mercurykd/vpnbot-php:1.1
|
||||
image: mercurykd/vpnbot-php:1.2
|
||||
build:
|
||||
dockerfile: dockerfile/php.dockerfile
|
||||
args:
|
||||
@@ -146,15 +159,13 @@ services:
|
||||
- ./update:/update
|
||||
- ./scripts/start_service.sh:/start_service.sh
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
IP: ${IP}
|
||||
ADDRESS: ${WGADDRESS}
|
||||
WGPORT: ${WGPORT}
|
||||
WG1ADDRESS: ${WG1ADDRESS}
|
||||
WG1PORT: ${WG1PORT}
|
||||
SSPORT: ${SSPORT}
|
||||
TGPORT: ${TGPORT}
|
||||
VER: ${VER}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
hostname: service
|
||||
container_name: service-${VER}
|
||||
# restart: unless-stopped
|
||||
@@ -200,7 +211,11 @@ services:
|
||||
ipv4_address: 10.10.0.3
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
SSPORT: ${SSPORT}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_proxy.sh"]
|
||||
logging: *default-logging
|
||||
@@ -227,11 +242,13 @@ services:
|
||||
condition: service_healthy
|
||||
ports:
|
||||
- ${WGPORT}:${WGPORT}/udp
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
WGPORT: ${WGPORT}
|
||||
ADDRESS: ${WGADDRESS}
|
||||
ENV: /root/.ashrc
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
devices:
|
||||
@@ -265,11 +282,13 @@ services:
|
||||
condition: service_healthy
|
||||
ports:
|
||||
- ${WG1PORT}:${WG1PORT}/udp
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
WGPORT: ${WG1PORT}
|
||||
ADDRESS: ${WG1ADDRESS}
|
||||
ENV: /root/.ashrc
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
devices:
|
||||
@@ -304,8 +323,11 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
networks:
|
||||
default:
|
||||
@@ -334,9 +356,11 @@ services:
|
||||
ports:
|
||||
- ${SSPORT}:${SSPORT}/tcp
|
||||
- ${SSPORT}:${SSPORT}/udp
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
SSPORT: ${SSPORT}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_ss.sh"]
|
||||
networks:
|
||||
@@ -361,9 +385,12 @@ services:
|
||||
ports:
|
||||
- ${TGPORT}:${TGPORT}
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
IP: ${IP}
|
||||
TGPORT: ${TGPORT}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_tg.sh"]
|
||||
networks:
|
||||
@@ -387,16 +414,21 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_xray.sh"]
|
||||
networks:
|
||||
default:
|
||||
ipv4_address: 10.10.0.9
|
||||
xray:
|
||||
ipv4_address: 10.10.1.9
|
||||
logging: *default-logging
|
||||
oc:
|
||||
image: mercurykd/vpnbot-oc:1.1
|
||||
image: mercurykd/vpnbot-oc:1.2
|
||||
build:
|
||||
dockerfile: dockerfile/ocserv.dockerfile
|
||||
args:
|
||||
@@ -413,9 +445,11 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
ENV: /root/.ashrc
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_oc.sh"]
|
||||
cap_add:
|
||||
@@ -444,9 +478,11 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
TZ: ${TZ}
|
||||
ENV: /root/.ashrc
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_np.sh"]
|
||||
cap_add:
|
||||
|
||||
@@ -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,8 @@ b:
|
||||
docker compose build
|
||||
u: # запуск контейнеров
|
||||
bash ./update/update.sh &
|
||||
IP=$(shell curl https://ipinfo.io/ip) VER=$(shell git describe --tags) docker compose up -d --force-recreate
|
||||
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
|
||||
d: # остановка контейнеров
|
||||
-kill -9 $(shell cat ./update/update_pid) > /dev/null
|
||||
docker compose down --remove-orphans
|
||||
@@ -55,4 +56,6 @@ s:
|
||||
c:
|
||||
git add config/
|
||||
git checkout .
|
||||
git reset
|
||||
git reset
|
||||
webhook:
|
||||
docker compose exec php php checkwebhook.php
|
||||
@@ -62,19 +62,17 @@ telegram bot to manage servers (inside the bot)
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/431ec09d-9c14-4c74-b8f6-e49c142132e8" width="200">
|
||||
|
||||
---
|
||||
environment: ubuntu 18.04/20.04/22.04, debian 11
|
||||
environment: ubuntu 18.04/20.04/22.04, debian 11/12
|
||||
|
||||
install:
|
||||
|
||||
`wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY`
|
||||
|
||||
---
|
||||
|
||||
additional options:
|
||||
|
||||
install as service(autoload on start):
|
||||
### Install:
|
||||
|
||||
```shell
|
||||
wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY
|
||||
```
|
||||
|
||||
### Install as service (autoload on start):
|
||||
|
||||
```shell
|
||||
cd /root/vpnbot
|
||||
bash scripts/install_as_service.sh
|
||||
```
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
cp scripts/vpnbot.service /etc/systemd/system/vpnbot.service
|
||||
path=`pwd`
|
||||
sed "s|path|$path|g" "$path/scripts/vpnbot.service" > /etc/systemd/system/vpnbot.service
|
||||
systemctl daemon-reload
|
||||
systemctl enable vpnbot
|
||||
|
||||
@@ -6,4 +6,4 @@ php cron.php &
|
||||
unitd --log /logs/unit_error
|
||||
curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
|
||||
pkill unitd
|
||||
unitd --no-daemon --log /logs/unit_error
|
||||
unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
|
||||
|
||||
@@ -4,9 +4,4 @@ ssh-keygen -A
|
||||
exec /usr/sbin/sshd -D -e "$@" &
|
||||
curl -s https://core.telegram.org/getProxySecret -o proxy-secret
|
||||
curl -s https://core.telegram.org/getProxyConfig -o proxy-multi.conf
|
||||
if [ $(cat /mtprotosecret | wc -c) -gt 0 ]
|
||||
then
|
||||
SECRET=$(cat /mtprotosecret)
|
||||
mtproto-proxy -u nobody -H $TGPORT --nat-info 10.10.0.8:$IP -S $SECRET --aes-pwd /proxy-secret /proxy-multi.conf -M 1
|
||||
fi
|
||||
tail -f /dev/null
|
||||
|
||||
+23
-8
@@ -3,16 +3,31 @@ 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 ]
|
||||
if [ "$HOSTNAME" = "wireguard1" ]
|
||||
then
|
||||
PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
|
||||
echo "[Interface]" > /etc/wireguard/wg0.conf
|
||||
echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
|
||||
echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
|
||||
echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
|
||||
if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
|
||||
then
|
||||
PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
|
||||
echo "[Interface]" > /etc/wireguard/wg0.conf
|
||||
echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
|
||||
echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
|
||||
echo "ListenPort = $WG1PORT" >> /etc/wireguard/wg0.conf
|
||||
else
|
||||
sed "s/ListenPort = [0-9]\+/ListenPort = $WG1PORT/" /etc/wireguard/wg0.conf > change_port
|
||||
cat change_port > /etc/wireguard/wg0.conf
|
||||
fi
|
||||
else
|
||||
sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
|
||||
cat change_port > /etc/wireguard/wg0.conf
|
||||
if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
|
||||
then
|
||||
PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
|
||||
echo "[Interface]" > /etc/wireguard/wg0.conf
|
||||
echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
|
||||
echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
|
||||
echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
|
||||
else
|
||||
sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
|
||||
cat change_port > /etc/wireguard/wg0.conf
|
||||
fi
|
||||
fi
|
||||
iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT
|
||||
iptables -t nat -A POSTROUTING -o $INTERFACE -j MASQUERADE
|
||||
|
||||
@@ -3,10 +3,14 @@ Description=VPN: Docker Compose Application Service
|
||||
Requires=docker.service
|
||||
After=docker.service
|
||||
[Service]
|
||||
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
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
WorkingDirectory=path
|
||||
ExecStartPre=/bin/sh -c "touch ./override.env"
|
||||
ExecStart=/bin/sh -c "IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env 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
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
@url = http://127.0.0.1:8081
|
||||
###
|
||||
|
||||
GET {{url}}/status
|
||||
###
|
||||
GET {{url}}/config
|
||||
@@ -1,3 +1,31 @@
|
||||
20.03.2024 v1.11
|
||||
- XTLS-Reality steal from yourself
|
||||
18.03.2024 v1.10
|
||||
- MTProto Fake-TLS
|
||||
17.03.2024 v1.9
|
||||
- автоматический технический домен sslip
|
||||
13.03.2024 v1.8.10
|
||||
- фикс override.env
|
||||
10.03.2024 v1.8.9
|
||||
- веб морда адгварда "встроена" в телеграм
|
||||
- мелкие улучшения меню
|
||||
07.03.2024 v1.8.8
|
||||
- фикс не работающего wireguard
|
||||
07.03.2024 v1.8.7
|
||||
- фикс порта амнезии
|
||||
- у кого ошибка запуска обновите докер и докер композ
|
||||
07.03.2024 v1.8.6
|
||||
- фикс синхронизации клиентов амнезии, бот падал после рестарта, клиенты пропадали
|
||||
- возможность переназначить порты в override.env, файл не отслеживаемый, обновление не будет его сбрасывать
|
||||
- убрал дублирование образа php
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user