web panel adguard
This commit is contained in:
mercury
+67
-12
@@ -130,6 +130,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;
|
||||
@@ -3455,37 +3458,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 = $conf['adgbrowser'] ? "$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'];
|
||||
@@ -3503,12 +3564,6 @@ DNS-over-HTTPS with IP:
|
||||
];
|
||||
}
|
||||
}
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('check DNS'),
|
||||
'callback_data' => "/checkdns",
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('back'),
|
||||
@@ -3569,7 +3624,7 @@ DNS-over-HTTPS with IP:
|
||||
public function configMenu()
|
||||
{
|
||||
$conf = $this->getPacConf();
|
||||
$text[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\nnp.{$conf['domain']}\noc.{$conf['domain']}" : $this->i18n('domain explain');
|
||||
$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') : '';
|
||||
|
||||
|
||||
@@ -305,4 +305,16 @@ $i = [
|
||||
'en' => 'update bot',
|
||||
'ru' => 'обновить бота',
|
||||
],
|
||||
'third party browser' => [
|
||||
'en' => 'third party browser',
|
||||
'ru' => 'сторонний браузер',
|
||||
],
|
||||
'browser_notify_on' => [
|
||||
'en' => 'the web panel can now be opened in any browser',
|
||||
'ru' => 'веб панель теперь может быть открыта в любом браузере',
|
||||
],
|
||||
'browser_notify_off' => [
|
||||
'en' => 'the web panel can no longer be opened in any browser',
|
||||
'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();
|
||||
|
||||
@@ -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
@@ -69,6 +69,7 @@ services:
|
||||
- ./ssh:/ssh
|
||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||
- ./logs/:/logs/
|
||||
- ./app/webapp:/app
|
||||
ports:
|
||||
- 80:80
|
||||
hostname: nginx
|
||||
|
||||
Reference in New Issue
Block a user