-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Harden system calls to git #699
Open
layus
wants to merge
2
commits into
VundleVim:master
Choose a base branch
from
layus:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 |
---|---|---|
|
@@ -343,8 +343,7 @@ endf | |
" return -- the URL for the origin remote (string) | ||
" --------------------------------------------------------------------------- | ||
func! s:get_current_origin_url(bundle) abort | ||
let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url' | ||
let cmd = vundle#installer#shellesc_cd(cmd) | ||
let cmd = s:make_git_command(a:bundle, ['config', '--get', 'remote.origin.url']) | ||
let out = s:strip(s:system(cmd)) | ||
return out | ||
endf | ||
|
@@ -357,12 +356,37 @@ endf | |
" return -- A 15 character log sha for the current HEAD | ||
" --------------------------------------------------------------------------- | ||
func! s:get_current_sha(bundle) | ||
let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD' | ||
let cmd = vundle#installer#shellesc_cd(cmd) | ||
let cmd = s:make_sync_command(a:bundle, ['rev-parse', 'HEAD']) | ||
let out = s:system(cmd)[0:15] | ||
return out | ||
endf | ||
|
||
" --------------------------------------------------------------------------- | ||
" Build a safe (escaped) git command | ||
" | ||
" bundle -- A bundle object to get the path to the git dir | ||
" args -- A list of arguments to the git executable | ||
" return -- A string containing the escaped shell command | ||
" --------------------------------------------------------------------------- | ||
func! s:make_git_command(bundle, args) abort | ||
let workdir = a:bundle.path() | ||
let gitdir = workdir.'/.git/' | ||
|
||
let git = ['git', '--git-dir='.gitdir, '--work-tree='.workdir] | ||
|
||
return join(map(copy(git + args), 'vundle#installer#shellesc')) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmmm... no idea really :-D I copie this from elsewhere, just to be sure. I do not know how vim handles this, but it was used elsewhere, so better safe than sorry. |
||
endf | ||
|
||
" --------------------------------------------------------------------------- | ||
" Build a safe (escaped) command from list of git args | ||
" | ||
" bundle -- A bundle object to get the path to the git dir | ||
" argss -- A list of lists of arguments to successive git calls | ||
" return -- A string containing the escaped shell command | ||
" --------------------------------------------------------------------------- | ||
func! s:make_git_commands(bundle, argss) abort | ||
return join(map(a:argss, 's:make_git_command(s:bundle, {})'), ' && ') | ||
endf | ||
|
||
" --------------------------------------------------------------------------- | ||
" Create the appropriate sync command to run according to the current state of | ||
|
@@ -388,14 +412,12 @@ func! s:make_sync_command(bang, bundle) abort | |
call s:log('> Plugin ' . a:bundle.name . ' new URI: ' . a:bundle.uri) | ||
" Directory names match but the origin remotes are not the same | ||
let cmd_parts = [ | ||
\ 'cd '.vundle#installer#shellesc(a:bundle.path()) , | ||
\ 'git remote set-url origin ' . vundle#installer#shellesc(a:bundle.uri), | ||
\ 'git fetch', | ||
\ 'git reset --hard origin/HEAD', | ||
\ 'git submodule update --init --recursive', | ||
\ ] | ||
let cmd = join(cmd_parts, ' && ') | ||
let cmd = vundle#installer#shellesc_cd(cmd) | ||
[ 'remote', 'set-url', 'origin', a:bundle.uri ], | ||
[ 'fetch' ], | ||
[ 'reset', '--hard', 'origin/HEAD' ], | ||
[ 'submodule', 'update', '--init', '--recursive' ], | ||
] | ||
let cmd = s:make_git_commands(a:bundle, cmd_parts) | ||
let initial_sha = '' | ||
return [cmd, initial_sha] | ||
endif | ||
|
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
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.
Does this work? It looks like the function expects totaly different args.
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.
Hmm... No, of course no. This must be an autocomplete typo.
Le 1 mars 2016 07:18:40 UTC+01:00, Lucas Hoffmann [email protected] a écrit :