yanistye/podkop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Pass HTTP proxy address to download functions for remote subnet imports

Browse Source
This commit is contained in:
Andrey Petelin
2025-09-08 23:00:26 +05:00
parent a187192a88
commit c1133827a2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
podkop/files/usr/bin/podkop
View File

@@ -1333,10 +1333,11 @@ import_domains_or_subnets_from_remote_file() {
import_subnets_from_remote_json_file() { import_subnets_from_remote_json_file() {
local url="$1" local url="$1"
local tmpfile subnets local tmpfile subnets http_proxy_address
tmpfile="$(mktemp)" tmpfile="$(mktemp)"
http_proxy_address="$(get_service_proxy_address)"
download_to_stream "$url" | jq -r '.rules[].ip_cidr[]?' > "$tmpfile" download_to_stream "$url" "$http_proxy_address" | jq -r '.rules[].ip_cidr[]?' > "$tmpfile"
if [ $? -ne 0 ] || [ ! -s "$tmpfile" ]; then if [ $? -ne 0 ] || [ ! -s "$tmpfile" ]; then
log "Download $url list failed" "error" log "Download $url list failed" "error"
@@ -1351,12 +1352,13 @@ import_subnets_from_remote_json_file() {
import_subnets_from_remote_srs_file() { import_subnets_from_remote_srs_file() {
local url="$1" local url="$1"
local binary_tmpfile json_tmpfile subnets_tmpfile subnets local binary_tmpfile json_tmpfile subnets_tmpfile subnets http_proxy_address
binary_tmpfile="$(mktemp)" binary_tmpfile="$(mktemp)"
json_tmpfile="$(mktemp)" json_tmpfile="$(mktemp)"
subnets_tmpfile="$(mktemp)" subnets_tmpfile="$(mktemp)"
http_proxy_address="$(get_service_proxy_address)"
download_to_tempfile "$url" "$binary_tmpfile" download_to_tempfile "$url" "$binary_tmpfile" "$http_proxy_address"
if [ $? -ne 0 ] || [ ! -s "$binary_tmpfile" ]; then if [ $? -ne 0 ] || [ ! -s "$binary_tmpfile" ]; then
log "Download $url list failed" "error" log "Download $url list failed" "error"