lim 0.30.2 → 0.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/base-command.d.ts +3 -0
- package/dist/base-command.d.ts.map +1 -1
- package/dist/base-command.js +10 -0
- package/dist/base-command.js.map +1 -1
- package/dist/commands/android/app-logs.d.ts +17 -0
- package/dist/commands/android/app-logs.d.ts.map +1 -0
- package/dist/commands/android/app-logs.js +35 -0
- package/dist/commands/android/app-logs.js.map +1 -0
- package/dist/commands/android/create.d.ts +4 -0
- package/dist/commands/android/create.d.ts.map +1 -1
- package/dist/commands/android/create.js +45 -0
- package/dist/commands/android/create.js.map +1 -1
- package/dist/commands/android/events.d.ts +17 -0
- package/dist/commands/android/events.d.ts.map +1 -0
- package/dist/commands/android/events.js +35 -0
- package/dist/commands/android/events.js.map +1 -0
- package/dist/commands/android/record.d.ts +2 -0
- package/dist/commands/android/record.d.ts.map +1 -1
- package/dist/commands/android/record.js +27 -3
- package/dist/commands/android/record.js.map +1 -1
- package/dist/commands/android/recordings.d.ts +17 -0
- package/dist/commands/android/recordings.d.ts.map +1 -0
- package/dist/commands/android/recordings.js +35 -0
- package/dist/commands/android/recordings.js.map +1 -0
- package/dist/commands/android/tunnel/index.d.ts +29 -0
- package/dist/commands/android/tunnel/index.d.ts.map +1 -0
- package/dist/commands/android/tunnel/index.js +170 -0
- package/dist/commands/android/tunnel/index.js.map +1 -0
- package/dist/commands/android/tunnel/index.test.d.ts +2 -0
- package/dist/commands/android/tunnel/index.test.d.ts.map +1 -0
- package/dist/commands/android/tunnel/index.test.js +66 -0
- package/dist/commands/android/tunnel/index.test.js.map +1 -0
- package/dist/commands/android/tunnel/status.d.ts +17 -0
- package/dist/commands/android/tunnel/status.d.ts.map +1 -0
- package/dist/commands/android/tunnel/status.js +61 -0
- package/dist/commands/android/tunnel/status.js.map +1 -0
- package/dist/commands/android/tunnel/stop.d.ts +17 -0
- package/dist/commands/android/tunnel/stop.d.ts.map +1 -0
- package/dist/commands/android/tunnel/stop.js +50 -0
- package/dist/commands/android/tunnel/stop.js.map +1 -0
- package/dist/commands/ios/app-logs.d.ts +17 -0
- package/dist/commands/ios/app-logs.d.ts.map +1 -0
- package/dist/commands/ios/app-logs.js +35 -0
- package/dist/commands/ios/app-logs.js.map +1 -0
- package/dist/commands/ios/create.d.ts +4 -0
- package/dist/commands/ios/create.d.ts.map +1 -1
- package/dist/commands/ios/create.js +45 -0
- package/dist/commands/ios/create.js.map +1 -1
- package/dist/commands/ios/events.d.ts +17 -0
- package/dist/commands/ios/events.d.ts.map +1 -0
- package/dist/commands/ios/events.js +35 -0
- package/dist/commands/ios/events.js.map +1 -0
- package/dist/commands/ios/launch-app.js +1 -1
- package/dist/commands/ios/launch-app.js.map +1 -1
- package/dist/commands/ios/record.d.ts +2 -0
- package/dist/commands/ios/record.d.ts.map +1 -1
- package/dist/commands/ios/record.js +27 -3
- package/dist/commands/ios/record.js.map +1 -1
- package/dist/commands/ios/recordings.d.ts +17 -0
- package/dist/commands/ios/recordings.d.ts.map +1 -0
- package/dist/commands/ios/recordings.js +35 -0
- package/dist/commands/ios/recordings.js.map +1 -0
- package/dist/commands/ios/tunnel/index.d.ts +3 -9
- package/dist/commands/ios/tunnel/index.d.ts.map +1 -1
- package/dist/commands/ios/tunnel/index.js +33 -239
- package/dist/commands/ios/tunnel/index.js.map +1 -1
- package/dist/commands/ios/tunnel/status.d.ts.map +1 -1
- package/dist/commands/ios/tunnel/status.js +17 -41
- package/dist/commands/ios/tunnel/status.js.map +1 -1
- package/dist/commands/ios/tunnel/stop.d.ts +0 -4
- package/dist/commands/ios/tunnel/stop.d.ts.map +1 -1
- package/dist/commands/ios/tunnel/stop.js +13 -111
- package/dist/commands/ios/tunnel/stop.js.map +1 -1
- package/dist/commands/xcode/build.d.ts +1 -0
- package/dist/commands/xcode/build.d.ts.map +1 -1
- package/dist/commands/xcode/build.js +16 -0
- package/dist/commands/xcode/build.js.map +1 -1
- package/dist/lib/duration.d.ts +5 -0
- package/dist/lib/duration.d.ts.map +1 -1
- package/dist/lib/duration.js +21 -0
- package/dist/lib/duration.js.map +1 -1
- package/dist/lib/session-artifacts.d.ts +11 -0
- package/dist/lib/session-artifacts.d.ts.map +1 -0
- package/dist/lib/session-artifacts.js +30 -0
- package/dist/lib/session-artifacts.js.map +1 -0
- package/dist/lib/session-captures.d.ts +41 -0
- package/dist/lib/session-captures.d.ts.map +1 -0
- package/dist/lib/session-captures.js +55 -0
- package/dist/lib/session-captures.js.map +1 -0
- package/dist/lib/tunnel-command.d.ts +98 -0
- package/dist/lib/tunnel-command.d.ts.map +1 -0
- package/dist/lib/tunnel-command.js +542 -0
- package/dist/lib/tunnel-command.js.map +1 -0
- package/dist/lib/tunnel-command.test.d.ts +2 -0
- package/dist/lib/tunnel-command.test.d.ts.map +1 -0
- package/dist/lib/tunnel-command.test.js +91 -0
- package/dist/lib/tunnel-command.test.js.map +1 -0
- package/dist/lib/tunnel-har.d.ts +14 -0
- package/dist/lib/tunnel-har.d.ts.map +1 -0
- package/dist/lib/tunnel-har.js +150 -0
- package/dist/lib/tunnel-har.js.map +1 -0
- package/dist/lib/tunnel-har.test.d.ts +2 -0
- package/dist/lib/tunnel-har.test.d.ts.map +1 -0
- package/dist/lib/tunnel-har.test.js +164 -0
- package/dist/lib/tunnel-har.test.js.map +1 -0
- package/dist/lib/tunnel-process.d.ts +98 -0
- package/dist/lib/tunnel-process.d.ts.map +1 -0
- package/dist/lib/{ios-tunnel-process.js → tunnel-process.js} +87 -97
- package/dist/lib/tunnel-process.js.map +1 -0
- package/dist/lib/tunnel-process.test.d.ts +2 -0
- package/dist/lib/tunnel-process.test.d.ts.map +1 -0
- package/dist/lib/tunnel-process.test.js +428 -0
- package/dist/lib/tunnel-process.test.js.map +1 -0
- package/dist/lib/xcode-signing-options.d.ts +10 -0
- package/dist/lib/xcode-signing-options.d.ts.map +1 -1
- package/dist/lib/xcode-signing-options.js +42 -0
- package/dist/lib/xcode-signing-options.js.map +1 -1
- package/dist/lib/xcode-signing-options.test.js +32 -0
- package/dist/lib/xcode-signing-options.test.js.map +1 -1
- package/package.json +2 -2
- package/dist/lib/ios-tunnel-process.d.ts +0 -70
- package/dist/lib/ios-tunnel-process.d.ts.map +0 -1
- package/dist/lib/ios-tunnel-process.js.map +0 -1
- package/dist/lib/ios-tunnel-process.test.d.ts +0 -2
- package/dist/lib/ios-tunnel-process.test.d.ts.map +0 -1
- package/dist/lib/ios-tunnel-process.test.js +0 -339
- package/dist/lib/ios-tunnel-process.test.js.map +0 -1
|
@@ -0,0 +1,428 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const child_process_1 = require("child_process");
|
|
7
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
8
|
+
const fs_1 = __importDefault(require("fs"));
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
|
+
const tunnel_process_1 = require("./tunnel-process");
|
|
12
|
+
const INSTANCE_ID = 'android_test_123';
|
|
13
|
+
const OWNER_1 = '1'.repeat(32);
|
|
14
|
+
const OWNER_2 = '2'.repeat(32);
|
|
15
|
+
const OWNER_3 = '3'.repeat(32);
|
|
16
|
+
describe('tunnel process state', () => {
|
|
17
|
+
let root;
|
|
18
|
+
beforeEach(() => {
|
|
19
|
+
root = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'lim-tunnel-'));
|
|
20
|
+
});
|
|
21
|
+
afterEach(() => {
|
|
22
|
+
fs_1.default.rmSync(root, { recursive: true, force: true });
|
|
23
|
+
});
|
|
24
|
+
test.each([
|
|
25
|
+
['LOCALHOST:3000', { host: 'localhost', port: 3000 }],
|
|
26
|
+
['10.20.30.40:8000', { host: '10.20.30.40', port: 8000 }],
|
|
27
|
+
['[2001:db8::1]:8443', { host: '2001:db8::1', port: 8443 }],
|
|
28
|
+
['[::ffff:192.0.2.1]:9443', { host: '192.0.2.1', port: 9443 }],
|
|
29
|
+
])('parses exact selector %s', (input, expected) => {
|
|
30
|
+
const host = expected.host.includes(':') ? `[${expected.host}]` : expected.host;
|
|
31
|
+
expect((0, tunnel_process_1.parseTunnelSelectors)([input])).toEqual([`${host}:${expected.port}`]);
|
|
32
|
+
});
|
|
33
|
+
test.each([
|
|
34
|
+
'localhost.:8000',
|
|
35
|
+
':8000',
|
|
36
|
+
'10.20.30.40:0',
|
|
37
|
+
'10.20.30.40:53',
|
|
38
|
+
'10.20.30.40:65536',
|
|
39
|
+
'localhost:+8000',
|
|
40
|
+
'localhost:1e3',
|
|
41
|
+
'2001:db8::1:443',
|
|
42
|
+
'[::192.0.2.1]:443',
|
|
43
|
+
'[::2]:443',
|
|
44
|
+
])('rejects malformed selector %s', (input) => {
|
|
45
|
+
expect(() => (0, tunnel_process_1.parseTunnelSelectors)([input])).toThrow();
|
|
46
|
+
});
|
|
47
|
+
test('applies the Android minimum selector port', () => {
|
|
48
|
+
expect(() => (0, tunnel_process_1.parseTunnelSelectors)(['localhost:80'], { minPort: 1024 })).toThrow();
|
|
49
|
+
expect((0, tunnel_process_1.parseTunnelSelectors)(['localhost:8080'], { minPort: 1024 })).toEqual(['localhost:8080']);
|
|
50
|
+
});
|
|
51
|
+
test.each([
|
|
52
|
+
['API.Corp.Example', 'api.corp.example'],
|
|
53
|
+
['*.Corp.Example', '*.corp.example'],
|
|
54
|
+
])('parses domain selector %s', (input, expected) => {
|
|
55
|
+
expect((0, tunnel_process_1.parseTunnelSelectors)([input])).toEqual([expected]);
|
|
56
|
+
});
|
|
57
|
+
test.each(['corp.example.', 'api.*.example', 'localhost', '192.0.2.1'])('rejects malformed domain %s', (input) => {
|
|
58
|
+
expect(() => (0, tunnel_process_1.parseTunnelSelectors)([input])).toThrow();
|
|
59
|
+
});
|
|
60
|
+
test('parses mixed selectors and rejects domains where unsupported', () => {
|
|
61
|
+
expect((0, tunnel_process_1.parseTunnelSelectors)(['localhost:8080', '*.corp.example'])).toEqual([
|
|
62
|
+
'localhost:8080',
|
|
63
|
+
'*.corp.example',
|
|
64
|
+
]);
|
|
65
|
+
expect(() => (0, tunnel_process_1.parseTunnelSelectors)(['*.corp.example'], { allowDomains: false })).toThrow('supports only localhost:port or literal IP:port');
|
|
66
|
+
});
|
|
67
|
+
test('builds a child command replaying every selector kind', () => {
|
|
68
|
+
const owner = (0, tunnel_process_1.newTunnelOwner)();
|
|
69
|
+
expect((0, tunnel_process_1.buildTunnelServeArgs)({
|
|
70
|
+
scriptPath: '/lim/run.js',
|
|
71
|
+
product: 'android',
|
|
72
|
+
instanceId: INSTANCE_ID,
|
|
73
|
+
owner,
|
|
74
|
+
selectors: ['10.20.30.40:8000', '[2001:db8::1]:8443', '*.corp.example'],
|
|
75
|
+
})).toEqual([
|
|
76
|
+
'/lim/run.js',
|
|
77
|
+
'android',
|
|
78
|
+
'tunnel',
|
|
79
|
+
'--serve',
|
|
80
|
+
'--no-create',
|
|
81
|
+
'--id',
|
|
82
|
+
INSTANCE_ID,
|
|
83
|
+
`--tunnel-owner=${owner}`,
|
|
84
|
+
'--selector',
|
|
85
|
+
'10.20.30.40:8000',
|
|
86
|
+
'--selector',
|
|
87
|
+
'[2001:db8::1]:8443',
|
|
88
|
+
'--selector',
|
|
89
|
+
'*.corp.example',
|
|
90
|
+
]);
|
|
91
|
+
});
|
|
92
|
+
test('replays --verbose to the child command', () => {
|
|
93
|
+
const owner = (0, tunnel_process_1.newTunnelOwner)();
|
|
94
|
+
const args = (0, tunnel_process_1.buildTunnelServeArgs)({
|
|
95
|
+
scriptPath: '/lim/run.js',
|
|
96
|
+
product: 'android',
|
|
97
|
+
instanceId: INSTANCE_ID,
|
|
98
|
+
owner,
|
|
99
|
+
selectors: ['*.corp.example'],
|
|
100
|
+
verbose: true,
|
|
101
|
+
});
|
|
102
|
+
expect(args).toContain('--verbose');
|
|
103
|
+
expect(args.indexOf('--verbose')).toBeLessThan(args.indexOf('--selector'));
|
|
104
|
+
});
|
|
105
|
+
test('replays only safe Android inspection and HAR options to the detached child', () => {
|
|
106
|
+
const owner = (0, tunnel_process_1.newTunnelOwner)();
|
|
107
|
+
const args = (0, tunnel_process_1.buildTunnelServeArgs)({
|
|
108
|
+
scriptPath: '/lim/run.js',
|
|
109
|
+
product: 'android',
|
|
110
|
+
instanceId: INSTANCE_ID,
|
|
111
|
+
owner,
|
|
112
|
+
selectors: ['api.example.test'],
|
|
113
|
+
inspect: true,
|
|
114
|
+
persist: true,
|
|
115
|
+
ttlSeconds: 604800,
|
|
116
|
+
harPath: '/tmp/private traffic.har',
|
|
117
|
+
harBodyLimit: 4 * 1024 * 1024,
|
|
118
|
+
});
|
|
119
|
+
expect(args).toEqual(expect.arrayContaining([
|
|
120
|
+
'--inspect',
|
|
121
|
+
'--persist',
|
|
122
|
+
'--ttl',
|
|
123
|
+
'604800',
|
|
124
|
+
'--har',
|
|
125
|
+
'/tmp/private traffic.har',
|
|
126
|
+
'--har-body-limit',
|
|
127
|
+
String(4 * 1024 * 1024),
|
|
128
|
+
]));
|
|
129
|
+
expect(args.join(' ')).not.toContain('token');
|
|
130
|
+
});
|
|
131
|
+
test('builds an iOS child command with selectors', () => {
|
|
132
|
+
const owner = (0, tunnel_process_1.newTunnelOwner)();
|
|
133
|
+
expect((0, tunnel_process_1.buildTunnelServeArgs)({
|
|
134
|
+
scriptPath: '/lim/run.js',
|
|
135
|
+
product: 'ios',
|
|
136
|
+
instanceId: 'ios_test_123',
|
|
137
|
+
owner,
|
|
138
|
+
selectors: ['10.20.30.40:8000'],
|
|
139
|
+
})).toEqual([
|
|
140
|
+
'/lim/run.js',
|
|
141
|
+
'ios',
|
|
142
|
+
'tunnel',
|
|
143
|
+
'--serve',
|
|
144
|
+
'--no-create',
|
|
145
|
+
'--id',
|
|
146
|
+
'ios_test_123',
|
|
147
|
+
`--tunnel-owner=${owner}`,
|
|
148
|
+
'--selector',
|
|
149
|
+
'10.20.30.40:8000',
|
|
150
|
+
]);
|
|
151
|
+
});
|
|
152
|
+
test('formats dial failures with every correlation ID', () => {
|
|
153
|
+
expect((0, tunnel_process_1.formatTunnelDialFailure)({
|
|
154
|
+
tunnelId: 'tunnel-1',
|
|
155
|
+
connectionId: 7,
|
|
156
|
+
selectorId: 'selector-3',
|
|
157
|
+
reason: 'dns_not_found',
|
|
158
|
+
osCode: 'ENOTFOUND',
|
|
159
|
+
})).toBe('Last dial failure: tunnel tunnel-1, connection 7, selector-3 (dns_not_found, ENOTFOUND)');
|
|
160
|
+
});
|
|
161
|
+
test('formats every selector kind for display', () => {
|
|
162
|
+
expect((0, tunnel_process_1.formatTunnelSelectors)(['localhost:8080', '*.corp.example'])).toEqual([
|
|
163
|
+
'localhost:8080',
|
|
164
|
+
'*.corp.example',
|
|
165
|
+
]);
|
|
166
|
+
});
|
|
167
|
+
test('forwards an explicit API key only through the child environment', () => {
|
|
168
|
+
expect((0, tunnel_process_1.tunnelChildEnvironment)('secret', { PATH: '/bin', LIM_API_KEY: 'old' })).toEqual({
|
|
169
|
+
PATH: '/bin',
|
|
170
|
+
LIM_API_KEY: 'secret',
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
test('accepts READY written exactly at the parent deadline', async () => {
|
|
174
|
+
let now = 0;
|
|
175
|
+
let reads = 0;
|
|
176
|
+
const ready = makeReadyState();
|
|
177
|
+
await expect((0, tunnel_process_1.waitForTunnelProcessReady)({
|
|
178
|
+
load: () => {
|
|
179
|
+
reads += 1;
|
|
180
|
+
if (reads === 1)
|
|
181
|
+
return makeState({ pid: 123 });
|
|
182
|
+
return ready;
|
|
183
|
+
},
|
|
184
|
+
isAlive: () => true,
|
|
185
|
+
sleep: async (milliseconds) => {
|
|
186
|
+
now += milliseconds;
|
|
187
|
+
},
|
|
188
|
+
now: () => now,
|
|
189
|
+
timeoutMs: 100,
|
|
190
|
+
pollMs: 100,
|
|
191
|
+
})).resolves.toEqual({ outcome: 'ready', state: ready });
|
|
192
|
+
});
|
|
193
|
+
test('does not accept stale READY from an exited child', async () => {
|
|
194
|
+
const ready = makeReadyState();
|
|
195
|
+
await expect((0, tunnel_process_1.waitForTunnelProcessReady)({
|
|
196
|
+
load: () => ready,
|
|
197
|
+
isAlive: () => false,
|
|
198
|
+
sleep: async () => { },
|
|
199
|
+
})).resolves.toEqual({ outcome: 'exited' });
|
|
200
|
+
});
|
|
201
|
+
test('does not mistake a reused PID for the spawned child', () => {
|
|
202
|
+
expect((0, tunnel_process_1.isSpawnedTunnelProcessAlive)({ exitCode: 0, signalCode: null }, process.pid)).toBe(false);
|
|
203
|
+
expect((0, tunnel_process_1.isSpawnedTunnelProcessAlive)({ exitCode: null, signalCode: null }, process.pid)).toBe(true);
|
|
204
|
+
});
|
|
205
|
+
test('selects only owners correlated with the fetched server tunnel ID', () => {
|
|
206
|
+
const oldOwner = makeReadyState({
|
|
207
|
+
owner: OWNER_1,
|
|
208
|
+
tunnelId: 'old-tunnel',
|
|
209
|
+
});
|
|
210
|
+
const replacement = makeReadyState({
|
|
211
|
+
owner: OWNER_2,
|
|
212
|
+
tunnelId: 'replacement',
|
|
213
|
+
});
|
|
214
|
+
const starting = makeState({ owner: OWNER_3, pid: 456 });
|
|
215
|
+
expect((0, tunnel_process_1.selectTunnelOwnersForStop)([oldOwner, replacement, starting], 'old-tunnel')).toEqual([
|
|
216
|
+
oldOwner,
|
|
217
|
+
starting,
|
|
218
|
+
]);
|
|
219
|
+
expect((0, tunnel_process_1.selectTunnelOwnersForStop)([oldOwner, replacement, starting], undefined)).toEqual([
|
|
220
|
+
oldOwner,
|
|
221
|
+
replacement,
|
|
222
|
+
starting,
|
|
223
|
+
]);
|
|
224
|
+
});
|
|
225
|
+
test('observes a disconnect that happened before subscription', () => {
|
|
226
|
+
const unsubscribe = jest.fn();
|
|
227
|
+
const onDisconnect = jest.fn();
|
|
228
|
+
const dispose = (0, tunnel_process_1.subscribeTunnelDisconnect)({
|
|
229
|
+
getConnectionState: () => 'disconnected',
|
|
230
|
+
onConnectionStateChange: () => unsubscribe,
|
|
231
|
+
}, onDisconnect);
|
|
232
|
+
expect(onDisconnect).toHaveBeenCalledTimes(1);
|
|
233
|
+
expect(unsubscribe).toHaveBeenCalledTimes(1);
|
|
234
|
+
dispose();
|
|
235
|
+
});
|
|
236
|
+
test('classifies only the stable stop 404 error as already gone', () => {
|
|
237
|
+
expect((0, tunnel_process_1.stopTunnelErrorIsNotFound)(new Error('stopTunnel failed: 404 missing'))).toBe(true);
|
|
238
|
+
expect((0, tunnel_process_1.stopTunnelErrorIsNotFound)(new Error('stopTunnel failed: 500 broken'))).toBe(false);
|
|
239
|
+
});
|
|
240
|
+
test('keeps each owner state isolated through update and clear', () => {
|
|
241
|
+
const state = makeState({ owner: OWNER_1, pid: process.pid, status: 'starting' });
|
|
242
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(state, root)).toBe(true);
|
|
243
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(makeState({ owner: OWNER_2 }), root)).toBe(true);
|
|
244
|
+
expect((0, tunnel_process_1.listTunnelProcesses)(INSTANCE_ID, root)).toHaveLength(2);
|
|
245
|
+
const ready = makeState({
|
|
246
|
+
owner: OWNER_1,
|
|
247
|
+
pid: process.pid,
|
|
248
|
+
status: 'ready',
|
|
249
|
+
tunnelId: 'tunnel-1',
|
|
250
|
+
});
|
|
251
|
+
(0, tunnel_process_1.updateTunnelProcess)(ready, OWNER_1, root);
|
|
252
|
+
expect((0, tunnel_process_1.loadTunnelProcess)(INSTANCE_ID, OWNER_1, root)).toEqual(ready);
|
|
253
|
+
expect(() => (0, tunnel_process_1.updateTunnelProcess)(ready, OWNER_2, root)).toThrow('Tunnel process ownership changed during startup');
|
|
254
|
+
expect((0, tunnel_process_1.clearTunnelProcess)(INSTANCE_ID, OWNER_2, root)).toBe(true);
|
|
255
|
+
expect((0, tunnel_process_1.loadTunnelProcess)(INSTANCE_ID, OWNER_1, root)).toEqual(ready);
|
|
256
|
+
expect((0, tunnel_process_1.clearTunnelProcess)(INSTANCE_ID, OWNER_1, root)).toBe(true);
|
|
257
|
+
expect((0, tunnel_process_1.listTunnelProcesses)(INSTANCE_ID, root)).toEqual([]);
|
|
258
|
+
});
|
|
259
|
+
test('a cancelled starting owner cannot become ready again', () => {
|
|
260
|
+
const starting = makeState({ owner: OWNER_1, pid: process.pid, status: 'starting' });
|
|
261
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(starting, root)).toBe(true);
|
|
262
|
+
expect((0, tunnel_process_1.isTunnelProcessCancelled)(INSTANCE_ID, OWNER_1, root)).toBe(false);
|
|
263
|
+
// A stop marks cancellation first, before signaling the child.
|
|
264
|
+
(0, tunnel_process_1.markTunnelProcessCancelled)(INSTANCE_ID, OWNER_1, root);
|
|
265
|
+
expect((0, tunnel_process_1.isTunnelProcessCancelled)(INSTANCE_ID, OWNER_1, root)).toBe(true);
|
|
266
|
+
// The child's ready transition (or reconnect replay) now fails closed.
|
|
267
|
+
expect(() => (0, tunnel_process_1.updateTunnelProcess)(makeState({ owner: OWNER_1, pid: process.pid, status: 'ready', tunnelId: 'tunnel-race' }), OWNER_1, root)).toThrow('Tunnel process ownership changed during startup');
|
|
268
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(starting, root)).toBe(false);
|
|
269
|
+
});
|
|
270
|
+
test('keeps expired ownership visible for process cleanup', () => {
|
|
271
|
+
const now = Date.now();
|
|
272
|
+
const abandoned = makeState({
|
|
273
|
+
owner: OWNER_1,
|
|
274
|
+
pid: process.pid,
|
|
275
|
+
status: 'starting',
|
|
276
|
+
startedAt: new Date(now - 30000).toISOString(),
|
|
277
|
+
});
|
|
278
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(abandoned, root)).toBe(true);
|
|
279
|
+
expect((0, tunnel_process_1.loadTunnelProcess)(abandoned.instanceId, OWNER_1, root)).toEqual(abandoned);
|
|
280
|
+
expect((0, tunnel_process_1.tunnelProcessStartingLeaseExpired)(abandoned, now)).toBe(true);
|
|
281
|
+
expect((0, tunnel_process_1.tunnelProcessStartingLeaseExpired)({ ...abandoned, startedAt: new Date(now - 29999).toISOString() }, now)).toBe(false);
|
|
282
|
+
const replacement = makeState({ owner: OWNER_2, pid: 0, status: 'starting' });
|
|
283
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(replacement, root)).toBe(true);
|
|
284
|
+
expect((0, tunnel_process_1.listTunnelProcesses)(INSTANCE_ID, root)
|
|
285
|
+
.map((state) => state.owner)
|
|
286
|
+
.sort()).toEqual([OWNER_1, OWNER_2]);
|
|
287
|
+
});
|
|
288
|
+
test('does not overwrite the same owner claim', () => {
|
|
289
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(makeState({ owner: OWNER_1, pid: 0 }), root)).toBe(true);
|
|
290
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(makeState({ owner: OWNER_1, pid: 0 }), root)).toBe(false);
|
|
291
|
+
});
|
|
292
|
+
test('cannot update or reclaim an owner after cleanup starts', () => {
|
|
293
|
+
const starting = makeState({ owner: OWNER_1, pid: 0 });
|
|
294
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(starting, root)).toBe(true);
|
|
295
|
+
expect((0, tunnel_process_1.clearTunnelProcess)(INSTANCE_ID, OWNER_1, root)).toBe(true);
|
|
296
|
+
expect((0, tunnel_process_1.clearTunnelProcess)(INSTANCE_ID, OWNER_1, root)).toBe(true);
|
|
297
|
+
expect(() => (0, tunnel_process_1.updateTunnelProcess)(makeReadyState({ owner: OWNER_1, pid: 123 }), OWNER_1, root)).toThrow('Tunnel process ownership changed during startup');
|
|
298
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(starting, root)).toBe(false);
|
|
299
|
+
expect((0, tunnel_process_1.loadTunnelProcess)(INSTANCE_ID, OWNER_1, root)).toBeUndefined();
|
|
300
|
+
});
|
|
301
|
+
test('verifies process identity before treating a PID as the owner', async () => {
|
|
302
|
+
const owner = crypto_1.default.randomBytes(16).toString('hex');
|
|
303
|
+
const child = (0, child_process_1.spawn)(process.execPath, ['-e', 'setInterval(() => {}, 1000)', '--', `--tunnel-owner=${owner}`], { stdio: 'ignore' });
|
|
304
|
+
const pid = child.pid;
|
|
305
|
+
if (!pid)
|
|
306
|
+
throw new Error('child process did not start');
|
|
307
|
+
const state = makeState({ owner, pid, status: 'starting' });
|
|
308
|
+
try {
|
|
309
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(state, root)).toBe(true);
|
|
310
|
+
await waitFor(() => (0, tunnel_process_1.tunnelOwnerProcessIdentity)(state) === 'match');
|
|
311
|
+
expect((0, tunnel_process_1.tunnelOwnerProcessIdentity)({ ...state, owner: OWNER_1 })).toBe('mismatch');
|
|
312
|
+
expect((0, tunnel_process_1.signalTunnelOwner)({ ...state, owner: OWNER_1 }, 'SIGTERM')).toBe('mismatch');
|
|
313
|
+
expect((0, tunnel_process_1.clearTunnelProcess)(state.instanceId, owner, root)).toBe(false);
|
|
314
|
+
const exited = new Promise((resolve) => child.once('exit', () => resolve()));
|
|
315
|
+
expect((0, tunnel_process_1.signalTunnelOwner)(state, 'SIGKILL')).toBe('signaled');
|
|
316
|
+
await exited;
|
|
317
|
+
}
|
|
318
|
+
finally {
|
|
319
|
+
if (child.exitCode === null && child.signalCode === null) {
|
|
320
|
+
const exited = new Promise((resolve) => child.once('exit', () => resolve()));
|
|
321
|
+
child.kill('SIGKILL');
|
|
322
|
+
await exited;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
expect((0, tunnel_process_1.clearTunnelProcess)(state.instanceId, owner, root)).toBe(true);
|
|
326
|
+
});
|
|
327
|
+
test.each([
|
|
328
|
+
{ startedAt: new Date(Date.now() + 120000).toISOString() },
|
|
329
|
+
{ startedAt: 123 },
|
|
330
|
+
{ startedAt: new Date().toUTCString() },
|
|
331
|
+
{ logPath: '/tmp/attacker.log' },
|
|
332
|
+
{ tunnelId: 'premature' },
|
|
333
|
+
{ status: 'ready', pid: 0 },
|
|
334
|
+
{ product: 'linux' },
|
|
335
|
+
{ selectors: ['*.example.com:443'] },
|
|
336
|
+
{ selectors: ['LOCALHOST:3000'] },
|
|
337
|
+
{ selectors: ['10.20.30.40:53'] },
|
|
338
|
+
{ selectors: ['[::2]:443'] },
|
|
339
|
+
{ selectors: ['localhost:3000', 'localhost:3000'] },
|
|
340
|
+
{ selectors: ['api.*.example'] },
|
|
341
|
+
{ selectors: [] },
|
|
342
|
+
])('rejects malformed persisted state %#', (overrides) => {
|
|
343
|
+
const state = overrides.status === 'ready' ? makeReadyState(overrides) : makeState(overrides);
|
|
344
|
+
const paths = (0, tunnel_process_1.tunnelProcessPaths)(state.instanceId, state.owner, root);
|
|
345
|
+
fs_1.default.mkdirSync(paths.directory, { recursive: true });
|
|
346
|
+
fs_1.default.writeFileSync(paths.state, JSON.stringify(state));
|
|
347
|
+
expect((0, tunnel_process_1.loadTunnelProcess)(state.instanceId, state.owner, root)).toBeUndefined();
|
|
348
|
+
});
|
|
349
|
+
test('uses a bounded hashed path and reads the log tail', () => {
|
|
350
|
+
const paths = (0, tunnel_process_1.tunnelProcessPaths)('android_region_secret-customer-id', OWNER_1, root);
|
|
351
|
+
expect(paths.directory).not.toContain('secret-customer-id');
|
|
352
|
+
fs_1.default.mkdirSync(paths.directory, { recursive: true });
|
|
353
|
+
fs_1.default.writeFileSync(paths.log, `${'x'.repeat(128 * 1024)}\none\ntwo\nthree\n`);
|
|
354
|
+
expect((0, tunnel_process_1.readTunnelLogTail)(paths.log, 2, 64 * 1024)).toBe('two\nthree');
|
|
355
|
+
});
|
|
356
|
+
test('rotates an oversized retained log', () => {
|
|
357
|
+
const paths = (0, tunnel_process_1.tunnelProcessPaths)(INSTANCE_ID, OWNER_1, root);
|
|
358
|
+
fs_1.default.mkdirSync(paths.directory, { recursive: true });
|
|
359
|
+
fs_1.default.writeFileSync(paths.log, 'old log');
|
|
360
|
+
fs_1.default.closeSync((0, tunnel_process_1.prepareTunnelLog)(paths.log, 1));
|
|
361
|
+
expect(fs_1.default.readFileSync(`${paths.log}.1`, 'utf8')).toBe('g');
|
|
362
|
+
expect(fs_1.default.readFileSync(paths.log, 'utf8')).toBe('');
|
|
363
|
+
});
|
|
364
|
+
test('caps a log while its append descriptor remains open', () => {
|
|
365
|
+
const paths = (0, tunnel_process_1.tunnelProcessPaths)(INSTANCE_ID, OWNER_1, root);
|
|
366
|
+
const descriptor = (0, tunnel_process_1.prepareTunnelLog)(paths.log, 1024);
|
|
367
|
+
fs_1.default.writeSync(descriptor, 'old log');
|
|
368
|
+
expect((0, tunnel_process_1.capTunnelLog)(paths.log, 4)).toBe(true);
|
|
369
|
+
fs_1.default.writeSync(descriptor, 'new');
|
|
370
|
+
fs_1.default.closeSync(descriptor);
|
|
371
|
+
expect(fs_1.default.readFileSync(`${paths.log}.1`, 'utf8')).toBe(' log');
|
|
372
|
+
expect(fs_1.default.readFileSync(paths.log, 'utf8')).toBe('new');
|
|
373
|
+
});
|
|
374
|
+
test('retains only the newest completed tunnel logs', () => {
|
|
375
|
+
const retiredOwners = [OWNER_1, OWNER_2, OWNER_3];
|
|
376
|
+
for (const [index, owner] of retiredOwners.entries()) {
|
|
377
|
+
const paths = (0, tunnel_process_1.tunnelProcessPaths)(INSTANCE_ID, owner, root);
|
|
378
|
+
fs_1.default.mkdirSync(paths.directory, { recursive: true });
|
|
379
|
+
fs_1.default.writeFileSync(paths.log, owner);
|
|
380
|
+
const modified = new Date(Date.now() + (index + 1) * 1000);
|
|
381
|
+
fs_1.default.utimesSync(paths.log, modified, modified);
|
|
382
|
+
}
|
|
383
|
+
const oldestPaths = (0, tunnel_process_1.tunnelProcessPaths)(INSTANCE_ID, OWNER_1, root);
|
|
384
|
+
fs_1.default.writeFileSync(`${oldestPaths.log}.1`, 'rotated');
|
|
385
|
+
const activeOwner = '4'.repeat(32);
|
|
386
|
+
const active = makeState({ owner: activeOwner, pid: process.pid });
|
|
387
|
+
expect((0, tunnel_process_1.claimTunnelProcess)(active, root)).toBe(true);
|
|
388
|
+
fs_1.default.writeFileSync((0, tunnel_process_1.tunnelProcessPaths)(INSTANCE_ID, activeOwner, root).log, 'active');
|
|
389
|
+
(0, tunnel_process_1.pruneTunnelLogs)(INSTANCE_ID, root, 2);
|
|
390
|
+
const directory = (0, tunnel_process_1.tunnelProcessPaths)(INSTANCE_ID, OWNER_1, root).directory;
|
|
391
|
+
expect(fs_1.default
|
|
392
|
+
.readdirSync(directory)
|
|
393
|
+
.filter((entry) => entry.endsWith('.log'))
|
|
394
|
+
.sort()).toEqual([`${OWNER_2}.log`, `${OWNER_3}.log`, `${activeOwner}.log`].sort());
|
|
395
|
+
expect(fs_1.default.existsSync(`${oldestPaths.log}.1`)).toBe(false);
|
|
396
|
+
});
|
|
397
|
+
function makeReadyState(overrides = {}) {
|
|
398
|
+
return makeState({
|
|
399
|
+
pid: 123,
|
|
400
|
+
status: 'ready',
|
|
401
|
+
tunnelId: 'tunnel-1',
|
|
402
|
+
...overrides,
|
|
403
|
+
});
|
|
404
|
+
}
|
|
405
|
+
function makeState(overrides) {
|
|
406
|
+
const owner = overrides.owner ?? OWNER_1;
|
|
407
|
+
return {
|
|
408
|
+
owner,
|
|
409
|
+
pid: 0,
|
|
410
|
+
instanceId: INSTANCE_ID,
|
|
411
|
+
product: 'android',
|
|
412
|
+
status: 'starting',
|
|
413
|
+
selectors: ['10.20.30.40:8000'],
|
|
414
|
+
startedAt: new Date().toISOString(),
|
|
415
|
+
logPath: (0, tunnel_process_1.tunnelProcessPaths)(INSTANCE_ID, owner, root).log,
|
|
416
|
+
...overrides,
|
|
417
|
+
};
|
|
418
|
+
}
|
|
419
|
+
async function waitFor(predicate) {
|
|
420
|
+
const deadline = Date.now() + 3000;
|
|
421
|
+
while (!predicate()) {
|
|
422
|
+
if (Date.now() >= deadline)
|
|
423
|
+
throw new Error('waitFor timed out');
|
|
424
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
425
|
+
}
|
|
426
|
+
}
|
|
427
|
+
});
|
|
428
|
+
//# sourceMappingURL=tunnel-process.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnel-process.test.js","sourceRoot":"","sources":["../../src/lib/tunnel-process.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,17 @@ export interface XcodeCloudSigningFlagValues extends XcodeSigningFlagValues {
|
|
|
9
9
|
'asc-key-id'?: string;
|
|
10
10
|
'asc-issuer-id'?: string;
|
|
11
11
|
'asc-key'?: string;
|
|
12
|
+
entitlements?: string[];
|
|
12
13
|
}
|
|
14
|
+
export interface EntitlementsEntry {
|
|
15
|
+
/** Empty string targets the top-level app; the server resolves its bundle id. */
|
|
16
|
+
bundleId: string;
|
|
17
|
+
path: string;
|
|
18
|
+
}
|
|
19
|
+
export declare function parseEntitlementsEntries(values: string[]): {
|
|
20
|
+
entries?: EntitlementsEntry[];
|
|
21
|
+
problem?: string;
|
|
22
|
+
};
|
|
13
23
|
export declare function hasSigningFlags(flags: XcodeSigningFlagValues): boolean;
|
|
14
24
|
/**
|
|
15
25
|
* Returns the problem with an incomplete signing flag group, or undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcode-signing-options.d.ts","sourceRoot":"","sources":["../../src/lib/xcode-signing-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,2BAA4B,SAAQ,sBAAsB;IACzE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"xcode-signing-options.d.ts","sourceRoot":"","sources":["../../src/lib/xcode-signing-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,2BAA4B,SAAQ,sBAAsB;IACzE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,iFAAiF;IACjF,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAQD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG;IAC1D,OAAO,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CA6BA;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAMtE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM,GAAG,SAAS,CAYrF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,2BAA2B,GAAG,OAAO,CAEhF;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,2BAA2B,GAAG,MAAM,GAAG,SAAS,CA0B/F"}
|
|
@@ -1,9 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseEntitlementsEntries = parseEntitlementsEntries;
|
|
3
4
|
exports.hasSigningFlags = hasSigningFlags;
|
|
4
5
|
exports.signingFlagsProblem = signingFlagsProblem;
|
|
5
6
|
exports.hasCloudSigningFlags = hasCloudSigningFlags;
|
|
6
7
|
exports.cloudSigningFlagsProblem = cloudSigningFlagsProblem;
|
|
8
|
+
// A value is <bundleId>=<path> when the left side of its first '=' looks
|
|
9
|
+
// like a reverse-DNS bundle id: bundle-id charset and at least one dot.
|
|
10
|
+
// Anything else, including paths containing '=', is a bare path; ./-prefix a
|
|
11
|
+
// path to force that reading.
|
|
12
|
+
const bundleIDPrefixPattern = /^[A-Za-z0-9][A-Za-z0-9.-]*$/;
|
|
13
|
+
function parseEntitlementsEntries(values) {
|
|
14
|
+
const entries = [];
|
|
15
|
+
const seen = new Set();
|
|
16
|
+
for (const value of values) {
|
|
17
|
+
let bundleId = '';
|
|
18
|
+
let path = value;
|
|
19
|
+
const eq = value.indexOf('=');
|
|
20
|
+
if (eq > 0) {
|
|
21
|
+
const prefix = value.slice(0, eq);
|
|
22
|
+
if (bundleIDPrefixPattern.test(prefix) && prefix.includes('.')) {
|
|
23
|
+
bundleId = prefix;
|
|
24
|
+
path = value.slice(eq + 1);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
if (path === '') {
|
|
28
|
+
return { problem: `--entitlements ${value} is missing the plist path.` };
|
|
29
|
+
}
|
|
30
|
+
if (seen.has(bundleId)) {
|
|
31
|
+
return {
|
|
32
|
+
problem: bundleId === '' ?
|
|
33
|
+
'--entitlements takes at most one bare path (the app); use <bundleId>=<path> for embedded bundles.'
|
|
34
|
+
: `--entitlements provided twice for bundle id ${bundleId}.`,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
seen.add(bundleId);
|
|
38
|
+
entries.push({ bundleId, path });
|
|
39
|
+
}
|
|
40
|
+
return { entries };
|
|
41
|
+
}
|
|
7
42
|
function hasSigningFlags(flags) {
|
|
8
43
|
return (flags['certificate-p12'] !== undefined ||
|
|
9
44
|
flags['certificate-password'] !== undefined ||
|
|
@@ -30,12 +65,19 @@ function hasCloudSigningFlags(flags) {
|
|
|
30
65
|
return flags['signing-method'] !== undefined || flags['team-id'] !== undefined;
|
|
31
66
|
}
|
|
32
67
|
function cloudSigningFlagsProblem(flags) {
|
|
68
|
+
if (flags.entitlements !== undefined && flags['signing-method'] === undefined) {
|
|
69
|
+
return '--entitlements requires --signing-method.';
|
|
70
|
+
}
|
|
33
71
|
if (!hasCloudSigningFlags(flags)) {
|
|
34
72
|
return undefined;
|
|
35
73
|
}
|
|
36
74
|
if (flags['signing-method'] === undefined) {
|
|
37
75
|
return '--team-id requires --signing-method.';
|
|
38
76
|
}
|
|
77
|
+
const parsed = parseEntitlementsEntries(flags.entitlements ?? []);
|
|
78
|
+
if (parsed.problem) {
|
|
79
|
+
return parsed.problem;
|
|
80
|
+
}
|
|
39
81
|
if (hasSigningFlags(flags)) {
|
|
40
82
|
return 'Cloud signing flags cannot be combined with --certificate-p12, --certificate-password, or --provisioning-profile.';
|
|
41
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcode-signing-options.js","sourceRoot":"","sources":["../../src/lib/xcode-signing-options.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"xcode-signing-options.js","sourceRoot":"","sources":["../../src/lib/xcode-signing-options.ts"],"names":[],"mappings":";;AA2BA,4DAgCC;AAED,0CAMC;AAQD,kDAYC;AAED,oDAEC;AAED,4DA0BC;AAlGD,yEAAyE;AACzE,wEAAwE;AACxE,6EAA6E;AAC7E,8BAA8B;AAC9B,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;AAE5D,SAAgB,wBAAwB,CAAC,MAAgB;IAIvD,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAClC,IAAI,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/D,QAAQ,GAAG,MAAM,CAAC;gBAClB,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QACD,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,OAAO,EAAE,OAAO,EAAE,kBAAkB,KAAK,6BAA6B,EAAE,CAAC;QAC3E,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvB,OAAO;gBACL,OAAO,EACL,QAAQ,KAAK,EAAE,CAAC,CAAC;oBACf,mGAAmG;oBACrG,CAAC,CAAC,+CAA+C,QAAQ,GAAG;aAC/D,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC;AAED,SAAgB,eAAe,CAAC,KAA6B;IAC3D,OAAO,CACL,KAAK,CAAC,iBAAiB,CAAC,KAAK,SAAS;QACtC,KAAK,CAAC,sBAAsB,CAAC,KAAK,SAAS;QAC3C,KAAK,CAAC,sBAAsB,CAAC,KAAK,SAAS,CAC5C,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,KAA6B;IAC/D,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IACE,KAAK,CAAC,iBAAiB,CAAC,KAAK,SAAS;QACtC,KAAK,CAAC,sBAAsB,CAAC,KAAK,SAAS;QAC3C,KAAK,CAAC,sBAAsB,CAAC,KAAK,SAAS,EAC3C,CAAC;QACD,OAAO,qGAAqG,CAAC;IAC/G,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAkC;IACrE,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC;AACjF,CAAC;AAED,SAAgB,wBAAwB,CAAC,KAAkC;IACzE,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,IAAI,KAAK,CAAC,gBAAgB,CAAC,KAAK,SAAS,EAAE,CAAC;QAC9E,OAAO,2CAA2C,CAAC;IACrD,CAAC;IACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,KAAK,CAAC,gBAAgB,CAAC,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,sCAAsC,CAAC;IAChD,CAAC;IACD,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,mHAAmH,CAAC;IAC7H,CAAC;IACD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,KAAK,CAAC,YAAY,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpE,IAAI,KAAK,CAAC,eAAe,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC1E,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,6BAA6B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC5D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -60,4 +60,36 @@ describe('hasCloudSigningFlags', () => {
|
|
|
60
60
|
expect((0, xcode_signing_options_1.hasCloudSigningFlags)({ 'team-id': 'TEAM123456' })).toBe(true);
|
|
61
61
|
});
|
|
62
62
|
});
|
|
63
|
+
describe('parseEntitlementsEntries', () => {
|
|
64
|
+
it('treats a bare path as the app entry', () => {
|
|
65
|
+
expect((0, xcode_signing_options_1.parseEntitlementsEntries)(['./app.entitlements'])).toEqual({
|
|
66
|
+
entries: [{ bundleId: '', path: './app.entitlements' }],
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
it('splits bundleId=path entries', () => {
|
|
70
|
+
expect((0, xcode_signing_options_1.parseEntitlementsEntries)(['com.example.app.widgets=./w.entitlements'])).toEqual({
|
|
71
|
+
entries: [{ bundleId: 'com.example.app.widgets', path: './w.entitlements' }],
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
it('combines a bare path with bundle entries', () => {
|
|
75
|
+
expect((0, xcode_signing_options_1.parseEntitlementsEntries)(['app.entitlements', 'com.example.app.widgets=w.entitlements']).entries).toHaveLength(2);
|
|
76
|
+
});
|
|
77
|
+
it('keeps paths containing = when the prefix is not a bundle id', () => {
|
|
78
|
+
expect((0, xcode_signing_options_1.parseEntitlementsEntries)(['./builds/name=prod/app.entitlements'])).toEqual({
|
|
79
|
+
entries: [{ bundleId: '', path: './builds/name=prod/app.entitlements' }],
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
it('rejects a second bare path', () => {
|
|
83
|
+
expect((0, xcode_signing_options_1.parseEntitlementsEntries)(['a.entitlements', 'b.entitlements']).problem).toMatch(/at most one bare path/);
|
|
84
|
+
});
|
|
85
|
+
it('rejects a duplicate bundle id', () => {
|
|
86
|
+
expect((0, xcode_signing_options_1.parseEntitlementsEntries)(['com.example.a=x.plist', 'com.example.a=y.plist']).problem).toMatch(/provided twice/);
|
|
87
|
+
});
|
|
88
|
+
it('rejects an empty path after the bundle id', () => {
|
|
89
|
+
expect((0, xcode_signing_options_1.parseEntitlementsEntries)(['com.example.a=']).problem).toMatch(/missing the plist path/);
|
|
90
|
+
});
|
|
91
|
+
it('requires --signing-method through cloudSigningFlagsProblem', () => {
|
|
92
|
+
expect((0, xcode_signing_options_1.cloudSigningFlagsProblem)({ entitlements: ['app.entitlements'] })).toBe('--entitlements requires --signing-method.');
|
|
93
|
+
});
|
|
94
|
+
});
|
|
63
95
|
//# sourceMappingURL=xcode-signing-options.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcode-signing-options.test.js","sourceRoot":"","sources":["../../src/lib/xcode-signing-options.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"xcode-signing-options.test.js","sourceRoot":"","sources":["../../src/lib/xcode-signing-options.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "lim",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.31.0",
|
|
4
4
|
"description": "Use remote XCode, Gradle, iOS Simulator, Android Emulator and more to build and test apps from Linux, Windows or macOS.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"lim": "./bin/run.js"
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"test": "jest"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@limrun/api": "^0.
|
|
28
|
+
"@limrun/api": "^0.49.0",
|
|
29
29
|
"@oclif/core": "^4",
|
|
30
30
|
"cli-progress": "^3.12.0",
|
|
31
31
|
"cli-table3": "^0.6.5",
|