mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

parental-control: improve bundle sync logic

Browse source 
* handle the case when interface comes up after parental-control
* handle the case when bundle size can't be fetched for some reason
This commit is contained in:
Mohd Husaam Mehdi 2025-10-08 15:05:49 +05:30 • committed by Vivek Dutta
parent f9640bc237
commit 85e97ca660
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
parental-control/files/etc/init.d/parentalcontrol
View file

@ -14,6 +14,7 @@ validate_global_section() {
'loglevel:uinteger:3' \ 'loglevel:uinteger:3' \
'queue_num:uinteger:53' \ 'queue_num:uinteger:53' \
'bundle_path:string' \ 'bundle_path:string' \
'default_wan_interface:string:wan' \
'urlfilter:bool' 'urlfilter:bool'
} }
@ -127,11 +128,19 @@ stop_service() {
} }
reload_service() { reload_service() {
local arg="$1"
ret=$(ubus call service list '{"name":"parentalcontrol"}' | jsonfilter -qe '@.parentalcontrol.instances.parentalcontrol.running') ret=$(ubus call service list '{"name":"parentalcontrol"}' | jsonfilter -qe '@.parentalcontrol.instances.parentalcontrol.running')
if [ "$ret" != "true" ]; then if [ "$ret" != "true" ]; then
stop stop
start start
else else
if [ "$arg" = "network" ]; then
pidof_sync="$(pidof sync_bundles.sh)"
[ -n "$pidof_sync" ] && kill "$pidof_sync"
sleep 5
fi
configure_fw_rules configure_fw_rules
copy_dhcp_leases copy_dhcp_leases
ubus send parentalcontrol.reload ubus send parentalcontrol.reload
@ -139,6 +148,19 @@ reload_service() {
} }
service_triggers() { service_triggers() {
local enable urlfilter default_wan_interface
validate_global_section || {
return 1
}
if [ "${urlfilter}" = "1" ] && [ "$enable" = "1" ] && [ -n "$default_wan_interface" ]; then
log "Adding interface trigger for $default_wan_interface"
procd_open_trigger
procd_add_interface_trigger "interface.*.up" "$default_wan_interface" /etc/init.d/parentalcontrol reload "network"
procd_close_trigger
fi
procd_add_reload_trigger "parentalcontrol" procd_add_reload_trigger "parentalcontrol"
procd_add_reload_trigger "schedules" procd_add_reload_trigger "schedules"
} }

18
parental-control/files/lib/parentalcontrol/sync_bundles.sh
View file

@ -161,7 +161,23 @@ handle_download_url() {
# If the URL is HTTP, fetch the file size # If the URL is HTTP, fetch the file size
local bundle_file_size local bundle_file_size
if echo "$sanitized_url" | grep -qE "^https?://"; then if echo "$sanitized_url" | grep -qE "^https?://"; then
bundle_file_size="$(curl -I "$sanitized_url" 2>&1 | grep -i 'content-length' | cut -d: -f2 | xargs)" bundle_file_header="$(curl -Is --max-time 30 "$sanitized_url" 2>/var/log/urlfilter_curl_err.log)"
curl_rc=$?
case $curl_rc in
0)
# Success
;;
6|7|28|35|52|55|56)
log_info "handle_download_url: URL not reachable (curl rc=$curl_rc): ${sanitized_url}"
return 1
;;
*)
log_info "handle_download_url: unexpected curl rc=$curl_rc for ${sanitized_url}"
;;
esac
bundle_file_size="$(echo "$bundle_file_header" | grep -i 'content-length' | cut -d: -f2 | xargs)"
[ -z "$bundle_file_size" ] && bundle_file_size=0 [ -z "$bundle_file_size" ] && bundle_file_size=0
else else
# If it's a file:// URL, get the file size from the filesystem # If it's a file:// URL, get the file size from the filesystem