Критические исправления: - safe_proxy_restart: удаление lock-файла после фонового перезапуска с защитой от stale lock (>300 сек) - write_json_file: атомарная запись через tmp+mv вместо прямой - write_reload_state: атомарная запись через tmp+mv - state_add_list: отклонение значений с пробелами Исправления безопасности: - killall logread заменён на pkill -f 'logread -f' - SIGTERM→SIGKILL для Telegram и sing-box при остановке - Recover OOM scale: инкремент +0.05 каждые 10 минут - nfqueue и byedpi: trap для корректного завершения дочерних процессов - nfqueue: валидация стратегий и откат при ошибке запуска - nfqueue: flush mangle_output перед добавлением правил - Исправлен парсинг exit code в 14 файлах (status & 127) Улучшения стабильности: - init.d: trap для start_service/stop_service - watchdog: signal traps для legacy fallback loop - lifecycle: логирование ошибок при остановке компонентов - singbox/priority: SIGTERM→SIGKILL при остановке - telegram: exponential backoff (1x→300s) при ошибках API - telegram: process_updates возвращает boolean для отслеживания успеха - watchdog: кэш proxy port для уменьшения чтения конфига sing-box - singbox/generator: упрощён atomic_write_json_file - packages.uc: переупорядочивание apk_version (лёгкие запросы первыми) - dns/apply: проверка PID sing-box перед настройкой dnsmasq - server/service: cleanup_orphaned_server_certs перед вызовом
320 lines
10 KiB
Ucode
320 lines
10 KiB
Ucode
#!/usr/bin/env ucode
|
|
|
|
let fs = require("fs");
|
|
let uci = require("core.uci");
|
|
|
|
const CONFIG_NAME = getenv("TACHYON_CONFIG_NAME") || "tachyon";
|
|
const SB_DNS_INBOUND_ADDRESS = getenv("SB_DNS_INBOUND_ADDRESS") || "127.0.0.42";
|
|
const DNSMASQ_INIT = getenv("DNSMASQ_INIT") || "/etc/init.d/dnsmasq";
|
|
const HOSTS_CACHE_FILE = getenv("TACHYON_HOSTS_CACHE_FILE") || "/etc/tachyon/hosts-lists/combined.txt";
|
|
|
|
function as_string(value) {
|
|
return value == null ? "" : "" + value;
|
|
}
|
|
|
|
function shell_quote(value) {
|
|
return "'" + replace(as_string(value), /'/g, "'\\''") + "'";
|
|
}
|
|
|
|
function run(command) {
|
|
return system(command) == 0;
|
|
}
|
|
|
|
function uci_available() {
|
|
return uci.available();
|
|
}
|
|
|
|
function uci_get(path) {
|
|
return uci.get(path);
|
|
}
|
|
|
|
function uci_exists(path) {
|
|
return uci.exists(path);
|
|
}
|
|
|
|
function uci_delete(path) {
|
|
uci.delete(path);
|
|
}
|
|
|
|
function uci_set(path, value) {
|
|
uci.set(path, value);
|
|
}
|
|
|
|
function uci_add_list(path, value) {
|
|
uci.add_list(path, value);
|
|
}
|
|
|
|
function uci_del_list(path, value) {
|
|
return uci.del_list(path, value);
|
|
}
|
|
|
|
function uci_commit(package_name) {
|
|
uci.commit(package_name);
|
|
}
|
|
|
|
function words(value) {
|
|
value = trim(as_string(value));
|
|
return value == "" ? [] : split(value, /[ \t\r\n]+/);
|
|
}
|
|
|
|
function truthy(value) {
|
|
value = lc(as_string(value));
|
|
return value == "1" || value == "true" || value == "yes" || value == "on";
|
|
}
|
|
|
|
function list_has(values, needle) {
|
|
for (let value in words(values))
|
|
if (value == needle)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
function log(message, level) {
|
|
level = as_string(level || "info");
|
|
run("logger -t " + shell_quote("tachyon") + " " + shell_quote("[" + level + "] " + as_string(message)));
|
|
}
|
|
|
|
function restart_dnsmasq() {
|
|
return run("[ -x " + shell_quote(DNSMASQ_INIT) + " ] && " + shell_quote(DNSMASQ_INIT) + " restart");
|
|
}
|
|
|
|
function dnsmasq_legacy_instance_exists() {
|
|
return uci_exists("dhcp.tachyon");
|
|
}
|
|
|
|
function dnsmasq_default_servers() {
|
|
return uci_get("dhcp.@dnsmasq[0].server");
|
|
}
|
|
|
|
function dnsmasq_default_has_tachyon_dns() {
|
|
return list_has(dnsmasq_default_servers(), SB_DNS_INBOUND_ADDRESS);
|
|
}
|
|
|
|
function dnsmasq_has_tachyon_dns() {
|
|
return dnsmasq_default_has_tachyon_dns() || dnsmasq_legacy_instance_exists();
|
|
}
|
|
|
|
function dnsmasq_has_tachyon_managed_state() {
|
|
return uci_get("dhcp.@dnsmasq[0].tachyon_server") != "" ||
|
|
uci_get("dhcp.@dnsmasq[0].tachyon_noresolv") != "" ||
|
|
uci_get("dhcp.@dnsmasq[0].tachyon_cachesize") != "" ||
|
|
uci_get("dhcp.@dnsmasq[0].tachyon_notinterface") != "" ||
|
|
dnsmasq_legacy_instance_exists();
|
|
}
|
|
|
|
function dnsmasq_management_disabled() {
|
|
return truthy(uci_get(CONFIG_NAME + ".settings.dont_touch_dhcp"));
|
|
}
|
|
|
|
function dnsmasq_default_config_is_complete() {
|
|
return dnsmasq_default_has_tachyon_dns() &&
|
|
uci_get("dhcp.@dnsmasq[0].noresolv") == "1" &&
|
|
uci_get("dhcp.@dnsmasq[0].cachesize") == "0" &&
|
|
!dnsmasq_legacy_instance_exists();
|
|
}
|
|
|
|
function dnsmasq_legacy_interfaces() {
|
|
let legacy_dnsmasq_section = "tachyon";
|
|
let legacy_interfaces = uci_get("dhcp." + legacy_dnsmasq_section + ".interface");
|
|
if (legacy_interfaces == "")
|
|
legacy_interfaces = uci_get(CONFIG_NAME + ".settings.source_network_interfaces");
|
|
if (legacy_interfaces == "")
|
|
legacy_interfaces = "br-lan";
|
|
|
|
return legacy_interfaces;
|
|
}
|
|
|
|
function backup_dnsmasq_config_option(key, backup_key) {
|
|
if (uci_get("dhcp.@dnsmasq[0]." + backup_key) != "")
|
|
return;
|
|
|
|
let value = uci_get("dhcp.@dnsmasq[0]." + key);
|
|
if (value != "")
|
|
uci_set("dhcp.@dnsmasq[0]." + backup_key, value);
|
|
}
|
|
|
|
function backup_dnsmasq_server_list() {
|
|
if (uci_get("dhcp.@dnsmasq[0].tachyon_server") != "")
|
|
return;
|
|
|
|
for (let server in words(dnsmasq_default_servers())) {
|
|
if (server != SB_DNS_INBOUND_ADDRESS)
|
|
uci_add_list("dhcp.@dnsmasq[0].tachyon_server", server);
|
|
}
|
|
}
|
|
|
|
function restore_dnsmasq_config_option(key, backup_key, default_value) {
|
|
let value = uci_get("dhcp.@dnsmasq[0]." + backup_key);
|
|
if (value != "") {
|
|
uci_set("dhcp.@dnsmasq[0]." + key, value);
|
|
uci_delete("dhcp.@dnsmasq[0]." + backup_key);
|
|
}
|
|
else if (as_string(default_value) != "") {
|
|
uci_set("dhcp.@dnsmasq[0]." + key, default_value);
|
|
}
|
|
else {
|
|
uci_delete("dhcp.@dnsmasq[0]." + key);
|
|
}
|
|
}
|
|
|
|
function dnsmasq_cleanup_legacy_instance() {
|
|
let legacy_instance_present = dnsmasq_legacy_instance_exists();
|
|
let legacy_interfaces = legacy_instance_present ? dnsmasq_legacy_interfaces() : "";
|
|
|
|
uci_delete("dhcp.tachyon");
|
|
|
|
let backup_notinterfaces = uci_get("dhcp.@dnsmasq[0].tachyon_notinterface");
|
|
if (backup_notinterfaces != "") {
|
|
uci_delete("dhcp.@dnsmasq[0].notinterface");
|
|
for (let value in words(backup_notinterfaces))
|
|
uci_add_list("dhcp.@dnsmasq[0].notinterface", value);
|
|
uci_delete("dhcp.@dnsmasq[0].tachyon_notinterface");
|
|
return;
|
|
}
|
|
|
|
if (legacy_instance_present) {
|
|
for (let value in words(legacy_interfaces))
|
|
uci_del_list("dhcp.@dnsmasq[0].notinterface", value);
|
|
}
|
|
|
|
uci_delete("dhcp.@dnsmasq[0].tachyon_notinterface");
|
|
}
|
|
|
|
function dnsmasq_configure_default_instance() {
|
|
let default_has_tachyon_dns = dnsmasq_default_has_tachyon_dns();
|
|
|
|
backup_dnsmasq_server_list();
|
|
if (!default_has_tachyon_dns) {
|
|
backup_dnsmasq_config_option("noresolv", "tachyon_noresolv");
|
|
backup_dnsmasq_config_option("cachesize", "tachyon_cachesize");
|
|
}
|
|
|
|
backup_dnsmasq_config_option("addn_hosts", "tachyon_addn_hosts");
|
|
uci_delete("dhcp.@dnsmasq[0].addn_hosts");
|
|
|
|
uci_delete("dhcp.@dnsmasq[0].server");
|
|
uci_add_list("dhcp.@dnsmasq[0].server", SB_DNS_INBOUND_ADDRESS);
|
|
uci_set("dhcp.@dnsmasq[0].noresolv", "1");
|
|
uci_set("dhcp.@dnsmasq[0].cachesize", "0");
|
|
}
|
|
|
|
function dnsmasq_restore_default_instance() {
|
|
let server_list = dnsmasq_default_servers();
|
|
let backup_servers = uci_get("dhcp.@dnsmasq[0].tachyon_server");
|
|
let managed_global_dns = list_has(server_list, SB_DNS_INBOUND_ADDRESS);
|
|
|
|
uci_delete("dhcp.@dnsmasq[0].server");
|
|
if (backup_servers != "") {
|
|
for (let value in words(backup_servers))
|
|
uci_add_list("dhcp.@dnsmasq[0].server", value);
|
|
uci_delete("dhcp.@dnsmasq[0].tachyon_server");
|
|
}
|
|
else {
|
|
for (let value in words(server_list)) {
|
|
if (value != SB_DNS_INBOUND_ADDRESS)
|
|
uci_add_list("dhcp.@dnsmasq[0].server", value);
|
|
}
|
|
}
|
|
uci_delete("dhcp.@dnsmasq[0].tachyon_server");
|
|
|
|
let noresolv = uci_get("dhcp.@dnsmasq[0].tachyon_noresolv");
|
|
if (noresolv != "")
|
|
restore_dnsmasq_config_option("noresolv", "tachyon_noresolv", "");
|
|
else if (managed_global_dns)
|
|
uci_set("dhcp.@dnsmasq[0].noresolv", "0");
|
|
|
|
let cachesize = uci_get("dhcp.@dnsmasq[0].tachyon_cachesize");
|
|
if (cachesize != "")
|
|
restore_dnsmasq_config_option("cachesize", "tachyon_cachesize", "");
|
|
else if (managed_global_dns)
|
|
uci_set("dhcp.@dnsmasq[0].cachesize", "150");
|
|
|
|
restore_dnsmasq_config_option("addn_hosts", "tachyon_addn_hosts", "");
|
|
}
|
|
|
|
function dnsmasq_configure(force) {
|
|
if (!uci_available())
|
|
return true;
|
|
|
|
if (as_string(force) != "force" && uci_get(CONFIG_NAME + ".settings.shutdown_correctly") == "0") {
|
|
if (dnsmasq_default_config_is_complete()) {
|
|
log("Previous Tachyon shutdown was unclean; dnsmasq already points to sing-box", "info");
|
|
return true;
|
|
}
|
|
log("Previous Tachyon shutdown was unclean and dnsmasq is not ready; applying Tachyon DNS settings", "info");
|
|
}
|
|
|
|
if (as_string(force) != "force") {
|
|
let sb_pid = trim(fs.readfile("/var/run/sing-box.pid") || "");
|
|
if (sb_pid == "" || !run("kill -0 " + shell_quote(sb_pid) + " 2>/dev/null")) {
|
|
log("sing-box is not running; dnsmasq will forward to system DNS until sing-box starts", "warn");
|
|
return true;
|
|
}
|
|
}
|
|
|
|
log("Configuring dnsmasq to forward DNS to sing-box", "info");
|
|
dnsmasq_cleanup_legacy_instance();
|
|
dnsmasq_configure_default_instance();
|
|
uci_commit("dhcp");
|
|
|
|
return restart_dnsmasq();
|
|
}
|
|
|
|
function dnsmasq_restore(force, quiet) {
|
|
if (!uci_available())
|
|
return true;
|
|
|
|
if (!quiet)
|
|
log("Restoring DNS settings in dnsmasq", "info");
|
|
if (as_string(force) != "force" && uci_get(CONFIG_NAME + ".settings.shutdown_correctly") == "1") {
|
|
if (!dnsmasq_has_tachyon_dns()) {
|
|
log("dnsmasq already uses non-Tachyon DNS settings; restore is not required", "info");
|
|
return true;
|
|
}
|
|
log("Tachyon DNS settings are still present after a clean shutdown; restoring DNS settings in dnsmasq", "info");
|
|
}
|
|
|
|
dnsmasq_cleanup_legacy_instance();
|
|
dnsmasq_restore_default_instance();
|
|
uci_commit("dhcp");
|
|
|
|
return restart_dnsmasq();
|
|
}
|
|
|
|
function failsafe_restore() {
|
|
if (!uci_available())
|
|
return true;
|
|
|
|
if (dnsmasq_management_disabled()) {
|
|
if (!dnsmasq_has_tachyon_managed_state()) {
|
|
log("DNS rollback skipped: dont_touch_dhcp is enabled and no Tachyon dnsmasq changes were found", "info");
|
|
return true;
|
|
}
|
|
|
|
log("Rolling back previous Tachyon dnsmasq changes because dont_touch_dhcp is enabled", "warn");
|
|
}
|
|
else {
|
|
log("Rolling back Tachyon DNS changes in dnsmasq", "warn");
|
|
}
|
|
|
|
dnsmasq_restore("force", true);
|
|
return true;
|
|
}
|
|
|
|
let mode = ARGV[0] || "";
|
|
|
|
if (mode == "configure")
|
|
exit(dnsmasq_configure(ARGV[1]) ? 0 : 1);
|
|
else if (mode == "restore")
|
|
exit(dnsmasq_restore(ARGV[1]) ? 0 : 1);
|
|
else if (mode == "failsafe-restore")
|
|
exit(failsafe_restore() ? 0 : 1);
|
|
else if (mode == "has-tachyon-dns")
|
|
exit(dnsmasq_has_tachyon_dns() ? 0 : 1);
|
|
else if (mode == "has-managed-state")
|
|
exit(dnsmasq_has_tachyon_managed_state() ? 0 : 1);
|
|
else if (mode == "default-config-complete")
|
|
exit(dnsmasq_default_config_is_complete() ? 0 : 1);
|
|
|
|
warn("Usage: dns/apply.uc <configure|restore|failsafe-restore|has-tachyon-dns|has-managed-state|default-config-complete>\n");
|
|
exit(1); |