Repository navigation
fix: v0.7.15 全仓同源缺陷批量修复(宿主并发/回环隔离、网关安全与生命周期、前端/i18n/文档) - #254
Merged
Merged
Conversation
PR 安全初筛 / Safety pre-check改动 48 个文件;高 0 项、中 19 项。
「高」不等于有问题,只是这些地方一旦被动手脚,后果最重(能拿到签名钥匙、改到用户手机上的权限、或藏进看不见的内容),合并前请逐行看过。 |
Owner
Author
追加修复:并发下载组件概率触发组件市场 502 与刷新后延迟显示根因链路(4 层叠加竞态)
修复内容
验证
|
tar -tzv 的清单要用来做条目逃逸检查,exit 触发时 stdout 仍可能有未读块; 清单末尾被截断会漏查最后几条。改听 close(stdio 收完),error 路径照旧。 Co-Authored-By: Claude Code <noreply@anthropic.com>
This branch was successfully deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
以 PR #244 / #253 的缺陷模式为蓝本,对
v0.7.15(f00dd1e2)全仓排查并一次性修复 24 处问题,补充 Java + Node.js 回归测试。一、P0 / 严重修复
Env.java127.0.0.2探测脱离主线程<clinit>且显式Proxy.NO_PROXY:此前static { checkHost(); }在安卓主线程同步Socket.connect()必触发NetworkOnMainThreadException,导致全平台静默回退127.0.0.1、127.0.0.2Cookie 隔离失效;改为独立嵌套类Env.HostProbe后台探测(避免<clinit>类初始化锁死锁),同时给listening()补上Proxy.NO_PROXY。gateway/gw/local.mjs修复modelFetch()TDZReferenceError:meta声明移至job对象字面量之前,恢复端侧 GGUF 模型目录与链接下载。gateway/gw/seal.mjs修复mcpServers破甲扫描死代码(VULN-01):将mcpConfig(cwd)破甲扫描移至if (found.length) return之前,命中时真正拦截本轮且不提前写出ctx-*.md临时文件。GatewayService.java修复supervisor/freezeWatcher停机→秒重拉退出竞态(known-issues #8):onStartCommand在同一把life锁内复位stopping并拉起看护线程;supervise()与watchFreeze()退出前加锁复核!stopping并在finally置空引用,消除永久卡死「等待网关…」。Env.javaBOOT_LOCK原子化boot/provedAt与proveBoot()快照:消除provedAt先于boot写入及无锁resetBoot()撕裂导致的并发请求带空boot吃 HTTP 403。二、P1 / Android 原生层与网关层修复
MainActivity.java:loadUi()增加uiLoadGen/uiLoading避免经Env.onBoot自递归双加载;waitingHtml()增加「重新载入」自救链接,解除 60 秒 3 次限流后死锁(known-issues #8)。MainActivity.java:pushInsets()与onPicked()补包guarded(),堵住「Script error.」残余入口(known-issues #5)。Updater.java:repair()加锁并先占"downloading"状态(失败在finally复位),且devkit.lock.json改走fetchDevkitFile()镜像回退;download()失败时同步清repairing。ShizukuSetup.java:reactivateAsync()对busy检查与置位加synchronized (ShizukuSetup.this);repair()将wifiOrig读取移入拿锁后。Apk.java:stage()只清理 10 分钟前遗留文件并使用递增唯一名(防并发装包删掉待确认暂存 APK);install()未commit时在finally调pi.abandonSession(id)。Installer.java:extractInto()将new GZIPInputStream(in)移入try/finally内防损坏包泄漏 FD 并遗留脏usr.new;HTTPinstallDevkit()复用open()+code()(带超时、防 HTTPS 降级、finally断开)。Installer.java:fetchSegmented()同步读写sg[2],中断时统一中断并收敛工作线程。SchedAlarm.java/Notify.java/MainActivity.java:3 处HttpURLConnection/OutputStream移入finally/ try-with-resources 释放。A11y.java:read()/type()/key()/screenshot()补齐self == null判空;screenshot()在finally回收HardwareBuffer与临时Bitmap。gateway/gw/components.mjs:reapComponentRuns()修正".installing"(11 字符)切片-12→-".installing".length。gateway/gw/sessionops.mjs:rewindFixup()相对路径改按会话cwd(及realOf)解析,补齐 PR fix: 修复 v0.7.13 全面排查发现的 12 处原生层 / 网关 / 界面与文档缺陷 #244 devkit:前缀改写下潜到 zip 归档内部,修 jlink/jpackage 静默产出坏镜像 #4 另一半。gateway/gw/extensions.mjs:mcpAddArgs()改用parseStdioTarget(target),补齐 PR fix: 修复 v0.7.13 全面排查发现的 12 处原生层 / 网关 / 界面与文档缺陷 #244 devkit: 放行 kind: glibc(给 glibc 程序用的组件) #8 另一半。gateway/gw/projects.mjs&sessionops.mjs:projectSlug()补齐超过 200 字符的 sha256 截断,与sessions.mjs/seal.mjs一致。gateway/gw/components.mjs:组件包tar -tzv改用可取消spawn+detached: true+job.child+markChild()+env: termEnv()(同 PR fix(devkit/modules): pre-v0.7.15 safety, heartbeat, shared-layer, phar and reuse fixes #253modTarList)。gateway/gw/files.mjs&archiver.mjs:SEED_FILE按dev+ino比对;/api/file/rename支持/sdcard目录仅改大小写且对冲突目录返回 409;压缩打包排除.config/gcloud、SECRET_NAMES及大小写变体凭据路径,同时不影响 ext4 同目录大小写不同文件名。gateway/gw/usage.mjs/custom.mjs/archiver.mjs:energySystem()、runP()、runCapped()改用spawn(..., { detached: true })+killTree();archiver.mjs的tar2outer与tar.*inner进程移入finally清理。三、P2 / WebUI、i18n、测试 Flake 与文档同步
08-extensions.js依赖确认弹窗双重 HTML 转义;修复09-settings.js额度速览卡「刷新」失败后永久置灰;修复07-sessions.js批量删除成功误弹红底 toast;04-session-flow.js长会话跳过整棵#hist的mo-in-rise合成层动画(known-issues #9缓解)。lang-en.js(hasn"t)与lang-fr.js(n"a)误转义引号;修正08-extensions.js/11-usage.js过时设置路径并同步 9 语词典键。merge.test.mjs偶发失败 + 文档同步:lineage.mjs对 4 位短前缀碰撞按时间与章数消歧,消除全量并行跑测试时的 16-bit 碰撞 flake;同步更新docs/known-issues*.md、SECURITY.md、README*.md、CONTRIBUTING*.md、gateway/web/help/{zh,en}.md。验证
node scripts/appjs.mjs:✓ 29 段,19174 行,语法通过node i18n/scan.mjs --all&node --check gateway/web/lang-*.js:✓ 9 种语言全部通过sh scripts/java-tests.sh:✓ 全部通过(含新增Env.probeLoopback/Env.HOST回归)node scripts/test.mjs:✓ 全量 + 新增 9 条gateway/tests/v0715-bug-sweep.test.mjs(含 7zz 实测)全部通过node scripts/pr-guard.mjs origin/main HEAD:✓ 高 0 项