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

Merge pull request #171 from itdoginfo/fix

Browse Source 
Fix
This commit is contained in:
Kirill Sobakin
2025-09-17 19:17:58 +03:00
committed by GitHub
parent e5eff41a0f 515c0be38b
commit 340c2b3505
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
podkop/files/usr/bin/podkop
View File

@@ -240,14 +240,8 @@ migration() {
validate_service() { validate_service() {
local service="$1" local service="$1"
for domain_service in $COMMUNITY_DOMAIN_SERVICES; do for community_service in $COMMUNITY_SERVICES; do
if [ "$service" = "$domain_service" ]; then if [ "$service" = "$community_service" ]; then
return 0
fi
done
for subnet_service in $COMMUNITY_SUBNET_SERVICES; do
if [ "$service" = "$subnet_service" ]; then
return 0 return 0
fi fi
done done
@@ -977,13 +971,7 @@ configure_community_list_handler() {
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")
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")
_add_ruleset_to_dns_rules "$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,5 +63,4 @@ 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"
COMMUNITY_DOMAIN_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube hdrezka tiktok google_ai google_play hodca" COMMUNITY_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube hdrezka tiktok google_ai google_play hodca discord meta twitter cloudflare cloudfront digitalocean hetzner ovh telegram"
COMMUNITY_SUBNET_SERVICES="discord meta twitter cloudflare cloudfront digitalocean hetzner ovh telegram"

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

@@ -40,6 +40,14 @@ is_base64() {
return 1 return 1
} }
# Checks if the given string looks like a Shadowsocks userinfo
is_shadowsocks_userinfo_format() {
local str="$1"
local regex='^[^:]+:[^:]+(:[^:]+)?$'
[[ "$str" =~ $regex ]]
}
# Checks if the given file exists # Checks if the given file exists
file_exists() { file_exists() {
local filepath="$1" local filepath="$1"

6
podkop/files/usr/lib/sing_box_config_facade.sh
View File

@@ -131,8 +131,12 @@ sing_box_cf_add_proxy_outbound() {
local userinfo tag host port method password udp_over_tcp local userinfo tag host port method password udp_over_tcp
userinfo=$(url_get_userinfo "$url") userinfo=$(url_get_userinfo "$url")
if is_base64 "$userinfo"; then if ! is_shadowsocks_userinfo_format "$userinfo"; then
userinfo=$(base64_decode "$userinfo") userinfo=$(base64_decode "$userinfo")
if [ $? -ne 0 ]; then
log "Cannot decode shadowsocks userinfo or it does not match the expected format. Aborted." "fatal"
exit 1
fi
fi fi
tag=$(get_outbound_tag_by_section "$section") tag=$(get_outbound_tag_by_section "$section")