Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(mobile): 从 Play AAB 移除安装包权限 (#5187)

bobo7085c77678f3
diff --git a/apps/mobile/scripts/build-android.mjs b/apps/mobile/scripts/build-android.mjs
index d2d3d5e3b8..45091ee648 100644
--- a/apps/mobile/scripts/build-android.mjs
+++ b/apps/mobile/scripts/build-android.mjs
@@ -3,7 +3,7 @@
// build-android.mjs —— Android 纯构建(本机出自签 APK / AAB,不含上传 / 分发 / 发布)
//
// 流程(--execute):git 闸门 → expo prebuild(注入 versionCode)→ patch build.gradle 用自有
-// keystore 自签 → 按地区 / --artifacts 执行 assembleRelease / bundleRelease
+// keystore 自签 → Global 按 website / play 变体构建 APK / AAB,CN/Dev 构建 APK
// → 从 APK / AAB 回读内嵌 runtimeVersion并交叉核对
// → 本地校验 package/versionCode/签名 → 打印全部产物路径(--out 可另拷一份)。
// dry-run 纯本地:校验配置 + 打印计划,git 闸门(含 origin/main 远端比对)只在
@@ -69,6 +69,10 @@ import {
resolveAndroidArtifactKinds,
resolveAndroidUploadCertificateSha256,
androidGradleTasksForArtifacts,
+ patchBuildGradleDistributionFlavors,
+ GOOGLE_PLAY_MANIFEST_OVERLAY,
+ assertAndroidInstallPermissionPresent,
+ assertGooglePlayInstallPermissionAbsent,
resolveAndroidSigningEnv,
patchBuildGradleSigning,
patchGradlePropertiesMemory,
@@ -175,6 +179,15 @@ function patchGradleSigning() {
log(' ✓ 已 patch android/app/build.gradle:release 用自有 keystore 自签(口令走 env,不落盘)');
}
+function configureGooglePlayVariant() {
+ const gradlePath = resolve(MOBILE_DIR, 'android/app/build.gradle');
+ writeFileSync(gradlePath, patchBuildGradleDistributionFlavors(readFileSync(gradlePath, 'utf8')));
+ const overlayPath = resolve(MOBILE_DIR, 'android/app/src/play/AndroidManifest.xml');
+ mkdirSync(dirname(overlayPath), { recursive: true });
+ writeFileSync(overlayPath, GOOGLE_PLAY_MANIFEST_OVERLAY);
+ log(' ✓ 官网 APK 保留安装权限;Play AAB 变体在 manifest 合并时移除该权限');
+}
+
// 调大生成工程的 Gradle heap / metaspace。只动 prebuild 产物,不影响 fingerprint。
function patchGradleProps() {
const props = resolve(MOBILE_DIR, 'android/gradle.properties');
@@ -200,6 +213,7 @@ function buildAndroidArtifacts(env, region, artifactKinds) {
run(NPX, ['--yes', 'expo', 'prebuild', '--platform', 'android', '--clean'], { env });
patchGradleSigning();
+ if (region.authRegion === 'global') configureGooglePlayVariant();
patchGradleProps();
// gradle 内部触发 expo export:embed 打 JS bundle,无法透传 --clear;打包前清
@@ -212,7 +226,9 @@ function buildAndroidArtifacts(env, region, artifactKinds) {
// 不把 javaEnv 传进被日志的函数:它由 process.env + 签名口令(signEnv)派生,
// CodeQL 会将「机密 env 流入日志」判为泄漏(即便 javaRuntimeDetail 只读版本 /
// JAVA_HOME)。这里只报静态信息;JDK 由 resolveJavaRuntimeEnv 确定性选 17+。
- const tasks = androidGradleTasksForArtifacts(artifactKinds);
+ const tasks = androidGradleTasksForArtifacts(artifactKinds, {
+ splitGooglePlay: region.authRegion === 'global',
+ });
log(` → gradle ${tasks.join(' ')}(已解析 JDK 17+ 运行时)`);
const androidDir = resolve(MOBILE_DIR, 'android');
const gradlew = process.platform === 'win32' ? 'gradlew.bat' : './gradlew';
@@ -221,16 +237,17 @@ function buildAndroidArtifacts(env, region, artifactKinds) {
const artifacts = {};
if (artifactKinds.includes('apk')) {
artifacts.apk = findSingleArtifact(
- join(androidDir, 'app/build/outputs/apk/release'),
+ join(androidDir, region.authRegion === 'global'
+ ? 'app/build/outputs/apk/website/release' : 'app/build/outputs/apk/release'),
'.apk',
- 'assembleRelease',
+ region.authRegion === 'global' ? 'assembleWebsiteRelease' : 'assembleRelease',
);
}
if (artifactKinds.includes('aab')) {
artifacts.aab = findSingleArtifact(
- join(androidDir, 'app/build/outputs/bundle/release'),
+ join(androidDir, 'app/build/outputs/bundle/playRelease'),
'.aab',
- 'bundleRelease',
+ 'bundlePlayRelease',
);
}
return { androidDir, artifacts, javaEnv };
@@ -274,6 +291,27 @@ function validateApkMetadata(apkPath, expectPackage, expectVersionCode) {
log(` ✓ APK manifest 校验通过(package=${expectPackage}, versionCode=${expectVersionCode})`);
}
+function validateDistributionPermissions(artifacts) {
+ if (artifacts.apk) {
+ const aapt2 = locateAapt2();
+ if (!aapt2) throw new Error('缺少 aapt2,无法验证官网 APK 的安装权限');
+ const result = spawnSync(aapt2, ['dump', 'permissions', artifacts.apk], { encoding: 'utf8' });
+ if (result.status !== 0) throw new Error('无法读取官网 APK 的权限');
+ assertAndroidInstallPermissionPresent(result.stdout);
+ log(' ✓ 官网 APK 保留 REQUEST_INSTALL_PACKAGES');
+ }
+ if (artifacts.aab) {
+ const entry = 'base/manifest/AndroidManifest.xml';
+ let result = spawnSync('unzip', ['-p', artifacts.aab, entry], { maxBuffer: 8 * 1024 * 1024 });
+ if (result.error?.code === 'ENOENT') {
+ result = spawnSync('tar', ['-xOf', artifacts.aab, entry], { maxBuffer: 8 * 1024 * 1024 });
+ }
+ if (result.status !== 0) throw new Error('无法读取 Play AAB 的最终 manifest');
+ assertGooglePlayInstallPermissionAbsent(result.stdout);
+ log(' ✓ Play AAB 不包含 REQUEST_INSTALL_PACKAGES');
+ }
+}
+
function readJsonFile(filePath, label) {
try {
return JSON.parse(readFileSync(filePath, 'utf8'));
@@ -282,17 +320,17 @@ function readJsonFile(filePath, label) {
}
}
-// AAB 的 manifest 是 protobuf,不能用 aapt2 dump badging。这里读取同一 bundleRelease
+// AAB 的 manifest 是 protobuf,不能用 aapt2 dump badging。这里读取同一 bundlePlayRelease
// 构建产生的 AGP metadata:bundle model 钉 applicationId / 输出文件,merged manifest metadata
// 钉 versionCode / versionName。任一文件缺失或结构漂移都 fail closed,不把未核验包交给上传侧。
function validateAabMetadata(aabPath, androidDir, expectPackage, expectVersionCode, expectVersionName) {
const bundleMetadataPath = join(
androidDir,
- 'app/build/intermediates/bundle_ide_model/release/produceReleaseBundleIdeListingFile/output-metadata.json',
+ 'app/build/intermediates/bundle_ide_model/playRelease/producePlayReleaseBundleIdeListingFile/output-metadata.json',
);
const manifestMetadataPath = join(
androidDir,
- 'app/build/intermediates/merged_manifests/release/processReleaseManifest/output-metadata.json',
+ 'app/build/intermediates/merged_manifests/playRelease/processPlayReleaseManifest/output-metadata.json',
);
const bundle = readJsonFile(bundleMetadataPath, 'AAB bundle metadata');
const manifest = readJsonFile(manifestMetadataPath, 'AAB manifest metadata');
@@ -437,7 +475,9 @@ async function main() {
? pwPreview('XDT_ANDROID_UPLOAD_CERT_SHA256')
: '不适用';
console.log(`sign: 自有 keystore 自签,path=${aSign.keystorePath || '(JSON 未填)'} alias=${aSign.keyAlias || '(JSON 未填)'} storePw(env ${suffix})=${pwPreview('XDT_ANDROID_KEYSTORE_PASSWORD')} keyPw(env ${suffix})=${pwPreview('XDT_ANDROID_KEY_PASSWORD')} uploadCertSha256(env ${suffix})=${uploadCertPreview}`);
- const gradleTasks = androidGradleTasksForArtifacts(artifactKinds);
+ const gradleTasks = androidGradleTasksForArtifacts(artifactKinds, {
+ splitGooglePlay: region.authRegion === 'global',
+ });
console.log(`steps: prebuild → patch build.gradle 签名 → gradlew ${gradleTasks.join(' ')} → 回读/核对 runtimeVersion → metadata/签名校验(仅构建,无上传/发布)`);
if (missingBake.length) {
console.log(`selfhost 必填缺失: ${missingBake.join(', ')}(--execute 前须在 self-host-regions.json 补齐;prebuild 期 app.config.js 硬校验)`);
@@ -492,6 +532,7 @@ async function main() {
throw new Error(`APK/AAB runtimeVersion 不一致:${JSON.stringify(runtimeVersions)}`);
}
const runtimeVersion = uniqueRuntimeVersions[0];
+ if (region.authRegion === 'global') validateDistributionPermissions(built.artifacts);
const finalArtifacts = { ...built.artifacts };
if (typeof args.out === 'string' && args.out) {
diff --git a/apps/mobile/scripts/lib/android-local.mjs b/apps/mobile/scripts/lib/android-local.mjs
index 3d5e8e6077..4e50e519e9 100644
--- a/apps/mobile/scripts/lib/android-local.mjs
+++ b/apps/mobile/scripts/lib/android-local.mjs
@@ -43,10 +43,48 @@ export function resolveAndroidArtifactKinds(authRegion, rawArtifacts) {
}
/** @param {Array<'apk'|'aab'>} kinds */
-export function androidGradleTasksForArtifacts(kinds) {
+export function androidGradleTasksForArtifacts(kinds, { splitGooglePlay = false } = {}) {
const selected = Array.isArray(kinds) ? kinds : [];
if (!selected.length) throw new Error('Android 构建至少需要一种产物');
- return selected.map((kind) => kind === 'apk' ? 'assembleRelease' : 'bundleRelease');
+ return selected.map((kind) => kind === 'apk'
+ ? (splitGooglePlay ? 'assembleWebsiteRelease' : 'assembleRelease')
+ : (splitGooglePlay ? 'bundlePlayRelease' : 'bundleRelease'));
+}
+
+/** Global APK and Play AAB share one JS-compatible runtime, but only the APK may install packages. */
+export function patchBuildGradleDistributionFlavors(source) {
+ if (typeof source !== 'string' || !source) throw new Error('Android build.gradle 为空');
+ if (source.includes('flavorDimensions "distribution"')) return source;
+ const anchor = /^android\s*\{/m;
+ if (!anchor.test(source)) throw new Error('未找到 android { 块,无法配置官网 / Play 构建变体');
+ return source.replace(anchor, (match) => `${match}
+ flavorDimensions "distribution"
+ productFlavors {
+ website { dimension "distribution" }
+ play { dimension "distribution" }
+ }`);
+}
+
+export const GOOGLE_PLAY_MANIFEST_OVERLAY = `<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
+</manifest>\n`;
+
+const INSTALL_PACKAGES_PERMISSION = 'android.permission.REQUEST_INSTALL_PACKAGES';
+
+export function assertAndroidInstallPermissionPresent(permissionsDump) {
+ if (!String(permissionsDump).includes(INSTALL_PACKAGES_PERMISSION)) {
+ throw new Error('官网 APK 缺少 REQUEST_INSTALL_PACKAGES 权限');
+ }
+}
+
+export function assertGooglePlayInstallPermissionAbsent(manifestBytes) {
+ if (!Buffer.isBuffer(manifestBytes) || manifestBytes.length === 0) {
+ throw new Error('无法读取 Play AAB 的最终 manifest');
+ }
+ if (manifestBytes.includes(Buffer.from(INSTALL_PACKAGES_PERMISSION))) {
+ throw new Error('Play AAB 仍包含 REQUEST_INSTALL_PACKAGES 权限,停止归档');
+ }
}
export const ANDROID_UPLOAD_CERT_SHA256_ENV = 'XDT_ANDROID_UPLOAD_CERT_SHA256';
diff --git a/apps/mobile/src/__tests__/androidLocal.test.ts b/apps/mobile/src/__tests__/androidLocal.test.ts
index a0c5c48f92..dba3722830 100644
--- a/apps/mobile/src/__tests__/androidLocal.test.ts
+++ b/apps/mobile/src/__tests__/androidLocal.test.ts
@@ -7,6 +7,10 @@ import { join } from 'node:path';
import { rootCertificates } from 'node:tls';
import {
androidGradleTasksForArtifacts,
+ patchBuildGradleDistributionFlavors,
+ GOOGLE_PLAY_MANIFEST_OVERLAY,
+ assertAndroidInstallPermissionPresent,
+ assertGooglePlayInstallPermissionAbsent,
assertAndroidUploadCertificateSha256,
normalizeAndroidCertificateSha256,
readAndroidVersionCode,
@@ -45,6 +49,8 @@ describe('androidGradleTasksForArtifacts', () => {
it('把产物确定性映射到 release tasks', () => {
expect(androidGradleTasksForArtifacts(['apk'])).toEqual(['assembleRelease']);
expect(androidGradleTasksForArtifacts(['apk', 'aab'])).toEqual(['assembleRelease', 'bundleRelease']);
+ expect(androidGradleTasksForArtifacts(['apk', 'aab'], { splitGooglePlay: true }))
+ .toEqual(['assembleWebsiteRelease', 'bundlePlayRelease']);
});
it('空产物集合 fail closed', () => {
@@ -52,6 +58,29 @@ describe('androidGradleTasksForArtifacts', () => {
});
});
+describe('Global Android distribution manifests', () => {
+ it('官网和 Play 使用独立变体,Play overlay 移除安装权限', () => {
+ const source = 'android {\n signingConfigs {\n }\n}\n';
+ const patched = patchBuildGradleDistributionFlavors(source);
+ expect(patched).toContain('website { dimension "distribution" }');
+ expect(patched).toContain('play { dimension "distribution" }');
+ expect(patchBuildGradleDistributionFlavors(patched)).toBe(patched);
+ expect(GOOGLE_PLAY_MANIFEST_OVERLAY).toContain('android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove"');
+ expect(() => patchBuildGradleDistributionFlavors('missing')).toThrow(/android/);
+ });
+
+ it('验证最终 APK 有权限,AAB 无权限', () => {
+ expect(() => assertAndroidInstallPermissionPresent('android.permission.REQUEST_INSTALL_PACKAGES'))
+ .not.toThrow();
+ expect(() => assertAndroidInstallPermissionPresent('android.permission.INTERNET'))
+ .toThrow(/缺少/);
+ expect(() => assertGooglePlayInstallPermissionAbsent(Buffer.from('manifest'))).not.toThrow();
+ expect(() => assertGooglePlayInstallPermissionAbsent(Buffer.from('android.permission.REQUEST_INSTALL_PACKAGES')))
+ .toThrow(/仍包含/);
+ expect(() => assertGooglePlayInstallPermissionAbsent(Buffer.alloc(0))).toThrow(/无法读取/);
+ });
+});
+
describe('Google Play upload certificate pin', () => {
const SHA256 = '0123456789abcdef'.repeat(4);
const COLON_SHA256 = SHA256.toUpperCase().match(/.{2}/g)?.join(':') ?? '';
diff --git a/apps/mobile/src/__tests__/mobileGoalCommands.test.ts b/apps/mobile/src/__tests__/mobileGoalCommands.test.ts
index a0b1658a46..7486f2ac14 100644
--- a/apps/mobile/src/__tests__/mobileGoalCommands.test.ts
+++ b/apps/mobile/src/__tests__/mobileGoalCommands.test.ts
@@ -83,7 +83,6 @@ function existingHarness(args = 'target') {
maker: { goal: { set: vi.fn(async () => {}), clear: vi.fn(async () => {}), getStatus: vi.fn(async () => ({ status: 'active', objective: 'target' })) } },
remoteSessionStore: { setGoalStatus: vi.fn(), acquireSessionMessageWork: vi.fn(() => ({ release })), getSessionDeviceId: () => 'host' }, setContextSheetView: vi.fn(), setContextSheetOpen: vi.fn(),
setGoalRestore: vi.fn(), router: { setParams: vi.fn() }, composerDocumentRef: { current: initial },
- params: {}, readRouteParam: () => null,
composerDocumentsEqual: (a: unknown, b: unknown) => JSON.stringify(a) === JSON.stringify(b),
applyComposerDocument: vi.fn(), normalizeComposerDocument, humanizeRemoteError,
composerDraftHydrated: true, voiceState: 'idle', slashCommandsRef: { current: [] }, queueEditingRef: { current: null },
diff --git a/docs/dev-rules/mobile-development.md b/docs/dev-rules/mobile-development.md
index 7899201747..7ba3d10026 100644
--- a/docs/dev-rules/mobile-development.md
+++ b/docs/dev-rules/mobile-development.md
@@ -238,8 +238,16 @@ Mobile 用 `runtimeVersion.policy: "fingerprint"`:OTA 热更只在**指纹一致
启动检查、设置页与强制更新屏共用 `src/update/useBundleUpdatePrompt.ts` 的安装出口。
Android 8 及以上的新原生包优先应用内下载 HTTPS APK;Android 7、旧包缺少
`CindyAppInstaller`,或安装地址是网页时,继续使用浏览器。权限由自建构建的
-`app.config.js` 声明;同流程生成的官网 APK 和 Google Play AAB 当前共享这一原生配置,
-EAS 商店构建不声明。
+`app.config.js` 声明;Global 在同一次 Expo prebuild 后配置 `website` / `play` 变体:
+官网 APK 保留 `REQUEST_INSTALL_PACKAGES`,Play AAB 通过 Manifest overlay 移除该权限。
+变体只修改生成的 Android 工程,不修改 Expo 配置或 fingerprint 输入;EAS 商店构建不声明
+该权限。
+
+`scripts/build-android.mjs --region global --execute` 在输出产物前自动读取官网 APK 的
+权限和 Play AAB 内嵌的最终 Manifest,分别要求有/无安装权限,并回读两份产物的
+runtimeVersion 要求一致;读取失败或不满足条件即停止构建交付。此校验随每次实际构建执行,
+覆盖最终 Manifest 合并结果。`androidLocal.test.ts` 只验证变体 patch 和权限断言,不能替代
+Expo prebuild + Gradle 的实包验证;验证构建链时需保留上述实际产物校验结果。
Global 自建 APK 与 Google Play AAB 共用自建 OTA 配置和原生构建流程,不能仅凭
`IS_OTA_SELFHOST` 判断整包更新渠道。Android 原生安装桥读取系统记录的 installer: