Skip to content

Harden iOS device ID validation and idb command execution #2657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucygramley wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −7
Open

Harden iOS device ID validation and idb command execution #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions src/extension/ios/iOSContainerUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,18 @@ async function push(
await checkIdbIsInstalled();
return wrapWithErrorMessage(
cp
.execToString(
`${idbPath} --log ${idbLogLevel} file push --udid ${udid} --bundle-id ${bundleId} '${src}' '${dst}'`,
)
.execFileToString(idbPath, [
"--log",
idbLogLevel,
"file",
"push",
"--udid",
udid,
"--bundle-id",
bundleId,
src,
dst,
])
.then(() => {
return;
})
Expand All @@ -204,9 +213,18 @@ async function pull(
await checkIdbIsInstalled();
return wrapWithErrorMessage(
cp
.execToString(
`${idbPath} --log ${idbLogLevel} file pull --udid ${udid} --bundle-id ${bundleId} '${src}' '${dst}'`,
)
.execFileToString(idbPath, [
"--log",
idbLogLevel,
"file",
"pull",
"--udid",
udid,
"--bundle-id",
bundleId,
src,
dst,
])
.then(() => {
return;
})
Expand Down
6 changes: 5 additions & 1 deletion src/extension/networkInspector/certificateProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,12 @@ export class CertificateProvider {
): Promise<string> {
const matches = /\/Devices\/([^/]+)\//.exec(deviceCsrFilePath);
if (matches && matches.length == 2) {
const udid = matches[1];
if (!/^[A-F0-9-]{25,40}$/i.test(udid)) {
return Promise.reject(new Error(`Invalid iOS device UDID: ${udid}`));
}
// It's a simulator, the deviceId is in the filepath.
return Promise.resolve(matches[1]);
return Promise.resolve(udid);
}
return iosUtil.targets().then(targets => {
if (targets.length === 0) {
Expand Down