Skip to content

Escape shell arguments #8

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
sambostock wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Open

Escape shell arguments #8

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
6 changes: 6 additions & 0 deletions js/gitDiffReal/bugFixes.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,11 @@ describe('gitDiffReal', function() {
var actual = gitDiffReal('<a>', '<b>', {color: false, wordDiff: true})
imp.expect(actual).to.equal(expected)
})

it('` in string is not interpreted as shell subcommand', function() {
var expected = '@@ -1 +1 @@\n[-`a`b-]{+`c`d+}\n'
var actual = gitDiffReal('`a`b', '`c`d', {color: false, wordDiff: true})
imp.expect(actual).to.equal(expected)
})
})
})
8 changes: 6 additions & 2 deletions js/gitDiffReal/generateDiff/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ logger.setLevel('info')
// git diff $(printf 'my first string' | git hash-object -w --stdin) $(printf 'my second string' | git hash-object -w --stdin) --word-diff
// git diff $(printf 'This is a test for my diff tool\nIt is a big test\n\nNo diff here\n\nBut there might be here\nBut not here\n\nOr here\n' | git hash-object -w --stdin) $(printf 'This is a test for my difference tool\nIt is a small test\n\nNo diff here\n\nBut there might be here!\nBut not here\n\nOr here\n' | git hash-object -w --stdin) --word-diff

function escapeShellArg(arg) {
return "'" + arg.replace(/'/g, "'\\''") + "'"
}

function generateDiff(str1, str2, options, gitDir) {

var DEFAULTS = require('../../_shared/defaultOptions')
Expand All @@ -23,8 +27,8 @@ function generateDiff(str1, str2, options, gitDir) {
}

// Single quotes is needed here to avoid .. event not found
var gitHashCmd1 = 'printf ' + JSON.stringify(str1) + ' | git ' + gitDir + ' hash-object -w --stdin'
var gitHashCmd2 = 'printf ' + JSON.stringify(str2) + ' | git ' + gitDir + ' hash-object -w --stdin'
var gitHashCmd1 = 'printf ' + escapeShellArg(str1) + ' | git ' + gitDir + ' hash-object -w --stdin'
var gitHashCmd2 = 'printf ' + escapeShellArg(str2) + ' | git ' + gitDir + ' hash-object -w --stdin'

var gitHashObj1 = exec(gitHashCmd1, {silent: true})
var gitHashObj2 = exec(gitHashCmd2, {silent: true})
Expand Down