7efa58d9a1
分两段(用户裁定 2026-11-02):先做地址迁移,再把同类字面量收敛成
单一真源,以后再改地址只动一处。
一、IP 迁移 192.168.1.100 → 192.168.31.100(gw 同步 → .31.1)
- 工厂默认:Drivers/BSP/NETCFG/net_cfg.c 的 NET_CFG_DEF_IP/_GW
- 注释/文档示例、主机与板级测试、台架 py 脚本、两份 sim_config.ini
- 字节序教学点同步换算 hex:0x6401A8C0 → 0x641FA8C0(内存
C0 A8 1F 64),旧版示例引文与历史 Trap 记录按冻结纪律不动
- UI 黄金基准:网口设置 4 态 + shot_info 共 5 张 .bin 由
check_content_pages.py --update 重刷(渲染值 IP 变了,属预期变更)
- 保留判定:客户点表引用(IEC104/继电保护规划)、芯片手册摘录、
日期冻结的变更记录行、已退役台架档案 MDK-ARM/retracted_bench_*
二、单一真源收口(A+B+C+D,用户批准全做)
- 新建 test/host/bench_defaults.py:台架 py 默认值唯一定义点
(DEVICE_IP/DEVICE_GW/PC_IP/NET_BCAST),22 个脚本改为引用;
MDK-ARM 两探针与 scripts/board_ui_nav.py 经 sys.path shim 引入
- test/board/net_test_task.h 新增 TEST_PC_PEER_IP,板测三处
PHASE*_REMOTE_IP 改引该宏(保留 -D 覆盖);Phase1 断言改
memcmp 数组比较,数组各只出现一次
- simulator/tests/check_content_pages.py 从 net_cfg.c 正则解析
NET_CFG_DEF_* 推导期望值(解析失败即报错、不静默兜底),
脚本内台架 IP 字面量清零
- 装饰性注释去具体值(net_cfg.h/net_socket.h/net_socket.c/
net_socket_sim.c);字节序教学 hex 对刻意保留为唯一写值点
- 刻意不动:主机单测夹具 IP(逐文件钉住的任意值是正确测试
实践)、文档正文 IP(那是文档内容本身)
顺带:scripts/gen_task_table.py 规范串清掉「,B5」——编号清退提交
72b4b094 改了受管区没重跑生成器,task-table 门禁因此一直红
验证:产品 @build 0/0;CH395F 套件开关构建 0/0 后还原产品态;
6 套主机单测 rc=0;content_pages(含宏推导路径)/菜单 8 态/
推流位比对全 PASS;bom-drift 99 无漂移;doc-links/coding-standard/
cppcheck 绿;py_compile 23 文件 + --help 冒烟(含 shim 绝对路径)
176 lines
7.1 KiB
Python
176 lines
7.1 KiB
Python
#!/usr/bin/env python3
|
||
# -*- coding: utf-8 -*-
|
||
"""FTP 鉴权台架回归(需真机在线)
|
||
|
||
验证固件侧 lftpd 鉴权集成的完整行为矩阵(主机单测 test/host/ftp_auth 覆盖
|
||
不到的"协议接线"部分:命令门、530/331/230/550 响应码、跨会话锁定):
|
||
|
||
场景「匿名登录」(anonymous) → 期望 530 拒
|
||
场景「未登录直接 NLST」 → 期望 530(命令门)
|
||
场景「对用户名 + 错口令 ×5」 → 期望 530 ×5(并触发锁定)
|
||
T4 锁定窗内正确口令 → 期望 530(LOCKED,不算哈希)
|
||
T5 等待锁定期满后正确口令 → 期望 230(60s + 余量)
|
||
T6 登录后 NLST / STOR / RETR / DELE → 期望全通(出厂 write=1)
|
||
T7 会话结束重连、错口令一次 → 期望 530 且计数已清零(T5 成功清零)
|
||
|
||
注意:CH395F 单连接——每步用完必须 quit() 释放 socket,否则下一步连不上;
|
||
跑之前确保 UI 远程显示(7003)/对时(8888)客户端未占用 socket。
|
||
|
||
用法(设备默认见 bench_defaults.DEVICE_IP,出厂口令 admin/admin):
|
||
& '.venv\\Scripts\\python.exe' test/host/ftp_auth_bench.py
|
||
改过口令: ... --pwd <新口令>
|
||
跳过 60s 锁定等待(只验锁定触发不验解锁): ... --skip-unlock
|
||
|
||
退出码:0=全部通过 / 1=任一失败 / 2=环境错误(连不上设备)
|
||
创建日期:2026-10-11
|
||
"""
|
||
|
||
import argparse
|
||
import io
|
||
import socket
|
||
import sys
|
||
import time
|
||
from ftplib import FTP, error_perm
|
||
|
||
import bench_defaults # 台架连接默认值单一真源
|
||
|
||
LOCK_WAIT_S = 62 # 固件锁定 60 s + 余量
|
||
|
||
|
||
def _try_login(host, port, timeout, user, pwd):
|
||
"""尝试一次登录;返回 (ok, code_or_exc)。失败不断言连接状态。
|
||
|
||
单连接 socket:上一次会话结束后 net 层 auto_relisten ~50 ms,但 accept
|
||
失败会走"毁监听→重建"路径(3 s 重试窗)→ connect 被拒时重试 3 次。
|
||
"""
|
||
f = FTP()
|
||
last_err = None
|
||
for attempt in range(3):
|
||
try:
|
||
time.sleep(0.5)
|
||
f.connect(host, port, timeout=timeout)
|
||
break
|
||
except (ConnectionRefusedError, socket.timeout, OSError) as e:
|
||
last_err = e
|
||
f = FTP()
|
||
else:
|
||
return None, repr(last_err), None
|
||
try:
|
||
try:
|
||
f.login(user, pwd)
|
||
return True, "230", f
|
||
except error_perm as e:
|
||
f.close()
|
||
return False, str(e), None
|
||
except (socket.timeout, OSError) as e:
|
||
return None, repr(e), None
|
||
|
||
|
||
def main(argv=None):
|
||
ap = argparse.ArgumentParser(description="FTP auth bench matrix")
|
||
ap.add_argument("--host", default=bench_defaults.DEVICE_IP)
|
||
ap.add_argument("--port", type=int, default=21)
|
||
ap.add_argument("--timeout", type=int, default=15)
|
||
ap.add_argument("--user", default="admin")
|
||
ap.add_argument("--pwd", default="admin")
|
||
ap.add_argument("--skip-unlock", action="store_true",
|
||
help="不验 60s 解锁(省 1 分钟;锁定触发仍验)")
|
||
args = ap.parse_args(argv)
|
||
|
||
fails = []
|
||
|
||
def expect(name, cond, detail=""):
|
||
tag = "PASS" if cond else "FAIL"
|
||
print(" [%s] %s %s" % (tag, name, detail))
|
||
if not cond:
|
||
fails.append(name)
|
||
|
||
# ---- 场景「匿名登录被拒」----
|
||
ok, code, conn = _try_login(args.host, args.port, args.timeout, "anonymous", "x@x")
|
||
if ok is None:
|
||
print("[env] 连不上 %s:%d → %s" % (args.host, args.port, code))
|
||
return 2
|
||
expect("匿名登录 → 530", (ok is False) and code.startswith("530"), code)
|
||
if conn:
|
||
conn.quit()
|
||
|
||
# ---- 场景「未登录直接 NLST → 530(命令门)」----
|
||
time.sleep(0.5) # 单连接 socket:等 auto_relisten 沉降(~50 ms + 余量)
|
||
f = FTP()
|
||
f.connect(args.host, args.port, timeout=args.timeout)
|
||
try:
|
||
f.sendcmd("NLST")
|
||
expect("未登录 NLST → 530", False, "居然放行")
|
||
except error_perm as e:
|
||
expect("未登录 NLST → 530", str(e).startswith("530"), str(e))
|
||
except Exception as e: # noqa: BLE001
|
||
expect("未登录 NLST → 530", False, repr(e))
|
||
# ⚠ 必须 close:单连接模型下不关 = 占住 socket,后续步骤全被拒
|
||
# (2026-10-11 台架实测:QUIT 后不 close → 芯片视角旧连接仍 ESTABLISHED)
|
||
try:
|
||
f.quit()
|
||
except Exception: # noqa: BLE001
|
||
try:
|
||
f.close()
|
||
except Exception: # noqa: BLE001
|
||
pass
|
||
time.sleep(0.5)
|
||
|
||
# ---- 场景「错口令 ×5 → 530 ×5」----
|
||
for i in range(1, 6):
|
||
ok, code, conn = _try_login(args.host, args.port, args.timeout,
|
||
args.user, "wrong-pass-%d" % i)
|
||
expect("错口令 %d → 530" % i, (ok is False) and code.startswith("530"), code)
|
||
if conn:
|
||
conn.quit()
|
||
|
||
# ---- T4 锁定窗内正确口令 → 530 ----
|
||
ok, code, conn = _try_login(args.host, args.port, args.timeout, args.user, args.pwd)
|
||
expect("T4 锁定窗内对口令 → 530", (ok is False) and code.startswith("530"), code)
|
||
if conn:
|
||
conn.quit()
|
||
|
||
if args.skip_unlock:
|
||
print("[skip] 未验 60s 解锁(--skip-unlock)")
|
||
else:
|
||
# ---- T5 期满正确口令 → 230 ----
|
||
print(" [wait] 等锁定期满 %d s ..." % LOCK_WAIT_S)
|
||
time.sleep(LOCK_WAIT_S)
|
||
ok, code, conn = _try_login(args.host, args.port, args.timeout,
|
||
args.user, args.pwd)
|
||
expect("T5 期满对口令 → 230", ok is True, code)
|
||
if conn:
|
||
# ---- T6 登录后读写全通(出厂 write=1)----
|
||
try:
|
||
names = conn.nlst()
|
||
expect("T6a NLST", len(names) >= 0, "%d 项" % len(names))
|
||
payload = b"N19-auth-bench-" + b"X" * 500
|
||
conn.storbinary("STOR n19t.tmp", io.BytesIO(payload))
|
||
got = io.BytesIO()
|
||
conn.retrbinary("RETR n19t.tmp", got.write)
|
||
expect("T6b STOR/RETR 往返一致", got.getvalue() == payload)
|
||
conn.delete("n19t.tmp")
|
||
expect("T6c DELE", True)
|
||
except Exception as e: # noqa: BLE001
|
||
expect("T6 登录后读写", False, repr(e))
|
||
# ---- T7 成功已清零计数:本会话退出后错一次只算 1(不锁)----
|
||
conn.quit()
|
||
ok, code, conn = _try_login(args.host, args.port, args.timeout,
|
||
args.user, "one-wrong")
|
||
expect("T7 成功后错 1 次 → 530 且未锁(下次对口令可登)",
|
||
(ok is False) and code.startswith("530"), code)
|
||
if conn:
|
||
conn.quit()
|
||
ok, code, conn = _try_login(args.host, args.port, args.timeout,
|
||
args.user, args.pwd)
|
||
expect("T7b 紧接对口令 → 230", ok is True, code)
|
||
if conn:
|
||
conn.quit()
|
||
|
||
print("\nVERDICT: %s (%d fail)" % ("PASS" if not fails else "FAIL", len(fails)))
|
||
return 0 if not fails else 1
|
||
|
||
|
||
if __name__ == "__main__":
|
||
sys.exit(main())
|