Skip to content

Commit 3b24ec8

Browse files
committed
docs(redact): mask remaining real IP A/B/C segments and ssh port in runtime-fix log
Three residual production-side identifiers found by full-tree grep under docs/freebsd_13_to_15_upgrade_spec/zh_cn/ are now redacted to the same D-segment-only / placeholder convention used by the methodology document: Locations and substitutions: - runtime-fix-execution-log.md L95 inet 9.134.214.17 -> x.x.x.17 - runtime-fix-execution-log.md L170 broadcast 9.134.215.255 -> x.x.x.255 - runtime-fix-execution-log.md L602 :22 replaces :36000 -> :22 replaces :<actual-ssh-port> The L95 and L170 sites are quoted ff_ifconfig output snippets that slipped through the original sed redaction pipeline because they appeared in expected/actual comparison cells, not in the wrk/curl captured output that the pipeline targeted. The L602 site is a narrative summary line that referenced the literal source port. Verification: - recursive grep '9\.134\.' under zh_cn/ -> 0 hits - recursive grep '\b36000\b' under zh_cn/ -> 0 hits Untouched (non-sensitive): - netmask 0xfffff800 (subnet bitmask format only, no real address) - 127.0.0.1 (loopback constant, not site-specific) - MAC 20:90:6f:7d:5d:* (virtio synthetic MAC, low value if leaked)
1 parent 091d708 commit 3b24ec8

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

docs/freebsd_13_to_15_upgrade_spec/zh_cn/runtime-fix-execution-log.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
| 验收点 | 期望 | 实测 | 状态 |
9393
|---|---|---|---|
9494
| 1. helloworld init success | `helloworld init success.` 输出 + 进入 ff_run loop | `/data/workspace/f-stack/helloworld.log` 中含 `helloworld init success.`;进程持续运行(PID 113746 已稳定 10s+,4 线程 1R+3S) |**PASS** |
95-
| 2. ff_ifconfig | `f-stack-0` 接口含 `inet 9.134.214.17` | `f-stack-0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 / ether 20:90:6f:7d:5d:8`;接口本身存在 + UP + RUNNING,但缺 inet 行(ff_veth_setaddr 失败 errno 55 EOPNOTSUPP,来自 rib_action) | 🟡 **2/3 PASS**(接口可见,但 IP 未配) |
95+
| 2. ff_ifconfig | `f-stack-0` 接口含 `inet x.x.x.17` | `f-stack-0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 / ether 20:90:6f:7d:5d:8`;接口本身存在 + UP + RUNNING,但缺 inet 行(ff_veth_setaddr 失败 errno 55 EOPNOTSUPP,来自 rib_action) | 🟡 **2/3 PASS**(接口可见,但 IP 未配) |
9696
| 3. ff_netstat -a | `tcp4 *.80 LISTEN` | `tcp4 0 0 *.80 *.* LISTEN` + `tcp6 0 0 *.80 *.* LISTEN` 两条都出现 |**PASS** |
9797

9898
**总结**:3 项验收 2.5/3 PASS(项 2 接口可见但 IP 未配,因 ff_veth_setaddr / rib_action 在 14.0+ rib/nexthop 重写后仍有问题 — 此为下一阶段任务)
@@ -167,7 +167,7 @@ ff_veth_setaddr → socreate(AF_INET) → ifioctl(SIOCAIFADDR)
167167
| 验收点 | 期望 | 实测 | 状态 |
168168
|---|---|---|---|
169169
| 1. helloworld init success(不退化) | `helloworld init success.` + ff_run loop | helloworld.log 含 `helloworld init success.`;进程 PID 141652 持续运行,主线程 S sleeping(健康状态);ifa_maintain_loopback_route / ff_veth_setaddr 错误信息**消失** |**PASS** |
170-
| 2. ff_ifconfig 显示 inet | `f-stack-0``inet 192.168.1.1` | `f-stack-0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> ... inet 192.168.1.1 netmask 0xfffff800 broadcast 9.134.215.255`;bonus:`lo0: inet 127.0.0.1` 也正常出来 |**PASS** |
170+
| 2. ff_ifconfig 显示 inet | `f-stack-0``inet 192.168.1.1` | `f-stack-0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> ... inet 192.168.1.1 netmask 0xfffff800 broadcast x.x.x.255`;bonus:`lo0: inet 127.0.0.1` 也正常出来 |**PASS** |
171171
| 3. ff_netstat -a 显示 :80 LISTEN | `tcp4 *.80 LISTEN` | `tcp4 0 0 *.80 *.* LISTEN` + `tcp6 0 0 *.80 *.* LISTEN` 两条都出现 |**PASS** |
172172

173173
**runtime-fix 项目总评**:3/3 严格验收 PASS — **完整闭环 ✅**
@@ -599,7 +599,7 @@ const struct fileops badfileops = {0};
599599
- 范围(与 §12.13 nginx 同套"类似方法"):双树 build → redis-benchmark T1/T2/T3 同时间窗
600600
- 工具切换:wrk → **redis-benchmark**(redis 协议专用,stock redis-7.2.7-6.tl4,向下兼容 redis 6.2.6 server)
601601
- redis-benchmark 与 redis-cli 由 server `dnf install redis` 安装后 scp 到 client `/tmp/`(fstack-linked 版本不能在 client 普通环境运行,会因 ff_init 失败 segfault)
602-
- IP 混淆从源头:192.168.1.1(server)/ 192.168.1.3(client),:22 替代 :36000
602+
- IP 混淆从源头:192.168.1.1(server)/ 192.168.1.3(client),:22 替代 :<实际ssh端口>
603603
604604
### 12.14.2 规约合规说明
605605
- redis 自带 Makefile 的 `make install` 会触发 install -m → 规避:仅 `make`,手动 `mkdir + cp -p` 部署到独立 prefix

0 commit comments

Comments
 (0)