保留原生权限部署微信修复并验证失败回滚

这个提交包含在:
mac 于 2026-11-13 01:20:39 +08:00 提交
1 父节点 d944ad8652
当前提交 a20f1e674f
5 个文件已更改
+194 -35

没有与搜索条件相匹配的文件

+3 -3
查看文件
@@ -38,7 +38,7 @@ python3 Backend/deploy.py --package '/Volumes/备份/大鱼调色/发行包/大
回滚:先备份当前文件,再恢复部署记录中对应旁路备份;禁止降低已有清单构建号来自动降级。撤下更新时备份并移走 beta.json,更新路由回到没有更新;历史安装包和诊断表保留。源代码可从产品远程仓库恢复,签名私钥及服务端数据库不属于 Git 备份。
## 微信首次扫码登录专项(2026-11-12,待部署)
## 微信首次扫码登录专项(2026-11-13)
本轮使用仓库 `Backend/` 为有范围的本机专项工程。新增保存生产主题 `wp-content/themes/ripro5/inc/oauth/weixin/callback.php`,仅将 `DayuColor` 加入现有扫码证明名单;同时在线 LUT 会话接口把拒绝/过期返回为 HTTP 401,让现有 1.22.1 客户端及时结束等待。无需重编 APP。
@@ -48,6 +48,6 @@ php Backend/tests/online_luts.php
python3 Backend/deploy_wechat_login.py
```
前两项执行合成账号和 OAuth 的隔离测试,不加载生产配置;后一项仅审阅两个明确目标、SHA-256、挂载与权限。先按仓库约定完成源码提交、推送和回读,再加 `--apply` 进行部署。写入前复核全部目标基线,每个覆盖文件均创建原目录分钟级旁路备份;部署报告保存每个相对路径、备份完整路径与摘要。回退沿用上节规则。若生产基线已变化,先重新比较,不能直接更新预期摘要来绕过保护。
前两项执行合成账号和 OAuth 的隔离测试,不加载生产配置;后一项仅审阅两个明确目标、SHA-256、挂载与权限。先按仓库约定完成源码提交、推送和回读,再加 `--apply --ssh-control <已认证连接>` 进行部署。脚本固定目标 SSH 主机和已确认的 NAS 原生路径,不接收或保存密码。写入前复核全部目标基线,每个覆盖文件均创建原目录分钟级旁路备份;使用原文件所有者通过原生 SSH 保留 UID/GID、权限和扩展属性,两个文件均暂存成功才替换,失败回滚已替换文件。部署报告保存每个相对路径、备份完整路径、摘要与原生元数据。回退沿用上节规则。若生产基线已变化,先重新比较,不能直接更新预期摘要来绕过保护。
本轮环境禁止写入 NAS 生产目标及 Git 锁目录,尚未提交/推送/部署,也未完成真实未绑定用户扫码验收。现状与接手步骤见 [开发交接](../开发交接.md),证据见 [验证报告](../verification/WeChatLoginFix.json)。
此前会话目录与网络限制已在当前会话解除,无需修改 NAS 权限。真实未绑定用户扫码仍需实际验收。现状与部署结果见 [开发交接](../开发交接.md),证据见 [验证报告](../verification/WeChatLoginFix.json)。
+134 -7
查看文件
@@ -1,24 +1,133 @@
#!/usr/bin/env python3
"""Review by default; --apply deploys only the two WeChat login fixes."""
import argparse
import base64
import datetime
import json
import os
from pathlib import Path
import shutil
import shlex
import subprocess
from deploy import ROOT, NAS, MOUNT, sha, check_mount, deploy_file, write_json
from deploy import ROOT, NAS, MOUNT, sha, check_mount, write_json
FILES = (
Path('wp-content/themes/ripro5/inc/oauth/weixin/callback.php'),
Path('wp-content/mu-plugins/dayu-color-online-luts.php'),
)
# Run as the existing file owner on the NAS: SMB reports synthetic Mac modes.
# No credentials or production configuration are included in this program.
NATIVE_DEPLOY = r'''
import base64, datetime, hashlib, json, os, pathlib, shutil, stat, sys, uuid
root = pathlib.Path('/vol1/1000/dayumedia/wwwroot/dayu_media')
allowed = {'wp-content/themes/ripro5/inc/oauth/weixin/callback.php',
'wp-content/mu-plugins/dayu-color-online-luts.php'}
request = json.load(sys.stdin)
assert len(request['files']) == 2
assert {r['relativePath'] for r in request['files']} == allowed
def digest(path):
return hashlib.sha256(path.read_bytes()).hexdigest()
def metadata(path):
s = path.stat()
return dict(uid=s.st_uid, gid=s.st_gid, mode=oct(stat.S_IMODE(s.st_mode)),
xattrs={k:base64.b64encode(os.getxattr(path,k)).decode()
for k in sorted(os.listxattr(path))})
def syncdir(path):
fd=os.open(str(path),os.O_RDONLY)
try: os.fsync(fd)
finally: os.close(fd)
def clone(original, destination, expected):
fd=os.open(str(destination),os.O_CREAT|os.O_EXCL|os.O_WRONLY,0o600)
os.close(fd)
shutil.copy2(original,destination)
assert metadata(destination)==expected, 'Native metadata copy mismatch'
with destination.open('rb') as f: os.fsync(f.fileno())
stamp=datetime.datetime.now(datetime.timezone(datetime.timedelta(hours=8))).strftime('%Y%m%d%H%M')
rows=[]
stages=[]
changed=[]
result=dict(ok=False,files=rows,rolledBack=False)
try:
# Check the entire batch before creating backups or staging new content.
for item in request['files']:
target=root/item['relativePath']
assert target.resolve()==target and target.is_file(), 'Unexpected path or symlink'
original=digest(target)
source=base64.b64decode(item['sourceBase64'],validate=True)
assert hashlib.sha256(source).hexdigest()==item['sourceSHA256']
assert original in (item['expectedSHA256'],item['sourceSHA256']), 'Production baseline changed'
attrs=metadata(target)
assert attrs['uid']==os.geteuid(), 'Run as the original file owner'
row=dict(relativePath=item['relativePath'],nativeTarget=str(target),
beforeSHA256=original,sha256=item['sourceSHA256'],beforeMetadata=attrs,
status='already-current' if original==item['sourceSHA256'] else 'pending')
rows.append(row)
for row,item in zip(rows,request['files']):
if row['status']=='already-current': continue
target=pathlib.Path(row['nativeTarget'])
backup=target.with_name(target.stem+'-'+stamp+target.suffix+'bak')
clone(target,backup,row['beforeMetadata'])
assert digest(backup)==row['beforeSHA256'], 'Backup content mismatch'
row['nativeBackup']=str(backup)
syncdir(target.parent)
# Stage both files before replacing either production file.
for row,item in zip(rows,request['files']):
if row['status']=='already-current': continue
target=pathlib.Path(row['nativeTarget'])
stage=target.with_name('.dayu-wechat-stage-'+uuid.uuid4().hex)
stages.append(stage)
clone(target,stage,row['beforeMetadata'])
with stage.open('wb') as f:
f.write(base64.b64decode(item['sourceBase64'],validate=True))
f.flush(); os.fsync(f.fileno())
os.utime(stage,None)
assert metadata(stage)==row['beforeMetadata'], 'Staged metadata mismatch'
assert digest(stage)==row['sha256'], 'Staged content mismatch'
row['stage']=str(stage)
for row in rows:
if row['status']=='already-current': continue
target=pathlib.Path(row['nativeTarget'])
assert digest(target)==row['beforeSHA256'], 'Production changed before replacement'
assert metadata(target)==row['beforeMetadata'], 'Permissions changed before replacement'
os.replace(row['stage'],target)
changed.append(row)
syncdir(target.parent)
row['status']='deployed'
for row in rows:
target=pathlib.Path(row['nativeTarget'])
assert digest(target)==row['sha256']
row['afterMetadata']=metadata(target)
assert row['afterMetadata']==row['beforeMetadata'], 'Final metadata mismatch'
result['ok']=True
except Exception as e:
result['error']=str(e)
rollback_errors=[]
for row in reversed(changed):
try:
target=pathlib.Path(row['nativeTarget'])
restore=target.with_name('.dayu-wechat-restore-'+uuid.uuid4().hex)
stages.append(restore)
clone(pathlib.Path(row['nativeBackup']),restore,row['beforeMetadata'])
assert digest(restore)==row['beforeSHA256']
os.replace(restore,target); syncdir(target.parent)
row['status']='rolled-back'
except Exception as failure: rollback_errors.append(str(failure))
result['rolledBack']=bool(changed) and not rollback_errors
result['rollbackErrors']=rollback_errors
finally:
for stage in stages:
if stage.exists(): stage.unlink()
for row in rows: row.pop('stage',None)
print(json.dumps(result,ensure_ascii=False))
'''
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--apply', action='store_true')
parser.add_argument('--ssh-control', help='Existing authenticated SSH control socket; no password argument')
args = parser.parse_args()
mounts = subprocess.check_output(['/sbin/mount'], text=True).splitlines()
matches = [line for line in mounts if f' on {MOUNT} (smbfs,' in line]
@@ -57,15 +166,33 @@ def main():
lock.mkdir()
write_json(lock/'owner.json', dict(pid=os.getpid(), sourceCommit=commit))
try:
results = []
for relative in FILES:
result = deploy_file(ROOT/'Backend'/relative, NAS/relative, expected=expected[str(relative)])
result['relativePath'] = str(relative)
results.append(result)
request = dict(files=[dict(relativePath=str(relative), expectedSHA256=expected[str(relative)],
sourceSHA256=sha(ROOT/'Backend'/relative),
sourceBase64=base64.b64encode((ROOT/'Backend'/relative).read_bytes()).decode())
for relative in FILES])
command = ['/usr/bin/ssh', '-T', '-p', '22', '-o', 'BatchMode=yes',
'-o', 'StrictHostKeyChecking=yes']
if args.ssh_control:
command += ['-o', 'ControlPath='+args.ssh_control]
command += ['dayu@192.168.31.21', '/usr/bin/python3 -c '+shlex.quote(NATIVE_DEPLOY)]
process = subprocess.run(command, input=json.dumps(request), text=True, capture_output=True, timeout=60)
if process.returncode:
raise RuntimeError('Native SSH deployment failed: '+process.stderr.strip())
outcome = json.loads(process.stdout)
results = outcome['files']
for result in results:
relative = result['relativePath']
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(
checkedAt=datetime.datetime.now(datetime.timezone.utc).isoformat(), sourceCommit=commit,
localProject=str(ROOT/'Backend'), nasRoot=str(NAS), files=results,
liveScanVerified=False, status='files deployed; fresh unbound-account scan still required'))
nativeResult=outcome, liveScanVerified=False,
status='files deployed; fresh unbound-account scan still required' if outcome['ok'] else 'deployment failed'))
assert outcome['ok'], json.dumps(outcome,ensure_ascii=False)
print(json.dumps(dict(deployed=len(results), files=results), ensure_ascii=False, indent=2))
finally:
shutil.rmtree(lock)