mirror of
https://github.com/itdoginfo/podkop.git
synced 2025-12-07 03:56:55 +03:00
Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f29b97e495 | ||
|
|
41c21cebcd | ||
|
|
238e99a547 | ||
|
|
4f44fcfe99 | ||
|
|
9fd2fb9b6e | ||
|
|
c0591b25b9 | ||
|
|
97fd392334 | ||
|
|
848c784cc0 | ||
|
|
ab971dcd36 | ||
|
|
b8d96f28cd | ||
|
|
f2268fd494 | ||
|
|
19897afcdd | ||
|
|
0e2ea60f01 | ||
|
|
2dc5944961 | ||
|
|
f65de36804 | ||
|
|
19541f8bb3 | ||
|
|
aa42c707fe | ||
|
|
bf96f93987 | ||
|
|
ff9aad8947 | ||
|
|
d9718617bd | ||
|
|
e865c9f324 | ||
|
|
7df8bb5826 |
34
README.md
34
README.md
@@ -39,9 +39,9 @@ sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/mai
|
|||||||
Скачать пакеты `podkop_*.ipk` и `luci-app-podkop_*.ipk` из релиза. `opkg install` сначала первый, потом второй.
|
Скачать пакеты `podkop_*.ipk` и `luci-app-podkop_*.ipk` из релиза. `opkg install` сначала первый, потом второй.
|
||||||
|
|
||||||
# Обновление
|
# Обновление
|
||||||
Та же самая команда, что для установки. Скрипт обнаружит уже установленный podkop и предложит обновиться.
|
Та же самая команда, что для установки. Но с флагом **upgrade** сразу передёт к обновлению.
|
||||||
```
|
```
|
||||||
sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/main/install.sh)
|
sh <(wget -qO- https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/main/install.sh) --upgrade
|
||||||
```
|
```
|
||||||
|
|
||||||
# Удаление
|
# Удаление
|
||||||
@@ -73,22 +73,10 @@ Luci: Services/podkop
|
|||||||
|
|
||||||
**Custom subnets enable** - Добавить подсети или IP-адреса. Для подсетей задать маску.
|
**Custom subnets enable** - Добавить подсети или IP-адреса. Для подсетей задать маску.
|
||||||
|
|
||||||
# Известные баги
|
|
||||||
- [x] Не отрабатывает service podkop stop, если podkop запущен и не может, к пример, зарезолвить домен с сломанным DNS
|
|
||||||
- [x] Update list из remote url domain не удаляет старые домены. А добавляет новые. Для подсетей тоже самое скорее всего. Пересоздавать ruleset?
|
|
||||||
|
|
||||||
# ToDo
|
# ToDo
|
||||||
Этот раздел не означает задачи, которые нужно брать и делать. Это общий список хотелок. Если вы хотите помочь, пожалуйста, спросите сначала в телеграмме.
|
Этот раздел не означает задачи, которые нужно брать и делать. Это общий список хотелок. Если вы хотите помочь, пожалуйста, спросите сначала в телеграмме.
|
||||||
|
|
||||||
- [ ] Interface trigger
|
Основные задачи в issues.
|
||||||
- [ ] Управление sing-box с помощью podkop. sing-box disable
|
|
||||||
- [ ] Сделать галку запрещающую подкопу редачить dhcp. Допилить в исключение вместе с пустыми полями proxy и vpn (нужно wiki)
|
|
||||||
- [ ] Рестарт сервиса без рестарта dnsmasq
|
|
||||||
- [ ] `ash: can't kill pid 9848: No such process` при обновлении
|
|
||||||
- [ ] Luci: Добавить валидацию "Proxy Configuration URL". Если пустое, то ошибка. Как с интерфейсом.
|
|
||||||
- [ ] После выключения и включения может быть: `Dnsmasq save config error: server=127.0.0.42`
|
|
||||||
- [ ] Не грузится диагностика полностью при одной нерабочей комманде. Подумать как это можно дебажить легко. https://t.me/itdogchat/142500/378956
|
|
||||||
- [ ] DoH возможность добавлять сервера c path. Взять пример из NextDNS
|
|
||||||
|
|
||||||
Низкий приоритет
|
Низкий приоритет
|
||||||
- [ ] Галочка, которая режет доступ к doh серверам
|
- [ ] Галочка, которая режет доступ к doh серверам
|
||||||
@@ -111,6 +99,22 @@ Luci: Services/podkop
|
|||||||
```
|
```
|
||||||
Без этого podkop работать не будет.
|
Без этого podkop работать не будет.
|
||||||
|
|
||||||
|
Если нужно до определённых доменов ходить через определённый DNS-сервер, то конфиг выглядит так
|
||||||
|
```
|
||||||
|
option noresolv '1'
|
||||||
|
option cachesize '0'
|
||||||
|
list server '/itdog.info/1.1.1.1'
|
||||||
|
list server '127.0.0.42'
|
||||||
|
```
|
||||||
|
|
||||||
|
В этом случае домен и все субдомены ресурса itdog.info будут резолвится через DNS-сервер 1.1.1.1
|
||||||
|
|
||||||
|
# Bad WAN
|
||||||
|
При использовании опции **Interface monitoring** необходимо рестартовать podkop, чтоб init.d подхватил это
|
||||||
|
```
|
||||||
|
service podkop restart
|
||||||
|
```
|
||||||
|
|
||||||
# Разработка
|
# Разработка
|
||||||
Есть два варианта:
|
Есть два варианта:
|
||||||
- Просто поставить пакет на роутер или виртуалку и прям редактировать через SFTP (opkg install openssh-sftp-server)
|
- Просто поставить пакет на роутер или виртуалку и прям редактировать через SFTP (opkg install openssh-sftp-server)
|
||||||
|
|||||||
70
install.sh
70
install.sh
@@ -5,10 +5,17 @@ REPO="https://api.github.com/repos/itdoginfo/podkop/releases/latest"
|
|||||||
IS_SHOULD_RESTART_NETWORK=
|
IS_SHOULD_RESTART_NETWORK=
|
||||||
DOWNLOAD_DIR="/tmp/podkop"
|
DOWNLOAD_DIR="/tmp/podkop"
|
||||||
COUNT=3
|
COUNT=3
|
||||||
|
UPGRADE=0
|
||||||
|
|
||||||
rm -rf "$DOWNLOAD_DIR"
|
rm -rf "$DOWNLOAD_DIR"
|
||||||
mkdir -p "$DOWNLOAD_DIR"
|
mkdir -p "$DOWNLOAD_DIR"
|
||||||
|
|
||||||
|
for arg in "$@"; do
|
||||||
|
if [ "$arg" = "--upgrade" ]; then
|
||||||
|
UPGRADE=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
check_system
|
check_system
|
||||||
sing_box
|
sing_box
|
||||||
@@ -16,28 +23,34 @@ main() {
|
|||||||
opkg update
|
opkg update
|
||||||
|
|
||||||
if [ -f "/etc/init.d/podkop" ]; then
|
if [ -f "/etc/init.d/podkop" ]; then
|
||||||
printf "\033[32;1mPodkop is already installed. Just upgrade it? (y/n)\033[0m\n"
|
if [ "$UPGRADE" -eq 1 ]; then
|
||||||
printf "\033[32;1my - Only upgrade podkop\033[0m\n"
|
echo "Upgraded podkop with flag..."
|
||||||
printf "\033[32;1mn - Upgrade and install tunnels (WG, AWG, OpenVPN, OC)\033[0m\n"
|
break
|
||||||
|
else
|
||||||
|
printf "\033[32;1mPodkop is already installed. Just upgrade it?\033[0m\n"
|
||||||
|
printf "\033[32;1my - Only upgrade podkop\033[0m\n"
|
||||||
|
printf "\033[32;1mn - Upgrade and install tunnels (WG, AWG, OpenVPN, OC)\033[0m\n"
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
read -r -p '' UPDATE
|
printf "\033[32;1mEnter (y/n): \033[0m"
|
||||||
case $UPDATE in
|
read -r -p '' UPDATE
|
||||||
y)
|
case $UPDATE in
|
||||||
echo "Upgraded podkop..."
|
y)
|
||||||
break
|
echo "Upgraded podkop..."
|
||||||
;;
|
break
|
||||||
|
;;
|
||||||
|
|
||||||
n)
|
n)
|
||||||
add_tunnel
|
add_tunnel
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
echo "Please enter y or n"
|
echo "Please enter y or n"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "Installed podkop..."
|
echo "Installed podkop..."
|
||||||
add_tunnel
|
add_tunnel
|
||||||
@@ -425,6 +438,25 @@ check_system() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if opkg list-installed | grep -q https-dns-proxy; then
|
||||||
|
printf "\033[31;1mСonflicting package detected: https-dns-proxy. Remove? yes/no\033[0m\n"
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
read -r -p '' DNSPROXY
|
||||||
|
case $DNSPROXY in
|
||||||
|
|
||||||
|
yes|y|Y|yes)
|
||||||
|
opkg remove --force-depends luci-app-https-dns-proxy https-dns-proxy
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Exit"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
if opkg list-installed | grep -qE "iptables|kmod-iptab"; then
|
if opkg list-installed | grep -qE "iptables|kmod-iptab"; then
|
||||||
printf "\033[31;1mFound incompatible iptables packages. If you're using FriendlyWrt: https://t.me/itdogchat/44512/181082\033[0m\n"
|
printf "\033[31;1mFound incompatible iptables packages. If you're using FriendlyWrt: https://t.me/itdogchat/44512/181082\033[0m\n"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-podkop
|
PKG_NAME:=luci-app-podkop
|
||||||
PKG_VERSION:=0.3.36
|
PKG_VERSION:=0.3.42
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
LUCI_TITLE:=LuCI podkop app
|
LUCI_TITLE:=LuCI podkop app
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ function createConfigSection(section, map, network) {
|
|||||||
o = s.taboption('basic', form.TextValue, 'proxy_string', _('Proxy Configuration URL'), _(''));
|
o = s.taboption('basic', form.TextValue, 'proxy_string', _('Proxy Configuration URL'), _(''));
|
||||||
o.depends('proxy_config_type', 'url');
|
o.depends('proxy_config_type', 'url');
|
||||||
o.rows = 5;
|
o.rows = 5;
|
||||||
|
o.rmempty = false;
|
||||||
o.ucisection = s.section;
|
o.ucisection = s.section;
|
||||||
o.sectionDescriptions = new Map();
|
o.sectionDescriptions = new Map();
|
||||||
o.placeholder = 'vless://uuid@server:port?type=tcp&security=tls#main\n// backup ss://method:pass@server:port\n// backup2 vless://uuid@server:port?type=grpc&security=reality#alt';
|
o.placeholder = 'vless://uuid@server:port?type=tcp&security=tls#main\n// backup ss://method:pass@server:port\n// backup2 vless://uuid@server:port?type=grpc&security=reality#alt';
|
||||||
@@ -223,9 +224,9 @@ function createConfigSection(section, map, network) {
|
|||||||
|
|
||||||
let params = new URLSearchParams(queryString.split('#')[0]);
|
let params = new URLSearchParams(queryString.split('#')[0]);
|
||||||
let type = params.get('type');
|
let type = params.get('type');
|
||||||
const validTypes = ['tcp', 'udp', 'grpc', 'http'];
|
const validTypes = ['tcp', 'raw', 'udp', 'grpc', 'http', 'ws'];
|
||||||
if (!type || !validTypes.includes(type)) {
|
if (!type || !validTypes.includes(type)) {
|
||||||
return _('Invalid VLESS URL: type must be one of tcp, udp, grpc, http');
|
return _('Invalid VLESS URL: type must be one of tcp, raw, udp, grpc, http, ws');
|
||||||
}
|
}
|
||||||
|
|
||||||
let security = params.get('security');
|
let security = params.get('security');
|
||||||
@@ -278,7 +279,7 @@ function createConfigSection(section, map, network) {
|
|||||||
o.depends('mode', 'vpn');
|
o.depends('mode', 'vpn');
|
||||||
o.ucisection = s.section;
|
o.ucisection = s.section;
|
||||||
o.load = function (section_id) {
|
o.load = function (section_id) {
|
||||||
return getNetworkInterfaces(this, section_id, ['br-lan', 'eth0', 'eth1', 'wan', 'phy0-ap0', 'phy1-ap0', 'pppoe-wan']).then(() => {
|
return getNetworkInterfaces(this, section_id, ['br-lan', 'eth0', 'eth1', 'wan', 'phy0-ap0', 'phy1-ap0', 'pppoe-wan', 'lan']).then(() => {
|
||||||
return this.super('load', section_id);
|
return this.super('load', section_id);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -305,6 +306,7 @@ function createConfigSection(section, map, network) {
|
|||||||
o.value('hdrezka', 'HDRezka');
|
o.value('hdrezka', 'HDRezka');
|
||||||
o.value('tiktok', 'Tik-Tok');
|
o.value('tiktok', 'Tik-Tok');
|
||||||
o.value('telegram', 'Telegram');
|
o.value('telegram', 'Telegram');
|
||||||
|
o.value('cloudflare', 'Cloudflare');
|
||||||
o.depends('domain_list_enabled', '1');
|
o.depends('domain_list_enabled', '1');
|
||||||
o.rmempty = false;
|
o.rmempty = false;
|
||||||
o.ucisection = s.section;
|
o.ucisection = s.section;
|
||||||
@@ -336,13 +338,13 @@ function createConfigSection(section, map, network) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (newValues.includes('russia_inside')) {
|
if (newValues.includes('russia_inside')) {
|
||||||
const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram'];
|
const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram', 'cloudflare'];
|
||||||
const removedServices = newValues.filter(v => !allowedWithRussiaInside.includes(v));
|
const removedServices = newValues.filter(v => !allowedWithRussiaInside.includes(v));
|
||||||
if (removedServices.length > 0) {
|
if (removedServices.length > 0) {
|
||||||
newValues = newValues.filter(v => allowedWithRussiaInside.includes(v));
|
newValues = newValues.filter(v => allowedWithRussiaInside.includes(v));
|
||||||
notifications.push(E('p', { class: 'alert-message warning' }, [
|
notifications.push(E('p', { class: 'alert-message warning' }, [
|
||||||
E('strong', {}, _('Russia inside restrictions')), E('br'),
|
E('strong', {}, _('Russia inside restrictions')), E('br'),
|
||||||
_('Warning: Russia inside can only be used with Meta, Twitter, Discord, and Telegram. %s already in Russia inside and have been removed from selection.')
|
_('Warning: Russia inside can only be used with Meta, Twitter, Discord, Cloudflare and Telegram. %s already in Russia inside and have been removed from selection.')
|
||||||
.format(removedServices.join(', '))
|
.format(removedServices.join(', '))
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
@@ -805,7 +807,12 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s
|
|||||||
bypassStatus.message
|
bypassStatus.message
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
])
|
]),
|
||||||
|
ButtonFactory.createModalButton({
|
||||||
|
label: _('Global check'),
|
||||||
|
command: 'global_check',
|
||||||
|
title: _('Click here for all the info')
|
||||||
|
})
|
||||||
]),
|
]),
|
||||||
|
|
||||||
// Version Information Panel
|
// Version Information Panel
|
||||||
@@ -1043,9 +1050,9 @@ return view.extend({
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const domainRegex = /^([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$/;
|
const domainRegex = /^([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z]{2,}(\/[^\s]*)?$/;
|
||||||
if (!domainRegex.test(value)) {
|
if (!domainRegex.test(value)) {
|
||||||
return _('Invalid DNS server format. Examples: 8.8.8.8 or dns.example.com');
|
return _('Invalid DNS server format. Examples: 8.8.8.8 or dns.example.com or dns.example.com/nicedns for DoH');
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -1104,9 +1111,14 @@ return view.extend({
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
o = mainSection.taboption('additional', form.Flag, 'mon_restart_ifaces', _('Interface monitoring'), _('Interface monitoring for bad WAN'));
|
||||||
|
o.default = '0';
|
||||||
|
o.rmempty = false;
|
||||||
|
o.ucisection = 'main';
|
||||||
|
|
||||||
o = mainSection.taboption('additional', form.MultiValue, 'restart_ifaces', _('Interface for monitoring'), _('Select the WAN interfaces to be monitored'));
|
o = mainSection.taboption('additional', form.MultiValue, 'restart_ifaces', _('Interface for monitoring'), _('Select the WAN interfaces to be monitored'));
|
||||||
o.ucisection = 'main';
|
o.ucisection = 'main';
|
||||||
o.default = 'wan';
|
o.depends('mon_restart_ifaces', '1');
|
||||||
o.load = function (section_id) {
|
o.load = function (section_id) {
|
||||||
return getNetworkNetworks(this, section_id, ['lan', 'loopback']).then(() => {
|
return getNetworkNetworks(this, section_id, ['lan', 'loopback']).then(() => {
|
||||||
return this.super('load', section_id);
|
return this.super('load', section_id);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=podkop
|
PKG_NAME:=podkop
|
||||||
PKG_VERSION:=0.3.36
|
PKG_VERSION:=0.3.42
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_MAINTAINER:=ITDog <podkop@itdog.info>
|
PKG_MAINTAINER:=ITDog <podkop@itdog.info>
|
||||||
@@ -13,6 +13,7 @@ define Package/podkop
|
|||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
DEPENDS:=+sing-box +curl +jq +kmod-nft-tproxy +coreutils-base64
|
DEPENDS:=+sing-box +curl +jq +kmod-nft-tproxy +coreutils-base64
|
||||||
|
CONFLICTS:=https-dns-proxy
|
||||||
TITLE:=Domain routing app
|
TITLE:=Domain routing app
|
||||||
URL:=https://itdog.info
|
URL:=https://itdog.info
|
||||||
PKGARCH:=all
|
PKGARCH:=all
|
||||||
|
|||||||
@@ -36,5 +36,6 @@ config main 'main'
|
|||||||
option dns_rewrite_ttl '60'
|
option dns_rewrite_ttl '60'
|
||||||
option cache_file '/tmp/cache.db'
|
option cache_file '/tmp/cache.db'
|
||||||
list iface 'br-lan'
|
list iface 'br-lan'
|
||||||
list restart_ifaces 'wan'
|
option mon_restart_ifaces '0'
|
||||||
|
#list restart_ifaces 'wan'
|
||||||
option ss_uot '0'
|
option ss_uot '0'
|
||||||
@@ -10,11 +10,12 @@ config_load "$NAME"
|
|||||||
start_service() {
|
start_service() {
|
||||||
echo "Start podkop"
|
echo "Start podkop"
|
||||||
|
|
||||||
|
config_get mon_restart_ifaces "main" "mon_restart_ifaces"
|
||||||
config_get restart_ifaces "main" "restart_ifaces"
|
config_get restart_ifaces "main" "restart_ifaces"
|
||||||
|
|
||||||
procd_open_instance
|
procd_open_instance
|
||||||
procd_set_param command /usr/bin/podkop start
|
procd_set_param command /usr/bin/podkop start
|
||||||
[ -z "$restart_ifaces" ] || procd_set_param netdev $restart_ifaces
|
[ "$mon_restart_ifaces" = "1" ] && [ -n "$restart_ifaces" ] && procd_set_param netdev $restart_ifaces
|
||||||
procd_set_param stdout 1
|
procd_set_param stdout 1
|
||||||
procd_set_param stderr 1
|
procd_set_param stderr 1
|
||||||
procd_close_instance
|
procd_close_instance
|
||||||
@@ -31,12 +32,16 @@ reload_service() {
|
|||||||
service_triggers() {
|
service_triggers() {
|
||||||
echo "service_triggers start"
|
echo "service_triggers start"
|
||||||
|
|
||||||
config_get restart_ifaces "main" "restart_ifaces"
|
config_get mon_restart_ifaces "main" "mon_restart_ifaces"
|
||||||
procd_open_trigger
|
config_get restart_ifaces "main" "restart_ifaces"
|
||||||
procd_add_config_trigger "config.change" "$NAME" "$initscript" reload 'on_config_change'
|
|
||||||
|
|
||||||
for iface in $restart_ifaces; do
|
procd_open_trigger
|
||||||
procd_add_reload_interface_trigger $iface
|
procd_add_config_trigger "config.change" "$NAME" "$initscript" restart 'on_config_change'
|
||||||
done
|
|
||||||
|
if [ "$mon_restart_ifaces" = "1" ]; then
|
||||||
|
for iface in $restart_ifaces; do
|
||||||
|
procd_add_reload_interface_trigger $iface
|
||||||
|
done
|
||||||
|
fi
|
||||||
procd_close_trigger
|
procd_close_trigger
|
||||||
}
|
}
|
||||||
@@ -15,9 +15,10 @@ SUBNETS_TWITTER="${GITHUB_RAW_URL}/Subnets/IPv4/twitter.lst"
|
|||||||
SUBNETS_META="${GITHUB_RAW_URL}/Subnets/IPv4/meta.lst"
|
SUBNETS_META="${GITHUB_RAW_URL}/Subnets/IPv4/meta.lst"
|
||||||
SUBNETS_DISCORD="${GITHUB_RAW_URL}/Subnets/IPv4/discord.lst"
|
SUBNETS_DISCORD="${GITHUB_RAW_URL}/Subnets/IPv4/discord.lst"
|
||||||
SUBNETS_TELERAM="${GITHUB_RAW_URL}/Subnets/IPv4/telegram.lst"
|
SUBNETS_TELERAM="${GITHUB_RAW_URL}/Subnets/IPv4/telegram.lst"
|
||||||
|
SUBNETS_CLOUDFLARE="${GITHUB_RAW_URL}/Subnets/IPv4/cloudflare.lst"
|
||||||
SING_BOX_CONFIG="/etc/sing-box/config.json"
|
SING_BOX_CONFIG="/etc/sing-box/config.json"
|
||||||
FAKEIP="198.18.0.0/15"
|
FAKEIP="198.18.0.0/15"
|
||||||
VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram"
|
VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram cloudflare"
|
||||||
DNS_RESOLVERS="1.1.1.1 1.0.0.1 8.8.8.8 8.8.4.4 9.9.9.9 9.9.9.11 94.140.14.14 94.140.15.15 208.67.220.220 208.67.222.222 77.88.8.1 77.88.8.8"
|
DNS_RESOLVERS="1.1.1.1 1.0.0.1 8.8.8.8 8.8.4.4 9.9.9.9 9.9.9.11 94.140.14.14 94.140.15.15 208.67.220.220 208.67.222.222 77.88.8.1 77.88.8.8"
|
||||||
TEST_DOMAIN="fakeip.tech-domain.club"
|
TEST_DOMAIN="fakeip.tech-domain.club"
|
||||||
INTERFACES_LIST=""
|
INTERFACES_LIST=""
|
||||||
@@ -62,11 +63,7 @@ start_main() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if grep -qE 'doh_backup_noresolv|doh_backup_server|doh_server' /etc/config/dhcp; then
|
if grep -qE 'doh_backup_noresolv|doh_backup_server|doh_server' /etc/config/dhcp; then
|
||||||
log "[critical] Detected https-dns-proxy. Disable or uninstall it for correct functionality."
|
log "[critical] Detected https-dns-proxy in dhcp config. Edit /etc/config/dhcp"
|
||||||
fi
|
|
||||||
|
|
||||||
if grep -E "^nameserver\s+([0-9]{1,3}\.){3}[0-9]{1,3}" "$RESOLV_CONF" | grep -vqE "127\.0\.0\.1|0\.0\.0\.0"; then
|
|
||||||
log "[critical] /etc/resolv.conf contains an external nameserver"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
migration
|
migration
|
||||||
@@ -161,7 +158,7 @@ stop_main() {
|
|||||||
if [ -f /var/run/podkop_list_update.pid ]; then
|
if [ -f /var/run/podkop_list_update.pid ]; then
|
||||||
pid=$(cat /var/run/podkop_list_update.pid)
|
pid=$(cat /var/run/podkop_list_update.pid)
|
||||||
if kill -0 "$pid"; then
|
if kill -0 "$pid"; then
|
||||||
kill "$pid"
|
kill "$pid" 2>/dev/null
|
||||||
log "Stopped list_update"
|
log "Stopped list_update"
|
||||||
fi
|
fi
|
||||||
rm -f /var/run/podkop_list_update.pid
|
rm -f /var/run/podkop_list_update.pid
|
||||||
@@ -375,7 +372,8 @@ dnsmasq_add_resolver() {
|
|||||||
uci -q delete dhcp.@dnsmasq[0].podkop_server
|
uci -q delete dhcp.@dnsmasq[0].podkop_server
|
||||||
for server in $(uci get dhcp.@dnsmasq[0].server 2>/dev/null); do
|
for server in $(uci get dhcp.@dnsmasq[0].server 2>/dev/null); do
|
||||||
if [[ "$server" == "127.0.0.42" ]]; then
|
if [[ "$server" == "127.0.0.42" ]]; then
|
||||||
log "Dnsmasq save config error: server=127.0.0.42"
|
log "Dnsmasq save config error: server=127.0.0.42 is already configured. Skip editing DHCP"
|
||||||
|
return
|
||||||
else
|
else
|
||||||
uci add_list dhcp.@dnsmasq[0].podkop_server="$server"
|
uci add_list dhcp.@dnsmasq[0].podkop_server="$server"
|
||||||
fi
|
fi
|
||||||
@@ -1401,6 +1399,9 @@ list_subnets_download() {
|
|||||||
"telegram")
|
"telegram")
|
||||||
URL=$SUBNETS_TELERAM
|
URL=$SUBNETS_TELERAM
|
||||||
;;
|
;;
|
||||||
|
"cloudflare")
|
||||||
|
URL=$SUBNETS_CLOUDFLARE
|
||||||
|
;;
|
||||||
"discord")
|
"discord")
|
||||||
URL=$SUBNETS_DISCORD
|
URL=$SUBNETS_DISCORD
|
||||||
nft add set inet $table podkop_discord_subnets { type ipv4_addr\; flags interval\; auto-merge\; }
|
nft add set inet $table podkop_discord_subnets { type ipv4_addr\; flags interval\; auto-merge\; }
|
||||||
@@ -1830,6 +1831,7 @@ check_sing_box_logs() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_fakeip() {
|
check_fakeip() {
|
||||||
|
# Not used
|
||||||
nolog "Checking fakeip functionality..."
|
nolog "Checking fakeip functionality..."
|
||||||
|
|
||||||
if ! command -v nslookup >/dev/null 2>&1; then
|
if ! command -v nslookup >/dev/null 2>&1; then
|
||||||
@@ -1952,7 +1954,7 @@ show_sing_box_config() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_config() {
|
show_config() {
|
||||||
nolog "Current podkop configuration:"
|
nolog "📄 Current podkop configuration:"
|
||||||
|
|
||||||
if [ ! -f /etc/config/podkop ]; then
|
if [ ! -f /etc/config/podkop ]; then
|
||||||
nolog "Configuration file not found"
|
nolog "Configuration file not found"
|
||||||
@@ -1971,6 +1973,7 @@ show_config() {
|
|||||||
-e 's/\(pbk=[^&]*\)/pbk=MASKED/g' \
|
-e 's/\(pbk=[^&]*\)/pbk=MASKED/g' \
|
||||||
-e 's/\(sid=[^&]*\)/sid=MASKED/g' \
|
-e 's/\(sid=[^&]*\)/sid=MASKED/g' \
|
||||||
-e 's/\(option dns_server '\''[^'\'']*\.dns\.nextdns\.io'\''\)/option dns_server '\''MASKED.dns.nextdns.io'\''/g' \
|
-e 's/\(option dns_server '\''[^'\'']*\.dns\.nextdns\.io'\''\)/option dns_server '\''MASKED.dns.nextdns.io'\''/g' \
|
||||||
|
-e "s|\(option dns_server 'dns\.nextdns\.io\)/[^']*|\1/MASKED|"
|
||||||
> "$tmp_config"
|
> "$tmp_config"
|
||||||
|
|
||||||
cat "$tmp_config"
|
cat "$tmp_config"
|
||||||
@@ -1978,17 +1981,17 @@ show_config() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_version() {
|
show_version() {
|
||||||
local version=$(opkg info podkop | grep -m 1 "Version:" | cut -d' ' -f2)
|
local version=$(opkg list-installed podkop | awk '{print $3}')
|
||||||
echo "$version"
|
echo "$version"
|
||||||
}
|
}
|
||||||
|
|
||||||
show_luci_version() {
|
show_luci_version() {
|
||||||
local version=$(opkg info luci-app-podkop | grep -m 1 "Version:" | cut -d' ' -f2)
|
local version=$(opkg list-installed luci-app-podkop | awk '{print $3}')
|
||||||
echo "$version"
|
echo "$version"
|
||||||
}
|
}
|
||||||
|
|
||||||
show_sing_box_version() {
|
show_sing_box_version() {
|
||||||
local version=$(opkg info sing-box | grep -m 1 "Version:" | cut -d' ' -f2)
|
local version=$(sing-box version | head -n 1 | awk '{print $3}')
|
||||||
echo "$version"
|
echo "$version"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2088,6 +2091,9 @@ check_dns_available() {
|
|||||||
if echo "$dns_server" | grep -q "\.dns\.nextdns\.io$"; then
|
if echo "$dns_server" | grep -q "\.dns\.nextdns\.io$"; then
|
||||||
local nextdns_id=$(echo "$dns_server" | cut -d'.' -f1)
|
local nextdns_id=$(echo "$dns_server" | cut -d'.' -f1)
|
||||||
display_dns_server="$(echo "$nextdns_id" | sed 's/./*/g').dns.nextdns.io"
|
display_dns_server="$(echo "$nextdns_id" | sed 's/./*/g').dns.nextdns.io"
|
||||||
|
elif echo "$dns_server" | grep -q "^dns\.nextdns\.io/"; then
|
||||||
|
local masked_path=$(echo "$dns_server" | cut -d'/' -f2- | sed 's/./*/g')
|
||||||
|
display_dns_server="dns.nextdns.io/$masked_path"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$dns_type" = "doh" ]; then
|
if [ "$dns_type" = "doh" ]; then
|
||||||
@@ -2165,6 +2171,143 @@ sing_box_add_secure_dns_probe_domain() {
|
|||||||
log "DNS probe domain ${domain} configured with override to port ${override_port}"
|
log "DNS probe domain ${domain} configured with override to port ${override_port}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
global_check() {
|
||||||
|
nolog "📡 Global check run!"
|
||||||
|
|
||||||
|
nolog "Podkop $(opkg list-installed podkop | awk '{print $3}')"
|
||||||
|
nolog "LuCi App $(opkg list-installed luci-app-podkop | awk '{print $3}')"
|
||||||
|
nolog "Sing-box $(sing-box version | head -n 1 | awk '{print $3}')"
|
||||||
|
nolog "$(grep OPENWRT_RELEASE /etc/os-release | cut -d'"' -f2)"
|
||||||
|
nolog "Device: $(cat /tmp/sysinfo/model)"
|
||||||
|
|
||||||
|
printf "\n"
|
||||||
|
show_config
|
||||||
|
printf "\n"
|
||||||
|
|
||||||
|
nolog "Checking fakeip functionality..."
|
||||||
|
|
||||||
|
nolog "➡️ DNS resolution: system DNS server"
|
||||||
|
nslookup -timeout=2 $TEST_DOMAIN
|
||||||
|
|
||||||
|
local working_resolver=$(find_working_resolver)
|
||||||
|
if [ -z "$working_resolver" ]; then
|
||||||
|
nolog "❌ No working resolver found, skipping resolver check"
|
||||||
|
else
|
||||||
|
nolog "➡️ DNS resolution: external resolver ($working_resolver)"
|
||||||
|
nslookup -timeout=2 $TEST_DOMAIN $working_resolver
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Main FakeIP check
|
||||||
|
nolog "➡️ DNS resolution: sing-box DNS server (127.0.0.42)"
|
||||||
|
local result=$(nslookup -timeout=2 $TEST_DOMAIN 127.0.0.42 2>&1)
|
||||||
|
echo "$result"
|
||||||
|
|
||||||
|
if echo "$result" | grep -q "198.18"; then
|
||||||
|
nolog "✅ FakeIP is working correctly! Domain resolved to FakeIP range (198.18.x.x)"
|
||||||
|
else
|
||||||
|
nolog "❌ FakeIP test failed. Domain did not resolve to FakeIP range"
|
||||||
|
nolog "Checking if sing-box is running..."
|
||||||
|
|
||||||
|
if ! pgrep -f "sing-box" >/dev/null; then
|
||||||
|
nolog "sing-box is not running"
|
||||||
|
else
|
||||||
|
nolog "sing-box is running, but FakeIP might not be configured correctly"
|
||||||
|
nolog "Checking DNS configuration in sing-box..."
|
||||||
|
|
||||||
|
if [ -f "$SING_BOX_CONFIG" ]; then
|
||||||
|
local fakeip_enabled=$(jq -r '.dns.fakeip.enabled' "$SING_BOX_CONFIG")
|
||||||
|
local fakeip_range=$(jq -r '.dns.fakeip.inet4_range' "$SING_BOX_CONFIG")
|
||||||
|
|
||||||
|
nolog "FakeIP enabled: $fakeip_enabled"
|
||||||
|
nolog "FakeIP range: $fakeip_range"
|
||||||
|
|
||||||
|
local dns_rules=$(jq -r '.dns.rules[] | select(.server == "fakeip-server") | .domain' "$SING_BOX_CONFIG")
|
||||||
|
nolog "FakeIP domain: $dns_rules"
|
||||||
|
else
|
||||||
|
nolog "sing-box config file not found"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
printf "\n"
|
||||||
|
|
||||||
|
if grep -E "^nameserver\s+([0-9]{1,3}\.){3}[0-9]{1,3}" "$RESOLV_CONF" | grep -vqE "127\.0\.0\.1|0\.0\.0\.0"; then
|
||||||
|
nolog "❌ /etc/resolv.conf contains an external nameserver:"
|
||||||
|
cat /etc/resolv.conf
|
||||||
|
echo ""
|
||||||
|
else
|
||||||
|
nolog "✅ /etc/resolv.conf OK"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cachesize="$(uci get dhcp.@dnsmasq[0].cachesize 2>/dev/null)"
|
||||||
|
noresolv="$(uci get dhcp.@dnsmasq[0].noresolv 2>/dev/null)"
|
||||||
|
server="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
|
||||||
|
|
||||||
|
if [ "$cachesize" != "0" ] || [ "$noresolv" != "1" ] || [ "$server" != "127.0.0.42" ]; then
|
||||||
|
nolog "❌ The configuration differs from the template. 📄 DHCP config:"
|
||||||
|
awk '/^config /{p=($2=="dnsmasq")} p' /etc/config/dhcp
|
||||||
|
elif [ "$(uci get podkop.main.dont_touch_dhcp 2>/dev/null)" = "1" ]; then
|
||||||
|
nolog "⚠️ Enable dont_touch_dhcp. 📄 DHCP config:"
|
||||||
|
awk '/^config /{p=($2=="dnsmasq")} p' /etc/config/dhcp
|
||||||
|
else
|
||||||
|
nolog "✅ /etc/config/dhcp"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! pgrep -f "sing-box" >/dev/null; then
|
||||||
|
nolog "❌ sing-box is not running"
|
||||||
|
else
|
||||||
|
nolog "✅ sing-box is running"
|
||||||
|
fi
|
||||||
|
|
||||||
|
nolog "📄 NFT Table Podkop"
|
||||||
|
if ! nft list table inet PodkopTable >/dev/null 2>&1; then
|
||||||
|
nolog "PodkopTable not found"
|
||||||
|
else
|
||||||
|
nft list table inet PodkopTable
|
||||||
|
fi
|
||||||
|
|
||||||
|
nolog "📄 WAN config"
|
||||||
|
if uci show network.wan >/dev/null 2>&1; then
|
||||||
|
awk '
|
||||||
|
/^config / {
|
||||||
|
p = ($2 == "interface" && $3 == "'\''wan'\''")
|
||||||
|
proto = ""
|
||||||
|
}
|
||||||
|
p {
|
||||||
|
if ($1 == "option" && $2 == "proto") {
|
||||||
|
proto = $3
|
||||||
|
print
|
||||||
|
} else if (proto == "'\''static'\''" && $1 == "option" && ($2 == "ipaddr" || $2 == "netmask" || $2 == "gateway")) {
|
||||||
|
print " option", $2, "'\''******'\''"
|
||||||
|
} else if (proto == "'\''pppoe'\''" && $1 == "option" && ($2 == "username" || $2 == "password")) {
|
||||||
|
print " option", $2, "'\''******'\''"
|
||||||
|
} else {
|
||||||
|
print
|
||||||
|
}
|
||||||
|
}
|
||||||
|
' /etc/config/network
|
||||||
|
else
|
||||||
|
nolog "WAN not exists"
|
||||||
|
fi
|
||||||
|
|
||||||
|
CLOUDFLARE_OCTETS="103.21 103.22 103.31 104.16 104.17 104.18 104.19 104.20 104.21 104.22 104.23 \
|
||||||
|
104.24 104.25 104.26 104.27 104.28 108.162 131.0 141.101 162.158 162.159 172.64 172.65 172.66 \
|
||||||
|
172.67 172.68 172.69 172.70 172.71 173.245 188.114 190.93 197.234 198.41"
|
||||||
|
|
||||||
|
if uci show network | grep -q endpoint_host; then
|
||||||
|
uci show network | grep endpoint_host | cut -d'=' -f2 | tr -d "'\" " | while read -r host; do
|
||||||
|
if [ "$host" = "engage.cloudflareclient.com" ]; then
|
||||||
|
nolog "⚠️ WARP detected ($host)"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
ip_prefix=$(echo "$host" | cut -d'.' -f1,2)
|
||||||
|
if echo "$CLOUDFLARE_OCTETS" | grep -wq "$ip_prefix"; then
|
||||||
|
nolog "⚠️ WARP detected ($host)"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
start
|
start
|
||||||
@@ -2232,8 +2375,11 @@ case "$1" in
|
|||||||
check_dns_available)
|
check_dns_available)
|
||||||
check_dns_available
|
check_dns_available
|
||||||
;;
|
;;
|
||||||
|
global_check)
|
||||||
|
global_check
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Usage: $0 {start|stop|reload|enable|disable|main|list_update|check_proxy|check_nft|check_github|check_logs|check_sing_box_connections|check_sing_box_logs|check_fakeip|check_dnsmasq|show_config|show_version|show_sing_box_config|show_luci_version|show_sing_box_version|show_system_info|get_status|get_sing_box_status|check_dns_available}"
|
echo "Usage: $0 {start|stop|reload|enable|disable|main|list_update|check_proxy|check_nft|check_github|check_logs|check_sing_box_connections|check_sing_box_logs|check_fakeip|check_dnsmasq|show_config|show_version|show_sing_box_config|show_luci_version|show_sing_box_version|show_system_info|get_status|get_sing_box_status|check_dns_available|global_check}"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
Reference in New Issue
Block a user