-
-
Notifications
You must be signed in to change notification settings - Fork 210
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.
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
Allow execution of mobile:shell if relaxed security is enabled for the driver #293
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import _ from 'lodash'; | ||
import { errors } from 'appium-base-driver'; | ||
|
||
let extensions = {}; | ||
|
||
extensions.execute = async function (script, args) { | ||
if (script.match(/^mobile\:/)) { | ||
script = script.replace(/^mobile\:/, '').trim(); | ||
return await this.executeMobile(script, _.isArray(args) ? args[0] : args); | ||
} | ||
|
||
throw new errors.NotImplementedError(); | ||
}; | ||
|
||
extensions.executeMobile = async function (mobileCommand, opts = {}) { | ||
const mobileCommandsMapping = { | ||
shell: async (x) => await this.mobileShell(x), | ||
}; | ||
|
||
if (!_.has(mobileCommandsMapping, mobileCommand)) { | ||
throw new errors.UnknownCommandError(`Unknown mobile command "${mobileCommand}". ` + | ||
`Only ${_.keys(mobileCommandsMapping)} commands are supported.`); | ||
} | ||
return await mobileCommandsMapping[mobileCommand](opts); | ||
}; | ||
|
||
export default extensions; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import log from '../logger'; | ||
import _ from 'lodash'; | ||
import { util } from 'appium-support'; | ||
|
||
let commands = {}; | ||
|
||
commands.mobileShell = async function (opts = {}) { | ||
if (!this.relaxedSecurityEnabled) { | ||
log.errorAndThrow(`Appium server must have relaxed security flag set in order to run any shell commands`); | ||
} | ||
|
||
if (!_.isString(opts.command)) { | ||
log.errorAndThrow(`The 'command' argument is mandatory'`); | ||
} | ||
let args = opts.args; | ||
if (util.hasValue(args)) { | ||
if (!_.isArray(args)) { | ||
args = [args]; | ||
} | ||
} else { | ||
args = []; | ||
} | ||
|
||
return await this.adb.shell([opts.command, ...args]); | ||
}; | ||
|
||
export { commands }; | ||
export default commands; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
import chai from 'chai'; | ||
import chaiAsPromised from 'chai-as-promised'; | ||
import AndroidDriver from '../../..'; | ||
import _ from 'lodash'; | ||
import DEFAULT_CAPS from '../desired'; | ||
|
||
|
||
chai.should(); | ||
chai.use(chaiAsPromised); | ||
|
||
let driver; | ||
let caps = _.defaults({ | ||
appPackage: 'io.appium.android.apis', | ||
appActivity: '.view.TextFields' | ||
}, DEFAULT_CAPS); | ||
|
||
describe('execute', function () { | ||
before(async function () { | ||
driver = new AndroidDriver(); | ||
await driver.createSession(caps); | ||
}); | ||
after(async function () { | ||
await driver.deleteSession(); | ||
}); | ||
|
||
it('should fail if one tries to execute non-mobile command in native context', async function () { | ||
await driver.execute('blabla').should.eventually.be.rejected; | ||
}); | ||
|
||
it('should fail if one tries to execute an unknown mobile command in native context', async function () { | ||
await driver.execute('mobile: blabla').should.eventually.be.rejectedWith(/Unknown mobile command/); | ||
}); | ||
|
||
it('should fail if one tries to execute a shell command without relaxed security flag set', async function () { | ||
await driver.execute('mobile: shell', {command: 'pm', args: ['list']}) | ||
.should.eventually.be.rejectedWith(/must have relaxed security flag set/); | ||
}); | ||
|
||
it('should fail if no command argument is provided to shell call', async function () { | ||
driver.relaxedSecurityEnabled = true; | ||
try { | ||
await driver.execute('mobile: shell', {comand: 'pm', args: ['list']}) | ||
.should.eventually.be.rejectedWith(/argument is mandatory/); | ||
} finally { | ||
driver.relaxedSecurityEnabled = undefined; | ||
} | ||
}); | ||
|
||
it('should return a result if correct shell command is provided', async function () { | ||
driver.relaxedSecurityEnabled = true; | ||
try { | ||
(await driver.execute('mobile: shell', {command: 'echo', args: 'hello'})) | ||
.should.not.be.empty; | ||
} finally { | ||
driver.relaxedSecurityEnabled = undefined; | ||
} | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this mention the actual name of the flag?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the name is anyway mentioned in the documentation. Plus less work for us if we decide to change argument's name