mirror of
https://github.com/newliver666/apk-reverse.git
synced 2026-09-28 21:56:59 +02:00
2beade67f2
An external audit of this repository landed on four structural findings, and this pass is the
response to them. Everything below was re-measured on this tree before being acted on; two of the
audit's claims needed a correction of my own, and both corrections are noted in place.
**The gates were optimistic, and one of them did not read content at all.**
doctor.py the capability table was hard-coded (`repack + sign = bool(java) and python`), so a
machine with a JDK and no zipalign/apksigner was told it could re-sign; the script
inventory was a hand-written list of 28 against 51 files on disk, omitting the nine
most important scripts. It now scans the directory (`registered/checked = 52 / 52`,
unjudgeable entries counted as `unknown`, never skipped) and resolves capability as a
real requires-closure, reporting BLOCKED with the missing piece and an installable
next step. Measured: the old doctor reports `[OK] repack + sign` on a JDK-only PATH
where keytool, jarsigner, zipalign, apksigner and all eight smali jars are absent.
The report is allowed to look bad; that is the point.
check_commands.py (new)
anchor checks prove a section exists, never that a command runs. This parses each
script's argparse table with `ast` and checks every documented invocation against it.
146 commands / 41 interfaces, 0 drift. It caught `sig_probe.py --live --pkg`, which
does not exist -- the reference had been wrong since it was written.
check_routing.py (new)
the symptom index now has one home (`SKILL.md`, because symptom -> file must stay one
hop) and the inventory has another (`references/routing.md`). This gate proves the
mirror agrees, that every reference file is named, and that every script is named.
**so_constpatch.py was corrupting APKs it rebuilt.** The writer copied filename and timestamp onto a
fresh ZipInfo and recompressed the whole archive: 435-entry real package, `extra` lost on 205 entries,
`external_attr` rewritten on all 435, 132 untouched entries recompressed, and `resources.arsc` pushed
to an unaligned offset. Android's own `zipalign -c -v 4` fails the old output and passes the new one;
a 26-case fixture suite pins it, and `extractNativeLibs="false"` is now refused by default with a
pointer at `repack.py`. Fixing it exposed the same defect in `repack.py`, where `^lib/[^/]+\.so$`
cannot match `lib/arm64-v8a/*.so` -- so its alignment handling had never once fired on a real APK.
**The package was not self-contained.** 59 references pointed at the repository root, which `npx
skills add` does not install. They now converge on `references/evidence-summary.md` (capability,
conclusion, strength, evidence that ships) plus `evidence/` with the machine-readable companions: 8
references remain and each is explicitly labelled "repository root, not shipped". A drill in which
the new files were copied to an isolated directory and asked three questions answered all three.
**SKILL.md: 572 lines / 15,733 tokens -> 398 lines / ~10,900 tokens**, without losing the two things
that had to stay. The symptom index remains inline; the reference and script indexes moved to the
on-demand routing file. The freed budget went into making the rules *stronger*, not shorter: the
constraints section is now a table of thirteen non-negotiable constraints each paired with the check
that catches a violation, and the tooling obligations are instructions whose violation is a defect
(hedging language in SKILL.md: 1 line, down from a paragraph of hedged advice). Long references gained
a navigation head so a reader can decide from the top whether to load one.
**New: an executable test layer.** `tests/` (unit, CLI contract, no-device integration) plus
`pytest.ini`, `tests/run_tests.py`, a minimal CI job, and `evals/evals.json` written but never run --
stated as such in the file. 608 passed / 158 skipped / 25 xfailed. The 25 xfails are a work order, not
a pass: thirteen scripts report a missing input by exiting 1 instead of 2, seven let a traceback
escape, four treat `--help` as an error, and `preflight --json` lacks a `status` field. A regression
row for `dex_patch_bytes.py` reproduces a previous artifact byte-for-byte
(`67ae1e58e7a44777e5ac8f9f823ab21e…`) and additionally pins the four bytes that may move.
**Two real defects the new tests found in the tooling itself.** `check_repo.py` decoded subprocess
output with the locale encoding, so on a GBK console a script printing an em dash in its usage line
was reported as crashed; it now decodes UTF-8 explicitly. And a CLI contract test drove a *real
attached device* through `coldstart.py` -- logcat, screenshots, five orphan `adb logcat` processes --
which is fixed twice over: child processes run in a private temporary cwd, and the fifteen
device-bound scripts are never executed beyond `--help`/argument parsing.
**Quoting on the device side is now one implementation.** `devsh.su` escaped only double quotes, so
`;`, `$( )` and backticks in a caller-supplied value still reached the device shell while
`coldstart.Device.shell` quoted correctly. Both use `scripts/device_shell.py` now: POSIX single-quote
escaping, argv arrays by default, and identifier validation that refuses a malformed package, path or
component with exit 2 instead of a traceback. The integration test that used to pin the *defect* (it
asserted `su -c "…"` with `\"` escapes) now asserts the property, across five metacharacter payloads.
Gates: check_repo 0 problems (including the content-reading identity scan over git ls-files),
check_refs 0 dangling / 0 warning, check_routing coherent (53 symptom / 45 reference / 54 script rows),
check_budget 0 failure / 0 warning with the always-loaded body now measured in tokens rather than in
"narrative lines with the index excluded", check_commands 146 checked / 0 drift, pytest 608 passed.
Not done, and stated rather than implied: CI has never run on a runner; the evals have never been
executed; the 25 xfails are open; no device-side install/launch was performed in this pass.
187 lines
7.7 KiB
Python
187 lines
7.7 KiB
Python
"""Unit tests for skills/apk-reverse/scripts/blob_decode.py.
|
|
|
|
The encoded-blob search is the part worth pinning: the whole method exists
|
|
because a single un-rotated inflate attempt fails and the failure looks like
|
|
"this is encrypted". The tests build blobs with known parameters and require the
|
|
search to recover them.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import gzip
|
|
import json
|
|
import zlib
|
|
|
|
import pytest
|
|
|
|
from conftest import load_script, run_script
|
|
|
|
blob_decode = load_script("blob_decode.py")
|
|
|
|
pytestmark = pytest.mark.unit
|
|
|
|
PAYLOAD = json.dumps({
|
|
"flags": {"newCheckout": True, "minVersion": 4210},
|
|
"endpoints": ["https://api.example.invalid/v3/config"],
|
|
"notes": "synthetic payload for the rotation search regression" * 3,
|
|
}).encode("utf-8")
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# outer encodings
|
|
# --------------------------------------------------------------------------- #
|
|
class TestOuterEncodings:
|
|
@pytest.mark.parametrize("which", ["base64", "base64url", "hex"])
|
|
def test_round_trip(self, which):
|
|
data = bytes(range(64))
|
|
encoded = blob_decode.outer_encode(data, which)
|
|
assert blob_decode.outer_decode(encoded, which) == data
|
|
|
|
def test_unknown_encoding_raises(self):
|
|
with pytest.raises(ValueError):
|
|
blob_decode.outer_encode(b"x", "rot13")
|
|
|
|
def test_undecodable_hex_returns_empty_not_an_exception(self):
|
|
"""The search calls this on candidate encodings; a raise would abort it."""
|
|
assert blob_decode.outer_decode("zzzz", "hex") == b""
|
|
|
|
def test_whitespace_and_newlines_are_stripped_before_decoding(self):
|
|
encoded = blob_decode.outer_encode(b"hello world", "base64")
|
|
wrapped = "\n".join([encoded[:4], encoded[4:]])
|
|
assert blob_decode.outer_decode(wrapped, "base64") == b"hello world"
|
|
|
|
def test_sniff_offers_all_three_encodings(self):
|
|
guesses = blob_decode.sniff_outer("aGVsbG8gd29ybGQgdGhpcyBpcyBhIHRlc3Q=")
|
|
assert set(guesses) >= {"base64", "base64url", "hex"}
|
|
|
|
def test_sniff_puts_hex_first_for_hex_shaped_text(self):
|
|
assert blob_decode.sniff_outer("deadbeef" * 8)[0] == "hex"
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# inner transforms
|
|
# --------------------------------------------------------------------------- #
|
|
class TestInnerTransforms:
|
|
def test_inflate_raw_round_trips_through_raw_deflate(self):
|
|
body = blob_decode.inflate_raw(PAYLOAD)
|
|
assert zlib.decompress(body, -15) == PAYLOAD
|
|
|
|
def test_inflate_raw_output_has_no_zlib_header(self):
|
|
"""A raw stream is what the rotation search needs: no header to mis-align."""
|
|
body = blob_decode.inflate_raw(b"x" * 200)
|
|
with pytest.raises(zlib.error):
|
|
zlib.decompress(body) # default wbits expects a zlib header
|
|
|
|
@pytest.mark.parametrize("name,blob", [
|
|
("raw", zlib.compressobj(9, zlib.DEFLATED, -15)),
|
|
("zlib", zlib.compressobj(9, zlib.DEFLATED, 15)),
|
|
("gzip", zlib.compressobj(9, zlib.DEFLATED, 31)),
|
|
])
|
|
def test_try_inflate_names_each_inner_transform(self, name, blob):
|
|
body = blob.compress(PAYLOAD) + blob.flush()
|
|
got = blob_decode.try_inflate(body)
|
|
assert got is not None
|
|
assert got[0] == name
|
|
assert got[1] == PAYLOAD
|
|
|
|
def test_try_inflate_returns_none_for_noise(self):
|
|
assert blob_decode.try_inflate(bytes(range(256))) is None
|
|
|
|
def test_gzip_is_accepted_via_the_stdlib_helper(self):
|
|
got = blob_decode.try_inflate(gzip.compress(PAYLOAD))
|
|
assert got is not None and got[0] == "gzip" and got[1] == PAYLOAD
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# scoring
|
|
# --------------------------------------------------------------------------- #
|
|
class TestScoring:
|
|
def test_structured_text_scores_above_random_bytes(self):
|
|
structured = blob_decode.score(PAYLOAD)
|
|
noise = blob_decode.score(bytes(range(256)) * 4)
|
|
assert structured > noise
|
|
|
|
def test_a_json_header_is_rewarded(self):
|
|
assert blob_decode.score(b'{"a": 1}') > blob_decode.score(b"aaaaaaaa")
|
|
|
|
def test_empty_output_scores_negative(self):
|
|
assert blob_decode.score(b"") < 0
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# the rotation search
|
|
# --------------------------------------------------------------------------- #
|
|
def rotate(body, cut):
|
|
return body[-cut:] + body[:-cut] if cut else body
|
|
|
|
|
|
class TestRotationSearch:
|
|
def _hits(self, blob, max_skip=0):
|
|
return blob_decode.search(blob, max_skip, lambda _msg: None)
|
|
|
|
def test_search_recovers_a_rotated_raw_stream(self):
|
|
body = blob_decode.inflate_raw(PAYLOAD)
|
|
cut = 7
|
|
hits = self._hits(rotate(body, cut))
|
|
matching = [h for h in hits if h["data"] == PAYLOAD]
|
|
assert matching, "the rotation with cut=%d was not recovered" % cut
|
|
assert matching[0]["cut"] == cut
|
|
assert matching[0]["inner"] == "raw"
|
|
assert matching[0]["size"] == len(PAYLOAD)
|
|
|
|
def test_search_recovers_a_prefixed_and_rotated_stream(self):
|
|
"""The `skip` arm: a short header in front of the compressed stream."""
|
|
body = blob_decode.inflate_raw(PAYLOAD)
|
|
blob = b"\x01\x02" + rotate(body, 5)
|
|
hits = self._hits(blob, max_skip=4)
|
|
matching = [h for h in hits if h["data"] == PAYLOAD]
|
|
assert matching, "skip=2 + cut=5 was not recovered"
|
|
assert matching[0]["skip"] == 2
|
|
|
|
def test_search_on_noise_returns_no_hits(self):
|
|
assert self._hits(bytes(range(64))) == []
|
|
|
|
def test_scores_are_reported_rounded(self):
|
|
body = blob_decode.inflate_raw(PAYLOAD)
|
|
hits = self._hits(body)
|
|
assert hits
|
|
assert all(isinstance(h["score"], float) for h in hits)
|
|
|
|
def test_the_shortest_accepted_body_is_eight_bytes(self):
|
|
"""Documented floor: `m < 8` breaks the loop, so tiny blobs yield nothing."""
|
|
assert self._hits(b"\x01\x02\x03") == []
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# the CLI-level write-back contract
|
|
# --------------------------------------------------------------------------- #
|
|
class TestEncodePath:
|
|
def test_encode_then_decode_recovers_the_payload(self, tmp_path):
|
|
"""The write-back line the tool prints must actually round-trip."""
|
|
payload_file = tmp_path / "payload.bin"
|
|
payload_file.write_bytes(PAYLOAD)
|
|
|
|
encoded_file = tmp_path / "value.txt"
|
|
enc = run_script("blob_decode.py",
|
|
["--encode", "--file", str(payload_file), "--inner", "raw",
|
|
"--outer", "base64", "--cut", "0", "--out", str(encoded_file)])
|
|
assert enc.returncode == 0, enc.output
|
|
|
|
back = run_script("blob_decode.py",
|
|
["--file", str(encoded_file), "--outer", "base64",
|
|
"--min-size", "1", "--out", str(tmp_path / "back.bin")])
|
|
assert back.returncode == 0, back.output
|
|
assert (tmp_path / "back.bin").read_bytes() == PAYLOAD
|
|
|
|
def test_an_undecodable_blob_exits_one(self, tmp_path):
|
|
value = tmp_path / "value.txt"
|
|
value.write_text("not-a-blob-at-all-just-prose-text\n", encoding="utf-8")
|
|
result = run_script("blob_decode.py", ["--file", str(value), "--outer", "hex"])
|
|
assert result.returncode == 1, result.output
|
|
assert not result.has_traceback
|
|
|
|
def test_empty_stdin_is_reported_as_invalid_input(self):
|
|
"""Exit code 2, not 1: an empty input is invalid, not a failed decode."""
|
|
result = run_script("blob_decode.py", [], stdin=" ")
|
|
assert result.returncode == 2, result.output
|
|
assert "empty input" in result.output
|