CRT/storebound
1
0
Fork 0
Code Issues Pull requests Releases 1 Packages 1 Activity Actions

mas: placeholders the scrub accepts

Browse source
This commit is contained in:
CRTkafa 2026-10-24 12:19:27 +08:00
parent 634d5dd71d
commit 2e1c7cdc3c
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/lib/mas.ts
View file

@ -125,7 +125,7 @@ export interface PathFreeInput { home: string; user: string; root: string; cargo
* and the home folder; no debug info; symbols stripped. Pure. */
export function pathFreeEnv(i: PathFreeInput): Record<string, string> {
const maps: [string, string][] = [
[i.root, '/src'], [i.cargoHome ?? `${i.home}/.cargo`, '/cargo'], [i.rustupHome ?? `${i.home}/.rustup`, '/rustup'], [i.home, '/home/build'],
[i.root, '/src'], [i.cargoHome ?? `${i.home}/.cargo`, '/cargo'], [i.rustupHome ?? `${i.home}/.rustup`, '/rustup'], [i.home, '/build-home'],
];
const seen = new Set<string>();
const flags = maps.filter(([from]) => from && !seen.has(from) && seen.add(from)).map(([from, to]) => `--remap-path-prefix=${from}=${to}`);

20
tests/mas-build.test.ts
View file

@ -94,23 +94,23 @@ describe('identities and profiles', () => {
describe('path-free', () => {
test('remaps checkout, cargo, rustup, home; no debug info', () => {
const e = pathFreeEnv({ home: '/Users/dev', user: 'dev', root: '/Users/dev/work/app', rustflags: '-C target-cpu=native' });
const e = pathFreeEnv({ home: '/Users/you', user: 'you', root: '/Users/you/work/app', rustflags: '-C target-cpu=native' });
expect(e.RUSTFLAGS).toContain('-C target-cpu=native');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/dev/work/app=/src');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/dev/.cargo=/cargo');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/dev/.rustup=/rustup');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/dev=/home/build');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/you/work/app=/src');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/you/.cargo=/cargo');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/you/.rustup=/rustup');
expect(e.RUSTFLAGS).toContain('--remap-path-prefix=/Users/you=/build-home');
expect(e.CARGO_PROFILE_RELEASE_DEBUG).toBe('0');
});
test('leak scan finds the home folder in a binary and a plist', () => {
const app = mkdtempSync(join(tmp, 'app-'));
mkdirSync(join(app, 'Contents/MacOS'), { recursive: true });
writeFileSync(join(app, 'Contents/MacOS/bin'), Buffer.concat([Buffer.from([0, 1, 2]), Buffer.from('panic at /Users/dev/.cargo/registry/x.rs'), Buffer.from([0])]));
writeFileSync(join(app, 'Contents/MacOS/bin'), Buffer.concat([Buffer.from([0, 1, 2]), Buffer.from('panic at /Users/you/.cargo/registry/x.rs'), Buffer.from([0])]));
writeFileSync(join(app, 'Contents/Info.plist'), 'clean');
const leaks = scanPathLeaks(app, ['/Users/dev', '/Users/dev/']);
expect(leaks.map(l => `${l.file}:${l.needle}`)).toEqual(['Contents/MacOS/bin:/Users/dev', 'Contents/MacOS/bin:/Users/dev/']);
expect(scanPathLeaks(app, ['/Users/nobody'])).toEqual([]);
const leaks = scanPathLeaks(app, ['/Users/you', '/Users/you/']);
expect(leaks.map(l => `${l.file}:${l.needle}`)).toEqual(['Contents/MacOS/bin:/Users/you', 'Contents/MacOS/bin:/Users/you/']);
expect(scanPathLeaks(app, ['/Users/me'])).toEqual([]);
});
});
@ -130,7 +130,7 @@ describe('app and pkg checks', () => {
expect(appProblems({ ...good, entitlements: null, hasProfile: false }, { ...o, signed: false }).errors).toEqual([]);
});
test('path leaks are errors with --path-free, warnings without', () => {
const leaks = [{ file: 'Contents/MacOS/bin', needle: '/Users/dev', count: 3 }];
const leaks = [{ file: 'Contents/MacOS/bin', needle: '/Users/you', count: 3 }];
expect(appProblems({ ...good, leaks }, o).errors[0]).toContain('local paths');
const w = appProblems({ ...good, leaks }, { ...o, pathFree: false });
expect(w.errors).toEqual([]);