做了什么:
- 包改为分层: tcaptcha/{protocol,telemetry,solvers,ocr,adapters,models,tests}
* protocol/ client.py transport.py proxy.py
* telemetry/ crypto.py values.py key.py opcodes.py
disasm.py program.py layout.py modules.py
* solvers/ text_click.py icon_click.py icon_click_rotate.py slider.py
* ocr/ engines.py slicer.py
* adapters/ one_ms.py
- tools/ 里原本是**包运行时依赖**的 tdc_{disasm,program,layout,modules}.py 并入 telemetry/
(放在 tools/ 属于分层倒置),tools/ 只留 CLI: tdc_key_pure.py / tdc_profile.py / cdp_*.js
- crypto.py 529 -> 340 行: 切除「成功样本模板回填」与「Node 插桩兜底」两条老路;
generate_telemetry 只剩 python_values 一种模式,传别的会直接报错并说明原因
- 求解器改名分清: solver.py -> solvers/icon_click.py(client 实际在用的 YOLO+ResNet18 ONNX),
icon_click_solver.py -> solvers/icon_click_rotate.py(仅测试在用,留作对照)
- pyproject: 去掉 ultralytics/onnx(训练栈已删),补上真正在用的 onnxruntime
删除了什么:
- 雨云整条线 + dist/rainyun_qinglong(104M 旧快照)
- 模板回填: models/success_collect_template.b64、tdc_worker.js、analyze_collect_layout.py
- 「补环境」时代浏览器 JS: chrome_fetch/manual_captcha/probe_captcha/solve_in_browser/tdc_browser
- 旧 VM 探索工具 10 个(tdc_collectgen/tdc_slotmap/tdc_lift/tdc_vm_run/tdc_query/tdc_probe 等)
+ 8 个基于它们的旧 verify 脚本
- 训练/标注/评估: train_classifier/train_detector/prepare_yolo/web_labeler/collector/
siamese/evaluate/benchmark_verify
- tcaptcha/core_js/(60 个分析产物)、TOOLCHAIN_REPORT.md(整篇在描述已删工具)
- 3 个已无任何引用的 PyTorch 权重:icon_classifier.pt 43M / yolo_detector.pt 5.9M /
siamese_matcher.pt 1.6M —— 线上只跑 onnx,tcaptcha/ 117M -> 66M
为什么:
- 项目后面要专门承载「滑块 / 文字点选 / 图标点选」三种求解器;扁平包 + 运行时依赖混在
tools/ + 两条已废弃的 collect 生成路线,会让后续扩展持续踩坑
怎么验证:
- .venv/bin/python -m tcaptcha.selftest 全绿
- scripts/verify/verify_offline.py 逐槽全等 + 分段几何一致
- scripts/verify/verify_values.py 4 份真机明文 152/152 逐槽全等
- scripts/verify/send_test.py --mode python_values 1ms 签到页文字点选 errorCode=0
- 回滚点: tag backup/pre-refactor-20261012
105 lines
4.1 KiB
Python
105 lines
4.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""verify_values.py —— 用**真机同会话明文**校验取值生成器(tcaptcha/tdc_values.py)。
|
|
|
|
做法(不手工配平,全部从观测值反推):
|
|
1. 解密 collect -> 切 4 段 -> 解析 cd
|
|
2. 按清单顺序把槽绑到语义名(itoken 占 2 槽)
|
|
3. 从观测值里读出「会话量」(itoken / 会话随机盐 / 页面加载时刻)
|
|
与「每次采集量」(当前时刻 / 采集计数 / 轨迹),塞进 Session
|
|
4. 让生成器重算一遍,逐槽对比
|
|
|
|
期望: 除「每次采集量」之外**必须逐槽全等**;而每次采集量被喂了观测值后也应全等
|
|
(等于证明生成器对这些量的建模是对的,而不是巧合)。
|
|
|
|
用法:
|
|
.venv/bin/python scripts/verify/verify_values.py \
|
|
--build /tmp/1ms_bridge/session_build.js \
|
|
--collects /tmp/1ms_bridge/session_collect.json /tmp/1ms_bridge/session_collect2.json
|
|
"""
|
|
import argparse
|
|
import base64
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
from urllib.parse import unquote
|
|
|
|
ROOT = Path(__file__).resolve().parents[2]
|
|
sys.path.insert(0, str(ROOT))
|
|
sys.path.insert(0, str(ROOT / "tools"))
|
|
|
|
from tcaptcha.telemetry import modules as tm # noqa: E402
|
|
from tcaptcha.telemetry.crypto import split_collect_segments, xtea_decrypt_bytes # noqa: E402
|
|
from tcaptcha.telemetry.key import extract_xtea_key_pure # noqa: E402
|
|
from tcaptcha.telemetry.values import Session, generate_cd # noqa: E402
|
|
|
|
|
|
def slot_names(rows):
|
|
out = []
|
|
for r in rows:
|
|
base = str(r["name"]).split("#")[0]
|
|
out.extend([r["name"]] * (2 if base == "itoken" else 1))
|
|
return out
|
|
|
|
|
|
def decrypt_cd(path, key):
|
|
sess = json.load(open(path, encoding="utf-8"))
|
|
if "collect" not in sess and isinstance(sess.get("data"), dict):
|
|
sess = sess["data"]
|
|
plain = xtea_decrypt_bytes(base64.b64decode(unquote(sess["collect"])), key) \
|
|
.decode("latin1").rstrip("\x00")
|
|
c1, traj, c2, sd = split_collect_segments(plain)
|
|
obj = json.loads(c1 + traj + c2 + sd)
|
|
return obj["cd"], json.loads(traj), sd
|
|
|
|
|
|
def main() -> int:
|
|
ap = argparse.ArgumentParser(description="校验语义名取值生成器")
|
|
ap.add_argument("--build", default="/tmp/1ms_bridge/session_build.js")
|
|
ap.add_argument("--collects", nargs="+", required=True)
|
|
args = ap.parse_args()
|
|
|
|
js = open(args.build, encoding="utf-8", errors="replace").read()
|
|
key = extract_xtea_key_pure(js)["key"]
|
|
rows = tm.analyze(args.build)
|
|
names = slot_names(rows)
|
|
bases = [n.split("#")[0] for n in names]
|
|
|
|
total_ok = total = 0
|
|
for path in args.collects:
|
|
cd, traj, sd = decrypt_cd(path, key)
|
|
slots = list(zip(names, cd))
|
|
|
|
# 注意 itoken 占 2 槽且同名,所以用列表而不是 dict
|
|
itoken = [v for n, v in slots if n == "itoken"]
|
|
sess_rand = next(v for n, v in slots if n.startswith("struct_40_9#")
|
|
and not n.endswith("_empty"))
|
|
loaded = next(v for n, v in slots
|
|
if n.startswith("window_time#") and n.endswith("call_empty"))
|
|
now = next(v for n, v in slots
|
|
if n.startswith("window_time#") and not n.endswith("call_empty"))
|
|
calls = next(v for n, v in slots if n == "struct_46_9")
|
|
|
|
s = Session(now=loaded)
|
|
s.itoken = list(itoken)
|
|
s.session_rand = sess_rand
|
|
s.loaded_at = loaded
|
|
s.calls = calls - 1 # generate_cd 会 +1
|
|
s.set_trajectory(traj)
|
|
gen = generate_cd(rows, s, now=now)
|
|
|
|
bad = [(names[i], cd[i], gen[i]) for i in range(len(cd)) if cd[i] != gen[i]]
|
|
total += len(cd)
|
|
total_ok += len(cd) - len(bad)
|
|
print("%-46s cd=%d 不一致=%d" % (Path(path).name, len(cd), len(bad)))
|
|
for n, o, g in bad:
|
|
print(" %-38s 观测=%s 生成=%s"
|
|
% (n, json.dumps(o, ensure_ascii=False)[:44],
|
|
json.dumps(g, ensure_ascii=False)[:44]))
|
|
print()
|
|
print("逐槽全等: %d/%d" % (total_ok, total))
|
|
return 0 if total_ok == total else 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|