mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 18:07:06 +01:00
Krzysztof kuhy Rudnicki
3ddc13f671
The largest file in phone_focus_mode, and the last one blocking deploy.sh:
splitting it grows deploy.sh's two hardcoded lists, so those lists are only
final now. All 55 functions moved verbatim.
Three while-read loops were audited before extraction. Two call pm in their
bodies and moved untouched. The third, iter_whitelist_packages, is fed by a
pipe from printf and reads nothing from stdin -- already safe, and now said
so in ctl_usage.sh's header so the distinction is not lost by a later editor
who has only read the warning in daemon_apps.sh.
136 assertions and 22 mutations, all killed. Three survived the first run
and every one was a defect in MY OWN tests, not in the subject:
- cmd_status carries a THIRD copy of the Haversine, and I had asserted
only that it printed "some number". A wrong Earth radius sailed through.
Now the value is checked against a seeded fix ~4.3 km from home.
- the two whitelist filters were each tested with input the OTHER filter
also rejects, so either could be deleted with nothing failing. Fixed
with a punctuation-free undotted token (only the dot check rejects it)
and a dotted token carrying an illegal character (only the charset check
does), making each independently observable.
That last investigation turned up dead code: the `#*)` case arm is provably
equivalent, because `set -- $line` makes a comment's first token "#", which
the dot check already rejects. Removed rather than covered by a test that
cannot fail.
Coverage is NOT 100% and the real numbers are in the evidence: 41.79% to
92.98% across the eight, up from 5-22%. Unlike the daemon split, most of
what remains is genuinely untested -- the per-enforcer status blocks that
print mount state, APK hashes and offload settings, each needing its own
device fixture. The mutations prove the assertions that exist are load-
bearing; they do not prove those branches work.
jscpd checked in a clean worktree at 1.57%: eight files each carrying a
near-identical start/stop/status trio is exactly what that gate is for, so
the tests drive the trios through tables instead of repeating them.
Two drift hazards recorded, not fixed: ctl_is_curfew_now duplicates
daemon_location.sh's is_curfew_now (pinned by an agreement test across every
boundary minute), and cmd_status's awk is the third Haversine.
Over-cap count 17 -> 16. deploy.sh is the last one here.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011w2Pj4Ek3ZNMQVYcFHgXDY
101 lines
2.9 KiB
Bash
Executable File
101 lines
2.9 KiB
Bash
Executable File
#!/system/bin/sh
|
|
# shellcheck shell=ash
|
|
# ctl_dns.sh — focus_ctl.sh's subcommands for the DNS enforcer:
|
|
# status, start, stop and log.
|
|
#
|
|
# A flat sibling, not lib/: deploy.sh pushes phone scripts into one
|
|
# directory. Sourced by focus_ctl.sh, which owns log() and the config.sh
|
|
# globals these read. The pidfile path below lives here rather than in
|
|
# the entry script because this file is its only reader (SC2034), and
|
|
# the linter runs without -x, so each file stands alone.
|
|
|
|
DNS_PIDFILE="$STATE_DIR/dns_enforcer.pid"
|
|
|
|
dns_enforcer_pid() {
|
|
if [ -f "$DNS_PIDFILE" ]; then
|
|
local pid
|
|
pid="$(cat "$DNS_PIDFILE")"
|
|
if kill -0 "$pid" 2>/dev/null; then
|
|
echo "$pid"
|
|
fi
|
|
fi
|
|
}
|
|
|
|
cmd_dns_status() {
|
|
local pid
|
|
pid="$(dns_enforcer_pid)"
|
|
echo "=== DNS Enforcer Status ==="
|
|
if [ -n "$pid" ]; then
|
|
echo "Daemon: RUNNING (PID $pid)"
|
|
else
|
|
echo "Daemon: STOPPED"
|
|
fi
|
|
local mode spec
|
|
mode="$(settings get global private_dns_mode 2>/dev/null)"
|
|
spec="$(settings get global private_dns_specifier 2>/dev/null)"
|
|
echo "private_dns_mode: ${mode:-<unset>}"
|
|
echo "private_dns_specifier: ${spec:-<unset>}"
|
|
if iptables -L "$DNS_IPT_CHAIN" >/dev/null 2>&1; then
|
|
local v4rules
|
|
v4rules="$(iptables -S "$DNS_IPT_CHAIN" 2>/dev/null | wc -l)"
|
|
echo "iptables $DNS_IPT_CHAIN: $v4rules rules"
|
|
else
|
|
echo "iptables $DNS_IPT_CHAIN: MISSING"
|
|
fi
|
|
if ip6tables -L "$DNS_IPT_CHAIN" >/dev/null 2>&1; then
|
|
local v6rules
|
|
v6rules="$(ip6tables -S "$DNS_IPT_CHAIN" 2>/dev/null | wc -l)"
|
|
echo "ip6tables $DNS_IPT_CHAIN: $v6rules rules"
|
|
else
|
|
echo "ip6tables $DNS_IPT_CHAIN: MISSING"
|
|
fi
|
|
}
|
|
|
|
cmd_dns_start() {
|
|
local pid
|
|
pid="$(dns_enforcer_pid)"
|
|
if [ -n "$pid" ]; then
|
|
echo "DNS enforcer already running (PID $pid)"
|
|
return
|
|
fi
|
|
setsid sh "$SCRIPT_DIR/dns_enforcer.sh" </dev/null >/dev/null 2>&1 &
|
|
sleep 2
|
|
pid="$(dns_enforcer_pid)"
|
|
if [ -n "$pid" ]; then
|
|
echo "DNS enforcer started (PID $pid)"
|
|
else
|
|
echo "ERROR: DNS enforcer failed to start. Check log: $DNS_LOG"
|
|
fi
|
|
}
|
|
|
|
cmd_dns_stop() {
|
|
local pid
|
|
pid="$(dns_enforcer_pid)"
|
|
if [ -z "$pid" ]; then
|
|
echo "DNS enforcer not running"
|
|
rm -f "$DNS_PIDFILE"
|
|
else
|
|
kill -TERM "$pid"
|
|
echo "DNS enforcer stopped (sent SIGTERM to PID $pid)"
|
|
fi
|
|
# Explicit teardown of the iptables chain so maintenance work can
|
|
# use DoH. The enforcer itself leaves the chain intact on TERM to
|
|
# keep the block closed between periodic re-applies.
|
|
iptables -D OUTPUT -j "$DNS_IPT_CHAIN" 2>/dev/null || true
|
|
iptables -F "$DNS_IPT_CHAIN" 2>/dev/null || true
|
|
iptables -X "$DNS_IPT_CHAIN" 2>/dev/null || true
|
|
ip6tables -D OUTPUT -j "$DNS_IPT_CHAIN" 2>/dev/null || true
|
|
ip6tables -F "$DNS_IPT_CHAIN" 2>/dev/null || true
|
|
ip6tables -X "$DNS_IPT_CHAIN" 2>/dev/null || true
|
|
echo "iptables chain $DNS_IPT_CHAIN removed"
|
|
}
|
|
|
|
cmd_dns_log() {
|
|
local lines="${1:-50}"
|
|
if [ -f "$DNS_LOG" ]; then
|
|
tail -n "$lines" "$DNS_LOG"
|
|
else
|
|
echo "DNS enforcer log not found: $DNS_LOG"
|
|
fi
|
|
}
|