mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Remove command line argument black-list (#13039)

Browse source 
* Remove command line argument black-list

Instead block all arguments following a URL.

* Updated tests
This commit is contained in:
Aleš Pergl 2018-05-22 18:51:03 +02:00 committed by Charles Kerr
parent c320da5ec8
commit 93bee69266
2 changed files with 11 additions and 1408 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1393
atom/app/command_line_args.cc
View file

File diff suppressed because it is too large Load diff

24
spec/api-app-spec.js
View file

@ -682,40 +682,30 @@ describe('app module', () => {
} }
}) })
it('does not launch for blacklisted argument', function (done) { it('does not launch for argument following a URL', function (done) {
const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app') const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
// App should exit with non 123 code. // App should exit with non 123 code.
const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher=cmd.exe /c start calc']) const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test:?', 'abc'])
first.once('exit', (code) => { first.once('exit', (code) => {
assert.notEqual(code, 123) assert.notEqual(code, 123)
done() done()
}) })
}) })
it('launches successfully for multiple uris in cmd args', function (done) { it('launches successfully for argument following a file path', function (done) {
const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app') const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
// App should exit with code 123. // App should exit with code 123.
const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'http://electronjs.org', 'electron-test://testdata']) const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'e:\\abc', 'abc'])
first.once('exit', (code) => { first.once('exit', (code) => {
assert.equal(code, 123) assert.equal(code, 123)
done() done()
}) })
}) })
it('does not launch for encoded space', function (done) { it('launches successfully for multiple URIs following --', function (done) {
const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app') const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
// App should exit with non 123 code. // App should exit with code 123.
const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher%20"cmd.exe /c start calc']) const first = ChildProcess.spawn(remote.process.execPath, [appPath, '--', 'http://electronjs.org', 'electron-test://testdata'])
first.once('exit', (code) => {
assert.notEqual(code, 123)
done()
})
})
it('launches successfully for argnames similar to blacklisted ones', function (done) {
const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
// inspect is blacklisted, but inspector should work, and app launch should succeed
const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--inspector'])
first.once('exit', (code) => { first.once('exit', (code) => {
assert.equal(code, 123) assert.equal(code, 123)
done() done()