appium-adb 16.1.0 → 16.2.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/CHANGELOG.md +21 -0
- package/build/lib/tools/aab-utils.js +1 -1
- package/build/lib/tools/aab-utils.js.map +1 -1
- package/build/lib/tools/android-manifest.js +1 -1
- package/build/lib/tools/android-manifest.js.map +1 -1
- package/build/lib/tools/apk-utils.js +3 -3
- package/build/lib/tools/apk-utils.js.map +1 -1
- package/build/lib/tools/apks-utils.js +1 -1
- package/build/lib/tools/apks-utils.js.map +1 -1
- package/build/lib/tools/app-commands.d.ts +4 -4
- package/build/lib/tools/app-commands.d.ts.map +1 -1
- package/build/lib/tools/app-commands.js +35 -36
- package/build/lib/tools/app-commands.js.map +1 -1
- package/build/lib/tools/device-settings.js +2 -2
- package/build/lib/tools/device-settings.js.map +1 -1
- package/build/lib/tools/fs-commands.js +2 -2
- package/build/lib/tools/fs-commands.js.map +1 -1
- package/build/lib/tools/lockmgmt.d.ts +8 -0
- package/build/lib/tools/lockmgmt.d.ts.map +1 -1
- package/build/lib/tools/lockmgmt.js +21 -16
- package/build/lib/tools/lockmgmt.js.map +1 -1
- package/build/lib/tools/system-calls.d.ts +14 -3
- package/build/lib/tools/system-calls.d.ts.map +1 -1
- package/build/lib/tools/system-calls.js +12 -6
- package/build/lib/tools/system-calls.js.map +1 -1
- package/build/lib/tools/types.d.ts +8 -0
- package/build/lib/tools/types.d.ts.map +1 -1
- package/lib/tools/aab-utils.ts +1 -1
- package/lib/tools/android-manifest.ts +1 -1
- package/lib/tools/apk-utils.ts +3 -3
- package/lib/tools/apks-utils.ts +1 -1
- package/lib/tools/app-commands.ts +52 -50
- package/lib/tools/device-settings.ts +2 -2
- package/lib/tools/fs-commands.ts +2 -2
- package/lib/tools/lockmgmt.ts +22 -19
- package/lib/tools/system-calls.ts +29 -9
- package/lib/tools/types.ts +8 -0
- package/package.json +4 -7
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,27 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [16.2.0](https://github.com/appium/appium-android/compare/appium-adb@16.1.2...appium-adb@16.2.0) (2026-10-30)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* preserve literal arguments in Android shell commands ([#46](https://github.com/appium/appium-android/issues/46)) ([f616350](https://github.com/appium/appium-android/commit/f616350ed46ea64564f186b78637c5eb0cba7887))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
## [16.1.2](https://github.com/appium/appium-android/compare/appium-adb@16.1.1...appium-adb@16.1.2) (2026-10-28)
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* **adb:** check all displays for mScreenOnFully in dumpsys window ([#58](https://github.com/appium/appium-android/issues/58)) ([eb46956](https://github.com/appium/appium-android/commit/eb46956794348ceb8d12dacc220fc375e982223b))
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
## [16.1.1](https://github.com/appium/appium-android/compare/appium-adb@16.1.0...appium-adb@16.1.1) (2026-10-23)
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
* **adb:** use AsyncLock from asyncbox instead of async-lock ([#45](https://github.com/appium/appium-android/issues/45)) ([fe41904](https://github.com/appium/appium-android/commit/fe4190403e1bc3f66a2ead346caf7eb16002626b))
|
|
25
|
+
|
|
26
|
+
|
|
6
27
|
## 16.1.0 (2026-10-02)
|
|
7
28
|
|
|
8
29
|
### Features
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import crypto from 'node:crypto';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { fs, tempDir, util } from '@appium/support';
|
|
4
|
-
import AsyncLock from '
|
|
4
|
+
import { AsyncLock } from 'asyncbox';
|
|
5
5
|
import { LRUCache } from 'lru-cache';
|
|
6
6
|
import { log } from '../logger.js';
|
|
7
7
|
import { unzipFile } from '../utils/index.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,SAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ export async function targetSdkVersionFromManifest(appPath) {
|
|
|
49
49
|
* @return The version of the target SDK.
|
|
50
50
|
*/
|
|
51
51
|
export async function targetSdkVersionUsingPKG(pkg, cmdOutput = null) {
|
|
52
|
-
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
|
|
52
|
+
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true }));
|
|
53
53
|
const targetSdkVersionMatch = new RegExp(/targetSdk=([^\s\s]+)/g).exec(stdout);
|
|
54
54
|
return targetSdkVersionMatch && targetSdkVersionMatch.length >= 2 ? parseInt(targetSdkVersionMatch[1], 10) : 0;
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAGlC,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAGjF;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,oCAAoC,CAAY,OAAe;IACnF,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QACrC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,EACJ,IAAI,EAAE,UAAU,EAChB,kBAAkB,EAAE,EAAC,IAAI,EAAE,WAAW,EAAC,GACxC,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,CAAC,kBAAkB,UAAU,GAAG,CAAC,CAAC;IAC1C,GAAG,CAAC,IAAI,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;IACjD,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,CAAC;AACnC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAY,OAAe;IAC3E,GAAG,CAAC,KAAK,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,OAAO,CAAC;IAChC,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QACrC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,EAAC,gBAAgB,EAAC,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IACzE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,uCAAuC,eAAe,yCAAyC,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAE5C,GAAW,EACX,YAA2B,IAAI;IAE/B,MAAM,MAAM,GAAG,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export async function uninstallApk(pkg, options = {}) {
|
|
|
51
51
|
* @throws If there was a failure during application install.
|
|
52
52
|
*/
|
|
53
53
|
export async function installFromDevicePath(apkPathOnDevice, opts = {}) {
|
|
54
|
-
const stdout = await this.shell(['pm', 'install', '-r', apkPathOnDevice], opts);
|
|
54
|
+
const stdout = await this.shell(['pm', 'install', '-r', apkPathOnDevice], { ...opts, quoteArgs: true });
|
|
55
55
|
if (stdout.includes('Failure')) {
|
|
56
56
|
throw new Error(`Remote install failed: ${stdout}`);
|
|
57
57
|
}
|
|
@@ -107,7 +107,7 @@ export async function cacheApk(apkPath, options = {}) {
|
|
|
107
107
|
// Update the application timestamp asynchronously in order to bump its position
|
|
108
108
|
// in the sorted ls output
|
|
109
109
|
// eslint-disable-next-line promise/prefer-await-to-then
|
|
110
|
-
this.shell(['touch', '-am', remotePath]).catch(() => { });
|
|
110
|
+
this.shell(['touch', '-am', remotePath], { quoteArgs: true }).catch(() => { });
|
|
111
111
|
}
|
|
112
112
|
else {
|
|
113
113
|
log.info(`Caching the application at '${apkPath}' to '${remotePath}'`);
|
|
@@ -136,7 +136,7 @@ export async function cacheApk(apkPath, options = {}) {
|
|
|
136
136
|
.slice(this.remoteAppsCacheLimit - [...this.remoteAppsCache.keys()].length);
|
|
137
137
|
if (!util.isEmpty(entriesToCleanup)) {
|
|
138
138
|
try {
|
|
139
|
-
await this.shell(['rm', '-f', ...entriesToCleanup]);
|
|
139
|
+
await this.shell(['rm', '-f', ...entriesToCleanup], { quoteArgs: true });
|
|
140
140
|
log.debug(`Deleted ${entriesToCleanup.length} expired application cache entries`);
|
|
141
141
|
}
|
|
142
142
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apk-utils.js","sourceRoot":"","sources":["../../../lib/tools/apk-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apk-utils.js","sourceRoot":"","sources":["../../../lib/tools/apk-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { fs, tempDir, util } from '@appium/support';
|
|
3
|
-
import AsyncLock from '
|
|
3
|
+
import { AsyncLock } from 'asyncbox';
|
|
4
4
|
import { LRUCache } from 'lru-cache';
|
|
5
5
|
import { exec } from 'teen_process';
|
|
6
6
|
import { log } from '../logger.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apks-utils.js","sourceRoot":"","sources":["../../../lib/tools/apks-utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,SAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"apks-utils.js","sourceRoot":"","sources":["../../../lib/tools/apks-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -240,12 +240,12 @@ export declare function waitForActivity(this: ADB, pkg: string, act: string, wai
|
|
|
240
240
|
*/
|
|
241
241
|
export declare function waitForNotActivity(this: ADB, pkg: string, act: string, waitMs?: number): Promise<void>;
|
|
242
242
|
/**
|
|
243
|
-
* Builds
|
|
244
|
-
*
|
|
243
|
+
* Builds literal arguments for the given application startup options.
|
|
244
|
+
* Execute the result with `shell` with `quoteArgs: true`, not `shell`.
|
|
245
245
|
*
|
|
246
246
|
* @param startAppOptions - Application options mapping
|
|
247
247
|
* @param apiLevel - The actual OS API level
|
|
248
|
-
* @returns
|
|
248
|
+
* @returns Unquoted command arguments
|
|
249
249
|
*/
|
|
250
250
|
export declare function buildStartCmd(startAppOptions: StartCmdOptions, apiLevel: number): string[];
|
|
251
251
|
/**
|
|
@@ -273,7 +273,7 @@ export declare function matchComponentName(classString: string): RegExpExecArray
|
|
|
273
273
|
/**
|
|
274
274
|
* Asserts a package/activity name has only legal component characters, rejecting shell
|
|
275
275
|
* metacharacters to prevent command injection. The permitted `$` and `*` are still
|
|
276
|
-
* shell-expansion characters and are
|
|
276
|
+
* shell-expansion characters and are quoted at execution time by `shell` with `quoteArgs: true`.
|
|
277
277
|
*
|
|
278
278
|
* @param value - The package or activity name to verify
|
|
279
279
|
* @param kind - A human-readable label for the value used in the error message
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/app-commands.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAGnC,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,OAAO,EACP,mBAAmB,EACnB,4BAA4B,EAC5B,2BAA2B,EAC5B,MAAM,YAAY,CAAC;AAGpB,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,YAAY,CAMxD,CAAC;AAWF,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAGpE;AAED;;;;;;;;;GASG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"app-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/app-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ export function isValidClass(classString) {
|
|
|
43
43
|
export async function resolveLaunchableActivity(pkg, opts = {}) {
|
|
44
44
|
const { preferCmd = true } = opts;
|
|
45
45
|
if (!preferCmd || (await this.getApiLevel()) < 24) {
|
|
46
|
-
const stdout = await this.shell(['dumpsys', 'package', pkg]);
|
|
46
|
+
const stdout = await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true });
|
|
47
47
|
const names = parseLaunchableActivityNames(stdout);
|
|
48
48
|
if (util.isEmpty(names)) {
|
|
49
49
|
log.debug(stdout);
|
|
@@ -72,6 +72,7 @@ export async function resolveLaunchableActivity(pkg, opts = {}) {
|
|
|
72
72
|
}
|
|
73
73
|
const { stdout, stderr } = await this.shell(['cmd', 'package', 'resolve-activity', '--brief', pkg], {
|
|
74
74
|
outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
|
|
75
|
+
quoteArgs: true,
|
|
75
76
|
});
|
|
76
77
|
for (const line of (stdout || '').split('\n').map((x) => x.trim())) {
|
|
77
78
|
if (this.isValidClass(line)) {
|
|
@@ -93,7 +94,7 @@ export async function resolveLaunchableActivity(pkg, opts = {}) {
|
|
|
93
94
|
*/
|
|
94
95
|
export async function forceStop(pkg) {
|
|
95
96
|
assertSafeComponentName(pkg, 'application package name');
|
|
96
|
-
return await this.shell(['am', 'force-stop',
|
|
97
|
+
return await this.shell(['am', 'force-stop', pkg], { quoteArgs: true });
|
|
97
98
|
}
|
|
98
99
|
/**
|
|
99
100
|
* Gracefully kills the app's process, similar to how Android would do it
|
|
@@ -107,7 +108,7 @@ export async function forceStop(pkg) {
|
|
|
107
108
|
* @returns The output of the corresponding adb command.
|
|
108
109
|
*/
|
|
109
110
|
export async function killPackage(pkg) {
|
|
110
|
-
return await this.shell(['am', 'kill', pkg]);
|
|
111
|
+
return await this.shell(['am', 'kill', pkg], { quoteArgs: true });
|
|
111
112
|
}
|
|
112
113
|
/**
|
|
113
114
|
* Clear the user data of the particular application on the device
|
|
@@ -117,7 +118,7 @@ export async function killPackage(pkg) {
|
|
|
117
118
|
* @returns The output of the corresponding adb command.
|
|
118
119
|
*/
|
|
119
120
|
export async function clear(pkg) {
|
|
120
|
-
return await this.shell(['pm', 'clear', pkg]);
|
|
121
|
+
return await this.shell(['pm', 'clear', pkg], { quoteArgs: true });
|
|
121
122
|
}
|
|
122
123
|
/**
|
|
123
124
|
* Grant all permissions requested by the particular package.
|
|
@@ -138,7 +139,7 @@ export async function grantAllPermissions(pkg, apk) {
|
|
|
138
139
|
* If apk not provided, considering apk already installed on the device
|
|
139
140
|
* and fetching targetSdk using package name.
|
|
140
141
|
*/
|
|
141
|
-
dumpsysOutput = await this.shell(['dumpsys', 'package', pkg]);
|
|
142
|
+
dumpsysOutput = await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true });
|
|
142
143
|
targetSdk = await this.targetSdkVersionUsingPKG(pkg, dumpsysOutput);
|
|
143
144
|
}
|
|
144
145
|
else {
|
|
@@ -155,7 +156,7 @@ export async function grantAllPermissions(pkg, apk) {
|
|
|
155
156
|
* The app has to list the permissions in the manifest.
|
|
156
157
|
* refer: https://developer.android.com/training/permissions/requesting.html
|
|
157
158
|
*/
|
|
158
|
-
dumpsysOutput = dumpsysOutput || (await this.shell(['dumpsys', 'package', pkg]));
|
|
159
|
+
dumpsysOutput = dumpsysOutput || (await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true }));
|
|
159
160
|
const requestedPermissions = await this.getReqPermissions(pkg, dumpsysOutput);
|
|
160
161
|
const grantedPermissions = await this.getGrantedPermissions(pkg, dumpsysOutput);
|
|
161
162
|
const permissionsToGrant = requestedPermissions.filter((x) => !grantedPermissions.includes(x));
|
|
@@ -192,7 +193,7 @@ export async function grantPermissions(pkg, permissions) {
|
|
|
192
193
|
// adb shell buffer is limited
|
|
193
194
|
log.debug(`Granting permissions ${JSON.stringify(permissions)} to '${pkg}'`);
|
|
194
195
|
try {
|
|
195
|
-
await this.shellChunks((perm) => ['pm', 'grant', pkg, perm], permissions);
|
|
196
|
+
await this.shellChunks((perm) => ['pm', 'grant', pkg, perm], permissions, { quoteArgs: true });
|
|
196
197
|
}
|
|
197
198
|
catch (e) {
|
|
198
199
|
const err = e;
|
|
@@ -210,7 +211,7 @@ export async function grantPermissions(pkg, permissions) {
|
|
|
210
211
|
*/
|
|
211
212
|
export async function grantPermission(pkg, permission) {
|
|
212
213
|
try {
|
|
213
|
-
await this.shell(['pm', 'grant', pkg, permission]);
|
|
214
|
+
await this.shell(['pm', 'grant', pkg, permission], { quoteArgs: true });
|
|
214
215
|
}
|
|
215
216
|
catch (e) {
|
|
216
217
|
const err = e;
|
|
@@ -228,7 +229,7 @@ export async function grantPermission(pkg, permission) {
|
|
|
228
229
|
*/
|
|
229
230
|
export async function revokePermission(pkg, permission) {
|
|
230
231
|
try {
|
|
231
|
-
await this.shell(['pm', 'revoke', pkg, permission]);
|
|
232
|
+
await this.shell(['pm', 'revoke', pkg, permission], { quoteArgs: true });
|
|
232
233
|
}
|
|
233
234
|
catch (e) {
|
|
234
235
|
const err = e;
|
|
@@ -248,7 +249,7 @@ export async function revokePermission(pkg, permission) {
|
|
|
248
249
|
*/
|
|
249
250
|
export async function getGrantedPermissions(pkg, cmdOutput = null) {
|
|
250
251
|
log.debug('Retrieving granted permissions');
|
|
251
|
-
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
|
|
252
|
+
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true }));
|
|
252
253
|
return extractMatchingPermissions(stdout, ['install', 'runtime'], true);
|
|
253
254
|
}
|
|
254
255
|
/**
|
|
@@ -261,7 +262,7 @@ export async function getGrantedPermissions(pkg, cmdOutput = null) {
|
|
|
261
262
|
*/
|
|
262
263
|
export async function getDeniedPermissions(pkg, cmdOutput = null) {
|
|
263
264
|
log.debug('Retrieving denied permissions');
|
|
264
|
-
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
|
|
265
|
+
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true }));
|
|
265
266
|
return extractMatchingPermissions(stdout, ['install', 'runtime'], false);
|
|
266
267
|
}
|
|
267
268
|
/**
|
|
@@ -274,7 +275,7 @@ export async function getDeniedPermissions(pkg, cmdOutput = null) {
|
|
|
274
275
|
*/
|
|
275
276
|
export async function getReqPermissions(pkg, cmdOutput = null) {
|
|
276
277
|
log.debug('Retrieving requested permissions');
|
|
277
|
-
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
|
|
278
|
+
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true }));
|
|
278
279
|
return extractMatchingPermissions(stdout, ['requested']);
|
|
279
280
|
}
|
|
280
281
|
/**
|
|
@@ -303,7 +304,7 @@ export async function getPackageInfo(pkg) {
|
|
|
303
304
|
const result = { name: pkg };
|
|
304
305
|
let stdout;
|
|
305
306
|
try {
|
|
306
|
-
stdout = await this.shell(['dumpsys', 'package', pkg]);
|
|
307
|
+
stdout = await this.shell(['dumpsys', 'package', pkg], { quoteArgs: true });
|
|
307
308
|
}
|
|
308
309
|
catch (err) {
|
|
309
310
|
const error = err;
|
|
@@ -335,7 +336,7 @@ export async function getPackageInfo(pkg) {
|
|
|
335
336
|
* @throws {Error} If there was an error while fetching the .apk
|
|
336
337
|
*/
|
|
337
338
|
export async function pullApk(pkg, tmpDir) {
|
|
338
|
-
const stdout = (await this.shell(['pm', 'path', pkg])).trim();
|
|
339
|
+
const stdout = (await this.shell(['pm', 'path', pkg], { quoteArgs: true })).trim();
|
|
339
340
|
const packageMarker = 'package:';
|
|
340
341
|
if (!stdout.startsWith(packageMarker)) {
|
|
341
342
|
throw new Error(`Cannot pull the .apk package for '${pkg}'. Original error: ${stdout}`);
|
|
@@ -364,7 +365,7 @@ export async function activateApp(appId) {
|
|
|
364
365
|
const cmd = ['monkey', '-p', appId, '-c', 'android.intent.category.LAUNCHER', '1'];
|
|
365
366
|
let output;
|
|
366
367
|
try {
|
|
367
|
-
output = await this.shell(cmd);
|
|
368
|
+
output = await this.shell(cmd, { quoteArgs: true });
|
|
368
369
|
log.debug(`Command stdout: ${output}`);
|
|
369
370
|
}
|
|
370
371
|
catch (e) {
|
|
@@ -397,7 +398,7 @@ export async function activateApp(appId) {
|
|
|
397
398
|
'0x10200000',
|
|
398
399
|
'-n',
|
|
399
400
|
activityName,
|
|
400
|
-
]);
|
|
401
|
+
], { quoteArgs: true });
|
|
401
402
|
log.debug(stdout);
|
|
402
403
|
if (/^error:/im.test(stdout)) {
|
|
403
404
|
throw new Error(`Cannot activate '${appId}'. Original error: ${stdout}`);
|
|
@@ -421,7 +422,7 @@ export async function isAppInstalled(pkg, opts = {}) {
|
|
|
421
422
|
cmd.push('--user', user);
|
|
422
423
|
}
|
|
423
424
|
cmd.push(pkg);
|
|
424
|
-
const stdout = await this.shell(cmd);
|
|
425
|
+
const stdout = await this.shell(cmd, { quoteArgs: true });
|
|
425
426
|
isInstalled = /^package:/m.test(stdout);
|
|
426
427
|
}
|
|
427
428
|
catch {
|
|
@@ -456,13 +457,13 @@ export async function listInstalledPackages(opts = {}) {
|
|
|
456
457
|
}
|
|
457
458
|
let stdout;
|
|
458
459
|
try {
|
|
459
|
-
stdout = await this.shell(cmd);
|
|
460
|
+
stdout = await this.shell(cmd, { quoteArgs: true });
|
|
460
461
|
}
|
|
461
462
|
catch (e) {
|
|
462
463
|
const error = e;
|
|
463
464
|
// https://github.com/appium/appium-uiautomator2-driver/issues/810
|
|
464
465
|
if ((error.stderr || error.stdout || error.message)?.includes('access user') && util.isEmpty(user)) {
|
|
465
|
-
stdout = await this.shell([...cmd, '--user', '0']);
|
|
466
|
+
stdout = await this.shell([...cmd, '--user', '0'], { quoteArgs: true });
|
|
466
467
|
}
|
|
467
468
|
else {
|
|
468
469
|
throw e;
|
|
@@ -491,15 +492,13 @@ export async function startUri(uri, pkg = null, opts = {}) {
|
|
|
491
492
|
if (waitForLaunch) {
|
|
492
493
|
args.push('-W');
|
|
493
494
|
}
|
|
494
|
-
|
|
495
|
-
// regardless of the host operating system.
|
|
496
|
-
args.push('-a', 'android.intent.action.VIEW', '-d', util.quote(uri));
|
|
495
|
+
args.push('-a', 'android.intent.action.VIEW', '-d', uri);
|
|
497
496
|
if (pkg) {
|
|
498
497
|
assertSafeComponentName(pkg, 'application package name');
|
|
499
|
-
args.push(
|
|
498
|
+
args.push(pkg);
|
|
500
499
|
}
|
|
501
500
|
try {
|
|
502
|
-
const res = await this.shell(args);
|
|
501
|
+
const res = await this.shell(args, { quoteArgs: true });
|
|
503
502
|
if (res.toLowerCase().includes('unable to resolve intent')) {
|
|
504
503
|
throw new Error(res);
|
|
505
504
|
}
|
|
@@ -543,7 +542,7 @@ export async function startApp(startAppOptions) {
|
|
|
543
542
|
if (options.waitDuration !== undefined && Number.isInteger(options.waitDuration) && options.waitDuration >= 0) {
|
|
544
543
|
shellOpts.timeout = options.waitDuration;
|
|
545
544
|
}
|
|
546
|
-
const stdout = await this.shell(cmd, shellOpts);
|
|
545
|
+
const stdout = await this.shell(cmd, { ...shellOpts, quoteArgs: true });
|
|
547
546
|
if (stdout.includes('Error: Activity class') && stdout.includes('does not exist')) {
|
|
548
547
|
if (options.retry && options.activity && !options.activity.startsWith('.')) {
|
|
549
548
|
log.debug(`We tried to start an activity that doesn't exist, retrying with '.${options.activity}' activity name`);
|
|
@@ -765,40 +764,40 @@ export async function waitForNotActivity(pkg, act, waitMs = 20000) {
|
|
|
765
764
|
await this.waitForActivityOrNot(pkg, act, true, waitMs);
|
|
766
765
|
}
|
|
767
766
|
/**
|
|
768
|
-
* Builds
|
|
769
|
-
*
|
|
767
|
+
* Builds literal arguments for the given application startup options.
|
|
768
|
+
* Execute the result with `shell` with `quoteArgs: true`, not `shell`.
|
|
770
769
|
*
|
|
771
770
|
* @param startAppOptions - Application options mapping
|
|
772
771
|
* @param apiLevel - The actual OS API level
|
|
773
|
-
* @returns
|
|
772
|
+
* @returns Unquoted command arguments
|
|
774
773
|
*/
|
|
775
774
|
export function buildStartCmd(startAppOptions, apiLevel) {
|
|
776
775
|
const { user, waitForLaunch, pkg, activity, action, category, stopApp, flags, optionalIntentArguments } = startAppOptions;
|
|
777
776
|
const cmd = ['am', apiLevel < 26 ? 'start' : 'start-activity'];
|
|
778
777
|
if (util.hasValue(user)) {
|
|
779
|
-
cmd.push('--user',
|
|
778
|
+
cmd.push('--user', `${user}`);
|
|
780
779
|
}
|
|
781
780
|
if (waitForLaunch) {
|
|
782
781
|
cmd.push('-W');
|
|
783
782
|
}
|
|
784
783
|
if (activity && pkg) {
|
|
785
784
|
const component = activity.startsWith(`${pkg}/`) ? activity : `${pkg}/${activity}`;
|
|
786
|
-
cmd.push('-n',
|
|
785
|
+
cmd.push('-n', component);
|
|
787
786
|
}
|
|
788
787
|
if (stopApp && apiLevel >= 15) {
|
|
789
788
|
cmd.push('-S');
|
|
790
789
|
}
|
|
791
790
|
if (action) {
|
|
792
|
-
cmd.push('-a',
|
|
791
|
+
cmd.push('-a', action);
|
|
793
792
|
}
|
|
794
793
|
if (category) {
|
|
795
|
-
cmd.push('-c',
|
|
794
|
+
cmd.push('-c', category);
|
|
796
795
|
}
|
|
797
796
|
if (flags) {
|
|
798
|
-
cmd.push('-f',
|
|
797
|
+
cmd.push('-f', flags);
|
|
799
798
|
}
|
|
800
799
|
if (optionalIntentArguments) {
|
|
801
|
-
cmd.push(...parseOptionalIntentArguments(optionalIntentArguments)
|
|
800
|
+
cmd.push(...parseOptionalIntentArguments(optionalIntentArguments));
|
|
802
801
|
}
|
|
803
802
|
return cmd;
|
|
804
803
|
}
|
|
@@ -894,7 +893,7 @@ export function matchComponentName(classString) {
|
|
|
894
893
|
/**
|
|
895
894
|
* Asserts a package/activity name has only legal component characters, rejecting shell
|
|
896
895
|
* metacharacters to prevent command injection. The permitted `$` and `*` are still
|
|
897
|
-
* shell-expansion characters and are
|
|
896
|
+
* shell-expansion characters and are quoted at execution time by `shell` with `quoteArgs: true`.
|
|
898
897
|
*
|
|
899
898
|
* @param value - The package or activity name to verify
|
|
900
899
|
* @param kind - A human-readable label for the value used in the error message
|
|
@@ -968,7 +967,7 @@ export async function broadcast(intent) {
|
|
|
968
967
|
throw new Error(`Invalid intent ${intent}`);
|
|
969
968
|
}
|
|
970
969
|
log.debug(`Broadcasting: ${intent}`);
|
|
971
|
-
await this.shell(['am', 'broadcast', '-a', intent]);
|
|
970
|
+
await this.shell(['am', 'broadcast', '-a', intent], { quoteArgs: true });
|
|
972
971
|
}
|
|
973
972
|
/**
|
|
974
973
|
* Get the list of process ids for the particular package on the device under test.
|