mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-11 20:14:02 +01:00
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
105 lines
3.6 KiB
Bash
Executable File
105 lines
3.6 KiB
Bash
Executable File
#!/system/bin/sh
|
|
# shellcheck shell=ash
|
|
# ctl_tether.sh — focus_ctl.sh's subcommands for the tethering 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.
|
|
|
|
TETHER_PIDFILE="$STATE_DIR/tether_enforcer.pid"
|
|
|
|
tether_enforcer_pid() {
|
|
if [ -f "$TETHER_PIDFILE" ]; then
|
|
local pid
|
|
pid="$(cat "$TETHER_PIDFILE")"
|
|
if kill -0 "$pid" 2>/dev/null; then
|
|
echo "$pid"
|
|
fi
|
|
fi
|
|
}
|
|
|
|
cmd_tether_status() {
|
|
local pid
|
|
pid="$(tether_enforcer_pid)"
|
|
echo "=== Hotspot / Tethering Block Status ==="
|
|
echo "Enabled: ${TETHER_ENFORCER_ENABLED}"
|
|
if [ -n "$pid" ]; then
|
|
echo "Enforcer: RUNNING (PID $pid)"
|
|
else
|
|
echo "Enforcer: STOPPED"
|
|
fi
|
|
if [ -f "$MODE_FILE" ]; then
|
|
echo "Focus mode: $(cat "$MODE_FILE" 2>/dev/null)"
|
|
fi
|
|
[ -e "$TETHER_FORCE_FILE" ] && echo "Forced ON: YES (test active)"
|
|
[ -e "$TETHER_OVERRIDE_FILE" ] && echo "Override: YES (block SUSPENDED)"
|
|
[ -e "$TETHER_ENFORCER_STATE" ] && echo "Applied now: YES (offload off + FORWARD reject)" ||
|
|
echo "Applied now: no"
|
|
local off
|
|
off="$(settings get global "$TETHER_OFFLOAD_KEY" 2>/dev/null)"
|
|
echo "tether_offload_disabled: ${off:-<unset>}"
|
|
if iptables -C FORWARD -j "$TETHER_IPT_CHAIN" >/dev/null 2>&1; then
|
|
echo "iptables $TETHER_IPT_CHAIN: pinned to FORWARD ($(iptables -S "$TETHER_IPT_CHAIN" 2>/dev/null | grep -c '^-A') rule)"
|
|
else
|
|
echo "iptables $TETHER_IPT_CHAIN: absent (block not applied)"
|
|
fi
|
|
}
|
|
|
|
cmd_tether_start() {
|
|
local pid
|
|
pid="$(tether_enforcer_pid)"
|
|
if [ -n "$pid" ]; then
|
|
echo "Tether enforcer already running (PID $pid)"
|
|
return
|
|
fi
|
|
setsid sh "$SCRIPT_DIR/tether_enforcer.sh" </dev/null >/dev/null 2>&1 &
|
|
sleep 2
|
|
pid="$(tether_enforcer_pid)"
|
|
if [ -n "$pid" ]; then
|
|
echo "Tether enforcer started (PID $pid)"
|
|
else
|
|
echo "ERROR: tether enforcer failed to start. Check log: $TETHER_LOG"
|
|
fi
|
|
}
|
|
|
|
cmd_tether_stop() {
|
|
local pid
|
|
pid="$(tether_enforcer_pid)"
|
|
if [ -z "$pid" ]; then
|
|
echo "Tether enforcer not running"
|
|
rm -f "$TETHER_PIDFILE"
|
|
else
|
|
kill -TERM "$pid"
|
|
echo "Tether enforcer stopped (sent SIGTERM to PID $pid)"
|
|
fi
|
|
# Explicit teardown so maintenance can tether even if the daemon was already
|
|
# dead (its own TERM handler reverts too; this is the belt-and-suspenders).
|
|
iptables -D FORWARD -j "$TETHER_IPT_CHAIN" 2>/dev/null || true
|
|
iptables -F "$TETHER_IPT_CHAIN" 2>/dev/null || true
|
|
iptables -X "$TETHER_IPT_CHAIN" 2>/dev/null || true
|
|
ip6tables -D FORWARD -j "$TETHER_IPT_CHAIN" 2>/dev/null || true
|
|
ip6tables -F "$TETHER_IPT_CHAIN" 2>/dev/null || true
|
|
ip6tables -X "$TETHER_IPT_CHAIN" 2>/dev/null || true
|
|
echo "FORWARD chain $TETHER_IPT_CHAIN removed (tethering restored)"
|
|
}
|
|
|
|
cmd_tether_log() { tail -n "${1:-50}" "$TETHER_LOG" 2>/dev/null || echo "No tether log yet."; }
|
|
|
|
# Test hook: force the block ACTIVE regardless of location so the full stack can
|
|
# be validated during the day with a real second phone on the hotspot.
|
|
cmd_tether_test_on() {
|
|
touch "$TETHER_FORCE_FILE"
|
|
chmod 666 "$TETHER_FORCE_FILE" 2>/dev/null || true
|
|
rm -f "$TETHER_OVERRIDE_FILE"
|
|
echo "Tether block FORCED ON. Enforcer engages within ${TETHER_CHECK_INTERVAL}s."
|
|
echo "Validate: second phone on the hotspot loses internet; this phone stays online."
|
|
}
|
|
|
|
cmd_tether_test_off() {
|
|
rm -f "$TETHER_FORCE_FILE"
|
|
echo "Tether force cleared. Back to focus-mode-gated behaviour."
|
|
}
|