Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-08 12:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Exclusion of ruleset subnets from dns rules (#148)

Browse Source
This commit is contained in:
Andrey Petelin
2025-09-17 13:31:00 +05:00
parent 4999840340
commit bb1c06951c
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
podkop/files/usr/bin/podkop
View File

@@ -238,23 +238,29 @@ migration() {
} }
validate_service() { validate_service() {
local domain="$1" local service="$1"
for valid_service in $VALID_SERVICES; do for domain_service in $COMMUNITY_DOMAIN_SERVICES; do
if [ "$domain" = "$valid_service" ]; then if [ "$service" = "$domain_service" ]; then
return 0 return 0
fi fi
done done
log "Invalid service in domain_list: $domain. Exiting. Check config and LuCI cache" for subnet_service in $COMMUNITY_SUBNET_SERVICES; do
if [ "$service" = "$subnet_service" ]; then
return 0
fi
done
log "Invalid service in community lists: $service. Check config and LuCI cache. Aborted." "fatal"
exit 1 exit 1
} }
process_validate_service() { process_validate_service() {
local domain_list_enabled local community_lists_enabled
config_get_bool domain_list_enabled "$section" "domain_list_enabled" 0 config_get_bool community_lists_enabled "$section" "community_lists_enabled" 0
if [ "$domain_list_enabled" -eq 1 ]; then if [ "$community_lists_enabled" -eq 1 ]; then
config_list_foreach "$section" domain_list validate_service config_list_foreach "$section" "community_lists" validate_service
fi fi
} }
@@ -970,8 +976,14 @@ configure_community_list_handler() {
config_get update_interval "main" "update_interval" "1d" config_get update_interval "main" "update_interval" "1d"
config=$(sing_box_cm_add_remote_ruleset "$config" "$ruleset_tag" "$format" "$url" "$detour" "$update_interval") config=$(sing_box_cm_add_remote_ruleset "$config" "$ruleset_tag" "$format" "$url" "$detour" "$update_interval")
_add_ruleset_to_dns_rules "$ruleset_tag"
config=$(sing_box_cm_patch_route_rule "$config" "$route_rule_tag" "rule_set" "$ruleset_tag") config=$(sing_box_cm_patch_route_rule "$config" "$route_rule_tag" "rule_set" "$ruleset_tag")
for service in $COMMUNITY_DOMAIN_SERVICES; do
if [ "$tag" = "$service" ]; then
_add_ruleset_to_dns_rules "$ruleset_tag"
break
fi
done
} }
configure_user_domain_or_subnets_list() { configure_user_domain_or_subnets_list() {

3
podkop/files/usr/lib/constants.sh
View File

@@ -63,4 +63,5 @@ SUBNETS_HETZNER="${GITHUB_RAW_URL}/Subnets/IPv4/hetzner.lst"
SUBNETS_OVH="${GITHUB_RAW_URL}/Subnets/IPv4/ovh.lst" SUBNETS_OVH="${GITHUB_RAW_URL}/Subnets/IPv4/ovh.lst"
SUBNETS_DIGITALOCEAN="${GITHUB_RAW_URL}/Subnets/IPv4/digitalocean.lst" SUBNETS_DIGITALOCEAN="${GITHUB_RAW_URL}/Subnets/IPv4/digitalocean.lst"
SUBNETS_CLOUDFRONT="${GITHUB_RAW_URL}/Subnets/IPv4/cloudfront.lst" SUBNETS_CLOUDFRONT="${GITHUB_RAW_URL}/Subnets/IPv4/cloudfront.lst"
VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram cloudflare google_ai google_play hetzner ovh hodca digitalocean cloudfront" COMMUNITY_DOMAIN_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube hdrezka tiktok google_ai google_play hodca"
COMMUNITY_SUBNET_SERVICES="discord meta twitter cloudflare cloudfront digitalocean hetzner ovh telegram"

2
podkop/files/usr/lib/helpers.sh
View File

@@ -324,7 +324,7 @@ parse_domain_or_subnet_file_to_comma_string() {
local result local result
while IFS= read -r line; do while IFS= read -r line; do
line=$(echo "$line" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') line=$(echo "$line" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
log "!!! $line"
[ -z "$line" ] && continue [ -z "$line" ] && continue
case "$type" in case "$type" in