From 1d3ad6f84716a9ded3d1896a7a4e40ef45e7bb1b Mon Sep 17 00:00:00 2001 From: mac Date: Fri, 13 Nov 2026 01:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=BE=AE=E4=BF=A1=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E7=99=BB=E5=BD=95=E4=BF=AE=E5=A4=8D=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E5=8F=8A=E7=BA=BF=E4=B8=8A=E6=8E=A5=E5=8F=A3=E6=A0=B8=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/README.md | 2 +- Backend/deploy_wechat_login.py | 19 +++++-- RECOVERY.md | 10 ++++ verification/WeChatLoginDeployment.json | 70 +++++++++++++++++++++++++ verification/WeChatLoginLive.json | 55 +++++++++++++++++++ 开发交接.md | 12 ++--- 6 files changed, 157 insertions(+), 11 deletions(-) create mode 100644 verification/WeChatLoginDeployment.json create mode 100644 verification/WeChatLoginLive.json diff --git a/Backend/README.md b/Backend/README.md index 34a1474..310aeb6 100644 --- a/Backend/README.md +++ b/Backend/README.md @@ -50,4 +50,4 @@ python3 Backend/deploy_wechat_login.py 前两项执行合成账号和 OAuth 的隔离测试,不加载生产配置;后一项仅审阅两个明确目标、SHA-256、挂载与权限。先按仓库约定完成源码提交、推送和回读,再加 `--apply --ssh-control <已认证连接>` 进行部署。脚本固定目标 SSH 主机和已确认的 NAS 原生路径,不接收或保存密码。写入前复核全部目标基线,每个覆盖文件均创建原目录分钟级旁路备份;使用原文件所有者通过原生 SSH 保留 UID/GID、权限和扩展属性,两个文件均暂存成功才替换,失败回滚已替换文件。部署报告保存每个相对路径、备份完整路径、摘要与原生元数据。回退沿用上节规则。若生产基线已变化,先重新比较,不能直接更新预期摘要来绕过保护。 -此前会话目录与网络限制已在当前会话解除,无需修改 NAS 权限。真实未绑定用户扫码仍需实际验收。现状与部署结果见 [开发交接](../开发交接.md),证据见 [验证报告](../verification/WeChatLoginFix.json)。 +2026-11-13 01:22 已完成两文件上线。67 项隔离检查、服务器 PHP 7.4.34 语法及8项实际 HTTPS 检查通过;拒绝/过期会话立即返回401,三个临时合成会话已清理。原生权限及扩展属性保持,旁路备份见 `verification/WeChatLoginDeployment.json`。此前目录与网络限制已解除,无需修改 NAS 权限。真实未绑定用户扫码仍需实际验收。现状与部署结果见 [开发交接](../开发交接.md),证据见 [验证报告](../verification/WeChatLoginFix.json)。 diff --git a/Backend/deploy_wechat_login.py b/Backend/deploy_wechat_login.py index 6729618..e46ae55 100644 --- a/Backend/deploy_wechat_login.py +++ b/Backend/deploy_wechat_login.py @@ -9,6 +9,7 @@ from pathlib import Path import shutil import shlex import subprocess +import time from deploy import ROOT, NAS, MOUNT, sha, check_mount, write_json @@ -195,14 +196,24 @@ def main(): result['target'] = str(NAS/relative) if 'nativeBackup' in result: result['backup'] = str(NAS/Path(result['nativeBackup']).relative_to('/vol1/1000/dayumedia/wwwroot/dayu_media')) - if outcome['ok']: - assert sha(NAS/relative) == result['sha256'], 'SMB/native content mismatch' - write_json(ROOT/'verification/WeChatLoginDeployment.json', dict( + report = dict( checkedAt=datetime.datetime.now(datetime.timezone.utc).isoformat(), sourceCommit=commit, localProject=str(ROOT/'Backend'), nasRoot=str(NAS), files=results, nativeResult=outcome, liveScanVerified=False, - status='files deployed; fresh unbound-account scan still required' if outcome['ok'] else 'deployment failed')) + status='native deployment complete; SMB readback pending' if outcome['ok'] else 'deployment failed') + report_path = ROOT/'verification/WeChatLoginDeployment.json' + # Keep the native transaction evidence even if SMB serves a stale cache. + write_json(report_path, report) assert outcome['ok'], json.dumps(outcome,ensure_ascii=False) + for result in results: + deadline = time.monotonic()+30 + while sha(Path(result['target'])) != result['sha256']: + if time.monotonic() >= deadline: + raise RuntimeError('Native deployment passed; SMB readback remains stale: '+result['relativePath']) + time.sleep(1) + report['smbReadbackPassed'] = True + report['status'] = 'files deployed; fresh unbound-account scan still required' + write_json(report_path, report) print(json.dumps(dict(deployed=len(results), files=results), ensure_ascii=False, indent=2)) finally: def ignore_missing(function, path, exception): diff --git a/RECOVERY.md b/RECOVERY.md index 8267893..3bcd76e 100644 --- a/RECOVERY.md +++ b/RECOVERY.md @@ -1,3 +1,13 @@ +# 2026-11-13 微信首次扫码后端修复 + +仅恢复 `Backend/wp-content/themes/ripro5/inc/oauth/weixin/callback.php` 和 `Backend/wp-content/mu-plugins/dayu-color-online-luts.php`。实际生产源码节点 `0f3f14522c8e8f79893652977b8b4e0a3bae8275`,标签 `backend-wechat-login-20261113`;远程沿用 `https://dayu.media/git/dayu/dayu-color.git`。新机器恢复 Git 登录后克隆并以该完整 SHA 检出两文件,部署工具使用 main 的后续修订;无需重编或重装 APP。 + +WordPress / RiPro5、现有统一微信/设备绑定、LUT renderer 和数据库为现有站点依赖,本仓库只保存有范围源码,不含整站配置、凭据、用户数据或证书。生产 SMB `/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media` 对应已核对的原生 `/vol1/1000/dayumedia/wwwroot/dayu_media`。PHP 7.4.34;先执行两个 PHP 测试(17+50)和部署审阅,再用已有认证 SSH 运行 `Backend/deploy_wechat_login.py --apply --ssh-control <连接路径>`。生产基线不符须重新比较,不直接改摘要绕过保护。 + +上线前备份摘要与原生权限见 [部署记录](verification/WeChatLoginDeployment.json)。回滚前另备份当前现版,恢复所列的01:22备份,保留实际 UID/GID、模式和扩展属性,再核验 PHP 与接口;禁止用 Mac SMB 的合成模式替代 NAS 原权限。真实未绑定账号需全新扫码验收;线上合成会话检查不等于真实 OAuth 验收。[线上检查](verification/WeChatLoginLive.json) · [当前交接](开发交接.md) + +--- + # 2026-11-11 统一 LUT 浏览器 1.22.1(133) 唯一正式安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app` 已替换 Debug:Release 1.22.1(133),APP 公证 `ae55bcd2-d131-4ef2-8733-405e28d92f7e` Accepted,签名/票据/Gatekeeper、1,028 项正式安装自检及 FCP 12.4 自动在线预览、分类安装、对比与播放通过。临时 Debug 及旧 131 回滚副本已清理;用户 LUT 与既有合成验收库保留。Motion 未复测。[安装](verification/Delivery1.22.1.json) · [宿主](verification/HostUnifiedLUT1.22.1.json) · [清理](verification/Cleanup1.22.1.json) diff --git a/verification/WeChatLoginDeployment.json b/verification/WeChatLoginDeployment.json new file mode 100644 index 0000000..43a37ab --- /dev/null +++ b/verification/WeChatLoginDeployment.json @@ -0,0 +1,70 @@ +{ + "checkedAt": "2026-11-12T17:23:52.863170+00:00", + "sourceCommit": "0f3f14522c8e8f79893652977b8b4e0a3bae8275", + "localProject": "/Volumes/备份/大鱼调色/大鱼调色/Backend", + "nasRoot": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media", + "files": [ + { + "relativePath": "wp-content/themes/ripro5/inc/oauth/weixin/callback.php", + "nativeTarget": "/vol1/1000/dayumedia/wwwroot/dayu_media/wp-content/themes/ripro5/inc/oauth/weixin/callback.php", + "target": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/themes/ripro5/inc/oauth/weixin/callback.php", + "nativeBackup": "/vol1/1000/dayumedia/wwwroot/dayu_media/wp-content/themes/ripro5/inc/oauth/weixin/callback-202611130122.phpbak", + "backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/themes/ripro5/inc/oauth/weixin/callback-202611130122.phpbak", + "beforeSHA256": "29b07075bfc54e51d0b8c9653742d94e498216c1f97414e4c1ede5b469db6d9a", + "sha256": "995f8b82216f594ab7dac5058b551dcffbc8cab830536e245d6ebdcf00e20ae4", + "beforeMetadata": { + "uid": 1000, + "gid": 1001, + "mode": "0o705", + "xattrs": { + "user.DOSATTRIB": "AAAFAAUAAAARAAAAIAAAAIAcKIV/a90B" + } + }, + "afterMetadata": { + "uid": 1000, + "gid": 1001, + "mode": "0o705", + "xattrs": { + "user.DOSATTRIB": "AAAFAAUAAAARAAAAIAAAAIAcKIV/a90B" + } + }, + "status": "deployed", + "backupVerified": true + }, + { + "relativePath": "wp-content/mu-plugins/dayu-color-online-luts.php", + "nativeTarget": "/vol1/1000/dayumedia/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-online-luts.php", + "target": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-online-luts.php", + "nativeBackup": "/vol1/1000/dayumedia/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-online-luts-202611130122.phpbak", + "backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-online-luts-202611130122.phpbak", + "beforeSHA256": "7b749332efa94427eaa032a5acfe862fe2fd237c7a1d38bd76f16fabe8338871", + "sha256": "c6133429b48fdec12a6f660fb214f81874d9fbf4174696c94944e6b217eb1ddf", + "beforeMetadata": { + "uid": 1000, + "gid": 1001, + "mode": "0o700", + "xattrs": { + "user.DOSATTRIB": "AAAFAAUAAAARAAAAIAAAAJDdjZDTcd0B" + } + }, + "afterMetadata": { + "uid": 1000, + "gid": 1001, + "mode": "0o700", + "xattrs": { + "user.DOSATTRIB": "AAAFAAUAAAARAAAAIAAAAJDdjZDTcd0B" + } + }, + "status": "deployed", + "backupVerified": true + } + ], + "smbReadbackPassed": true, + "liveScanVerified": false, + "status": "deployed and live HTTPS verified; fresh real WeChat scan not yet observed", + "evidenceRecovery": "Native transaction completed and retained both exact-metadata backups. Initial Mac SMB readback was stale; subsequent independent SSH and SMB checks matched committed new bytes and original native metadata. No second replacement performed.", + "liveHTTPVerified": true, + "liveVerification": "verification/WeChatLoginLive.json", + "sourceTag": "backend-wechat-login-20261113", + "permissionsChanged": false +} diff --git a/verification/WeChatLoginLive.json b/verification/WeChatLoginLive.json new file mode 100644 index 0000000..b081727 --- /dev/null +++ b/verification/WeChatLoginLive.json @@ -0,0 +1,55 @@ +{ + "checkedAt": "2026-11-12T17:24:13.717618+00:00", + "phpVersion": "7.4.34", + "serverPHPLintPassed": true, + "passed": true, + "checks": [ + { + "case": "pending", + "httpStatus": 200, + "passed": true + }, + { + "case": "denied", + "httpStatus": 401, + "passed": true + }, + { + "case": "expired", + "httpStatus": 401, + "passed": true + }, + { + "case": "missing session", + "httpStatus": 401, + "passed": true + }, + { + "case": "invalid input", + "httpStatus": 400, + "passed": true + }, + { + "case": "website health", + "httpStatus": 200, + "passed": true + }, + { + "case": "backup not publicly readable", + "relativePath": "wp-content/themes/ripro5/inc/oauth/weixin/callback-202611130122.phpbak", + "httpStatus": 404, + "passed": true + }, + { + "case": "backup not publicly readable", + "relativePath": "wp-content/mu-plugins/dayu-color-online-luts-202611130122.phpbak", + "httpStatus": 404, + "passed": true + } + ], + "fixturesCleanupPending": false, + "liveOAuthScanVerified": false, + "scope": "Actual HTTPS route using synthetic pending/denied/expired transients; no real user or device binding modified", + "syntheticFixturesRemoved": 3, + "fixtureAbsenceVerified": true +} diff --git a/开发交接.md b/开发交接.md index 757ed99..5ff15fe 100644 --- a/开发交接.md +++ b/开发交接.md @@ -2,17 +2,17 @@ 更新于 2026-11-13(Asia/Shanghai)。当前入口;历史设计按需查阅专项记录。 -## 2026-11-13 微信首次登录修复:上线准备完成 +## 2026-11-13 微信首次登录修复:已上线 -用户已授权上线,无需再次确认。根因是主题微信回调的 OAuth 证明名单缺少 `DayuColor`;另有在线 LUT 会话把拒绝状态按 HTTP 200 返回,使现有客户端继续等待。仅修改两个生产文件:`wp-content/themes/ripro5/inc/oauth/weixin/callback.php` 和 `wp-content/mu-plugins/dayu-color-online-luts.php`。原 UUID、账号、过期、设备数量、权限与一次性兑换校验保留;现有正式 APP 1.22.1(133)无需更新。 +已按用户授权,于北京时间 01:22 上线两个 PHP 文件:主题 `wp-content/themes/ripro5/inc/oauth/weixin/callback.php` 的 OAuth 证明名单补入 `DayuColor`;`wp-content/mu-plugins/dayu-color-online-luts.php` 对拒绝/过期会话返回 HTTP 401 和原失败原因,避免现有客户端等待十分钟。保留 UUID、账号、有效期、设备数量、权限和一次性兑换校验。正式 APP 1.22.1(133)无需更新;本轮不改 APP、安装包、文章或更新通道。 -此前会话的目录及网络限制已解除:本会话实测 SMB 可列举、新建、重命名、删除测试目录,Git 已推送并回读 `d944ad86528783fc5c9d30bc2e71660f9524f155`;未修改 NAS 权限。生产两文件仍等于原基线。67 项隔离测试通过,使用合成 OAuth/账号,不加载生产配置。部署脚本改用原文件所有者的原生 SSH 原子替换,保留真实 UID/GID、权限及扩展属性;分别为 1000:1001、0705/0700,不采用 SMB 显示的合成模式。NAS 临时目录验证了正常部署、基线变化拒绝、第二文件失败后回滚三个场景,全部通过并清理临时文件。[部署安全检查](verification/WeChatDeploymentSafety.json) +实际部署源码提交 `0f3f14522c8e8f79893652977b8b4e0a3bae8275`,两个生产文件逐字节等于该节点。通过原文件所有者执行原生 SSH 原子替换,NAS 实际 UID/GID 1000:1001、0705/0700 及 `user.DOSATTRIB` 均与原件一致,未修改 NAS 目录权限。原目录备份 `callback-202611130122.phpbak`、`dayu-color-online-luts-202611130122.phpbak` 的完整路径、摘要和元数据见 [上线记录](verification/WeChatLoginDeployment.json),均与原始基线一致。回滚前先对届时现版另做同目录备份,再恢复对应原件并保留原生元数据,不删历史备份。 -第一次上线在替换前发现 fnOS 的 `copy2` 会产生源文件没有的 `system.trim_acl`,保护检查中止,生产两原件均未变;保留该次旁路备份。已修正仅清除新副本多出的继承属性,并在两个实际目标目录分别完成源文件复制及原生元数据一致检查,临时副本已清理。[中止记录](verification/WeChatLoginDeploymentAttempt1.json) +67 项隔离回归和服务器 PHP 7.4.34 语法检查通过;8 项实际 HTTPS 检查通过:等待200、拒绝/过期401且保留原因、会话缺失401、非法输入400、网站200、两个备份公开请求404。三个临时合成会话已删除并复核不存在,没有改真实用户或设备绑定。[线上核验](verification/WeChatLoginLive.json)。真实未绑定账号尚未扫码验收:在现有 APP 发起全新微信登录即可,旧拒绝会话不能复用;后续可核对 `oauth_proof_written → oauth_proof_check → session_approved`。 -下一步:提交并推送部署工具检查点;通过 `python3 Backend/deploy_wechat_login.py --apply --ssh-control <已认证连接>` 上线,逐文件原目录旁路备份并核验摘要和原生元数据;验证服务器 PHP、实际 HTTP 会话拒绝响应。真实未绑定账号需发起全新扫码,旧拒绝会话不能用于验收。现有 Xcode 工程排序差异不归本轮,不暂存。 +上线前保护检查曾因 fnOS 复制继承多余 ACL 而中止,原生产文件未变;已修正并核验两个实际目录的复制结果。原生替换后 Mac SMB 一度读取旧缓存,随后 SSH 与 SMB 独立回读均与新源码一致;工具现先保留原生部署证据再等待 SMB 缓存更新,避免把缓存延迟当作替换失败。正常部署、基线拒绝、第二文件失败回滚的 NAS 临时场景检查通过。[工具检查](verification/WeChatDeploymentSafety.json) · [首次中止证据](verification/WeChatLoginDeploymentAttempt1.json)。本轮临时副本及部署锁已清理,原先 Xcode 工程排序差异未暂存。 -[原生产基线](verification/WeChatLoginBaseline.json) · [修复与67项检查](verification/WeChatLoginFix.json) · [当前可写预检](verification/WeChatLoginReady.json) · [此前受限会话历史](research/HandoffWeChatLogin-20261113-before-deployment.md)。本轮不修改 APP、安装包、Release、文章或更新通道。 +源码与上线记录随 main 推送;恢复标签 `backend-wechat-login-20261113` 固定实际部署节点,远端恢复核验见下轮保存的验证记录。此前目录/联网阻塞在本会话已解除,无需继续改 NAS 权限。[原始基线](verification/WeChatLoginBaseline.json) · [修复回归](verification/WeChatLoginFix.json) · [旧会话历史](research/HandoffWeChatLogin-20261113-before-deployment.md)。 ## 1.22.1(133):正式交付完成