mirror of
https://codeberg.org/reverse-skill-lab/apk-reverse
synced 2026-11-15 20:34:29 +08:00
Add the layer under the software tooling, in the repository's shape: what runs on a host is measured, and every device-bound or kernel-bound piece is a gated, labelled template. - scripts/hw_watch.py: arm64 hardware watchpoints/execution breakpoints. WCR/ BCR encoders with the 8-byte-window and alignment rules (unit-tested to the canonical 0x1FFD/0x3F05), a self-contained on-device ptrace helper that compiles clean as a static aarch64 ELF (observed: cross gcc 16.2), adb orchestration, and hit decoding to module+offset. The stealth ledger is stated three times on purpose: the ptrace route leaves TracerPid visible. - scripts/ete_capture.py: CoreSight ETE capture with the five gates (kernel era, coresight sysfs, cs_etm PMU, perf-with-CORESIGHT, permission), the perf/OpenCSD build recipe, and the per-thread record wrapper whose --control one-instruction run must pass before any real capture. - scripts/trace_diff.py: differential reduction of two execution traces into first-divergence / divergent regions / blocks-unique-to-each-side. Producer-agnostic: Stalker BLK logs (raw or run_probe-wrapped) and decoded cs_etm address streams alike, host-tested on synthetic flattened-dispatcher fixtures. - scripts/kernel_instrument_scaffold.py: KPM/LKM watchpoint + register-rewrite templates plus an honest userspace carrier; every kernel file carries a NOT COMPILED AND NOT LOADED banner that verify enforces, and the register-rewrite action is fenced as experimental in the template itself. - references/hardware-watchpoints.md, references/ete-diff-tracing.md, references/kernel-event-injection.md: the mechanism, the gates, the traps, and the composition recipes (watch the key buffer; diff two runs; flip the decision at the trap), with hand-offs instead of duplication. - Registration: 3 symptom rows (SKILL.md + routing mirror), 3 reference rows, 4 script rows, coverage/route-inventory/evidence rows, capability-matrix entries, known-limitations entry, eval case 4, README trees and coverage paragraphs in both languages, and three EXTENSION evidence records stating exactly what was measured on this host (encoders, compile, fixtures, generate/verify) and what was not (no watchpoint armed, no cs_etm stream, nothing kernel-side compiled or loaded anywhere). Hardware pass 2: SPE/BRBE crash forensics, address symbolization, VM de-virtualization Calibrated against the two public obfuscator implementations the user supplied (dpkg123/ollvm-aosp-toolchain: Hikari-family and Pluto-family flattening, the xvmp IR virtualizer at 63fec41f/9b7cf75e; fetched read-only into tools/_work/refs, git-ignored). Source facts observed, runtime inferred. - scripts/trace_addr2sym.py: runtime addresses -> symbol + static offset, zero-dependency ELF64 (PT_LOAD vaddr<->file-off conversion, .dynsym/.symtab, stripped section+off fallback). Host-verified against a real cross-compiled aarch64 .so with readelf as the independent cross-check, plus a hand-built minimal ELF covering vaddr!=offset; accepts hw_watch hits, trace mod+off keys, or raw address lists. Fixes on the way: --base int coercion, and nearest-below symbol semantics for PCs in inter-symbol gaps. - scripts/vm_handler_slice.py: slice an interpreter trace into handler segments (dispatcher detection = histogram top + predecessor diversity; the first 4x-margin rule refused the calibrated fixture itself and was replaced), signature clustering, open-tail handling, and the guest-opcode trajectory via an optional handler->opcode map. Calibrated against xvmp's documented shape: vm_exec(code,size,vm_args,num) stubs, boxed arguments observable before interpretation, 11 opcodes + 19 arithmetic sub-ops, const-materialization dispatch as a distinct segment. - references/hardware-sampling-and-crash.md: SPE (data flow without a known address; PC + data address per sample), BRBE (branch records when a crash stack cannot be trusted), the crash loop (tombstone -> branch records -> symbolize), and what each adds to the OLLVM/VMP routes. All documented-and-gated: no SPE sample or BRBE record was captured here. - Flattening-recipe corrections from source: Hikari keeps a frame-resident switchVar written through an indirect pointer with scramble32-permuted cases; Pluto stores switchVar/switchXor rolling-XOR so memory only ever holds noise -- hardware-watchpoints.md's state-variable recipe now distinguishes the families, and ete-diff-tracing.md carries the family table plus the xvmp shape. AntiDebugging injects raw svc inline asm with randomized fields, so byte signatures cannot survive it; semantic site-location can. - Registration: 3 symptom rows (untrustworthy crash stack; runtime addresses needing symbols; interpreter loop reading as noise), reference/script rows, coverage/evidence/capability-matrix entries, README trees in both languages, and EXTENSION-sampling-crash.md recording exactly what was measured (real .so symbolization, slicer fixtures, the slicer's self-found dispatcher-rule bug) and what was not (no SPE/BRBE capture, no hardened binary ever traced). Fix all PR #1 review findings by severity; un-entrench the tests that pinned them Major (device-breaking / wrong results): - hw_watch: match the arm64 user_hwdebug_state slot ABI (address register first, control second -- the swap armed nothing correctly) - hw_watch: every post-seize error path now clears slots and detaches; PTRACE_O_EXITKILL turned an analysis failure into a SIGKILL of the target - hw_watch: forward genuine target SIGTRAPs (raise/tgkill/int3); only ptrace event stops are consumed -- the reference's signal-preservation promise - hw_watch: run checks push/build/chmod and the helper's exit status; a dead capture is RESULT=blocked, never ok-no-hits - hw_watch: decode offsets from the module base, not each mapping's start - ete_capture: --control now requires the control record to DECODE (perf script event lines), the documented gate, not just a zero exit - ete_capture: -o before the -- workload separator in --cmd mode; all values shell-quoted into su -c; stale remote perf.data removed first; perf exit status checked (timeout's 124 is the normal window end) - kernel scaffold: --set-reg restricted to x0..x30; the rewrite is gated by its own breakpoint event so a watchpoint hit cannot run it; LKM pins the task (get/put_task_struct) across registration and calls the four-argument register_user_hw_breakpoint; --break rows initialize .addr/.len/.bp_type (there is no .pc member); --id validated against the module-id grammar - trace_addr2sym: exact module matching (path or basename, never substring); load bias aligned against the PT_LOAD (bias = start - (foff - p_offset) - p_vaddr); PCs outside the ELF span are refused instead of landing on the last symbol; --json stdout is a pure document (RESULT= in text mode only) - trace_diff: block keys need 0x or >=8 hex digits (PIDs/counts no longer parse); vm_handler_slice: dispatcher needs predecessor diversity, no frequency-margin fallback; both JSON outputs pure (check_commands' rule) Minor/nitpick: - capability-matrix + evidence-summary: trace reduction status ok->partial (no real-target producer ran it; the file's own definition of ok) - hardware-sampling-and-crash.md and the script examples carry --elf - kernel-event-injection.md no longer claims the callback's first statement is a filter (it prints unfiltered; the filter is a required change) - Elf64 caches symbol addresses for per-row bisect - docstring coverage of the touched surface: 16.67% -> 100% Tests: every json.loads workaround stripping RESULT= is gone; new regression tests cover the slot ABI, release-on-error, SIGTRAP forwarding, non-first mapping offsets, -o placement and su -c quoting, the control decode gate, x31/--id refusals, the guarded rewrite, outside-ELF PCs and bias math, short-token refusal and the dispatcher margin rule. The minimal-ELF fixture now packs a full 8-field Elf64_Phdr (its 7-field pack silently shifted p_memsz onto p_align). 739 passed; flake8/mypy and all five gates clean. Address the follow-up review on 0bd8dfe (6 findings) - ete_capture: two-layer quoting for the control-record, decode and cleanup commands -- shlex.quote spliced between literal single quotes broke out of su -c for any spaced output name; --seconds must be positive (timeout 0 disables the timer), refused before any adb check - kernel scaffold: --set-reg now refuses sp/pc as well (the template has no rewrite path for them; a generate that silently drops the action is the misleading kind of success); both templates arm with a sampling period (LKM via hw_breakpoint_init, KPM spells out sample_period=1) -- a zero period is a non-sampling event whose callback never fires: armed, silent - trace_addr2sym: contains_vaddr tests each PT_LOAD's loaded span instead of the whole-file extent; a PC in the unmapped gap between segments is refused rather than named after the nearest symbol below - trace_diff: a bare all-digit token is indistinguishable from a date or count, so block keys need 0x or a non-decimal hex digit; a date-only log stays refused as a capture failure Tests: two-layer quoting with a spaced control name, --seconds refusal, sp/pc in the rejection list, sampling-period assertions for both templates, a two-segment gap fixture, and a date-only parser case. 743 passed; flake8, mypy and all five gates clean.
114 lines
4.8 KiB
Python
114 lines
4.8 KiB
Python
"""Unit tests for ete_capture.py: the command construction the review broke.
|
|
|
|
The capture path needs a device, so what is host-testable is exactly what the
|
|
review found wrong before: where `-o` sits relative to the `--` workload
|
|
separator, how values are quoted on their way into one `su -c '...'` string,
|
|
and that the control record is held to a decode check, not just an exit code
|
|
(the decode gate itself is asserted by construction: the control command and
|
|
the decode command are what `capture --control` runs, in that order).
|
|
"""
|
|
import shlex
|
|
|
|
from conftest import load_script
|
|
|
|
ec = load_script("ete_capture.py")
|
|
|
|
|
|
class Args:
|
|
"""The argparse namespace shape cmd_capture/perf_record_command read."""
|
|
|
|
def __init__(self, pid=None, cmd=None, seconds=10, event="cs_etm//u",
|
|
out="perf.data", control=False, serial=None):
|
|
"""The argparse namespace shape cmd_capture reads."""
|
|
self.pid = pid
|
|
self.cmd = cmd
|
|
self.seconds = seconds
|
|
self.event = event
|
|
self.out = out
|
|
self.control = control
|
|
self.serial = serial
|
|
|
|
|
|
def split_device_shell(perf_cmd):
|
|
"""What the device shell sees: strip the trailing 2>&1 and split su args."""
|
|
assert perf_cmd.endswith(" 2>&1"), perf_cmd
|
|
return shlex.split(perf_cmd[:-len(" 2>&1")])
|
|
|
|
|
|
def test_output_option_precedes_the_workload_separator():
|
|
"""`perf record` hands everything after `--` to the target command, so a
|
|
trailing `-o` is argv for the workload and perf writes to its default
|
|
path (the pull then fetches a stale file)."""
|
|
cmd = ec.perf_record_command(Args(cmd="app --flag"))
|
|
toks = split_device_shell(cmd)
|
|
assert toks[:2] == ["su", "-c"]
|
|
inner = toks[2]
|
|
sep = inner.index(" -- ") # the workload separator, not --per-thread
|
|
out_at = inner.index("-o ")
|
|
assert out_at < sep, "-o must come before the workload separator"
|
|
assert inner[sep:].startswith(" -- app --flag")
|
|
|
|
|
|
def test_pid_mode_quotes_the_pid_and_keeps_o_before_target():
|
|
"""Pid mode quotes the pid and keeps o before target."""
|
|
cmd = ec.perf_record_command(Args(pid="1234"))
|
|
inner = " ".join(split_device_shell(cmd)[2:])
|
|
assert "-p 1234" in inner
|
|
assert inner.index("-o ") < inner.index("-p 1234")
|
|
|
|
|
|
def test_values_with_quotes_cannot_break_out_of_su_c():
|
|
"""Every interpolated value travels inside one su -c string: an unquoted
|
|
single quote would close it and run the rest in the outer device shell."""
|
|
evil = "x'; rm -rf /data/local/tmp/*; '"
|
|
cmd = ec.perf_record_command(Args(cmd='sh -c "%s"' % evil,
|
|
event="cs_etm/@tmc_etr0/u"))
|
|
toks = split_device_shell(cmd)
|
|
assert toks[:2] == ["su", "-c"]
|
|
# the su argument is ONE token: the device shell never sees the payload
|
|
# as separate commands, whatever it contains
|
|
assert len(toks) == 3
|
|
inner = toks[2]
|
|
assert "perf record" in inner and "-o /data/local/tmp/perf.data" in inner
|
|
|
|
|
|
def test_out_filename_and_event_are_quoted():
|
|
"""Out filename and event are quoted."""
|
|
cmd = ec.perf_record_command(Args(pid="7", event="my event",
|
|
out="dir/my perf.data"))
|
|
toks = split_device_shell(cmd)
|
|
inner = toks[2]
|
|
assert "perf record -e 'my event'" in inner
|
|
assert "-o '/data/local/tmp/my perf.data'" in inner
|
|
|
|
|
|
def test_control_commands_exist_and_decode_runs_the_recorded_file():
|
|
"""The --control guarantee is that the record DECODES: the decode command
|
|
must point perf script at the control recording's file."""
|
|
rec = ec.control_record_command("a.ctl.data")
|
|
dec = ec.control_decode_command("a.ctl.data")
|
|
assert "perf record" in rec and "-- true" in rec and "-o a.ctl.data" in rec
|
|
assert "perf script" in dec and "-i a.ctl.data" in dec
|
|
|
|
|
|
def test_control_commands_quote_across_both_device_shell_layers():
|
|
"""A spaced output name travels inside one su -c string: quote it inside
|
|
the inner command, then quote the whole command for su -c -- a splice of
|
|
literal single quotes would run in the outer device shell."""
|
|
for cmd in (ec.control_record_command("my ctl.data"),
|
|
ec.control_decode_command("my ctl.data")):
|
|
assert cmd.endswith(" 2>&1")
|
|
toks = shlex.split(cmd[:-len(" 2>&1")])
|
|
assert toks[:2] == ["su", "-c"] and len(toks) == 3 # one su argument
|
|
assert "my ctl.data" in toks[2]
|
|
|
|
|
|
def test_seconds_must_be_a_positive_window():
|
|
"""`timeout 0` disables the timer (or kills instantly): the CLI would
|
|
wait on a record that never ends. Refused before any adb check."""
|
|
from conftest import run_script
|
|
for bad in ("0", "-5"):
|
|
r = run_script("ete_capture.py", ["capture", "--pid", "1", "--seconds", bad])
|
|
assert r.returncode == 2, (bad, r.output)
|
|
assert "--seconds" in r.output and "RESULT=refused" in r.output
|