mirror of
https://github.com/neovim/neovim
synced 2025-07-16 01:01:49 +00:00
vim-patch:cd8a3eaf5348
runtime(dist): centralize safe executable check and add vim library (vim/vim#13413)
Follow up to 816fbcc26 (patch 9.0.1833: [security] runtime file fixes,
2023-08-31) and f7ac0ef50 (runtime: don't execute external commands when
loading ftplugins, 2023-09-06).
This puts the logic for safe executable checks in a single place, by introducing
a central vim library, so all filetypes benefit from consistency.
Notable changes:
- dist#vim because the (autoload) namespace for a new runtime support
library. Supporting functions should get documentation. It might make
life easier for NeoVim devs to make the documentation a new file
rather than cram it into existing files, though we may want
cross-references to it somewhere…
- The gzip and zip plugins need to be opted into by enabling execution
of those programs (or the global plugin_exec). This needs
documentation or discussion.
- This fixes a bug in the zig plugin: code setting s:tmp_cwd was removed
in f7ac0ef50 (runtime: don't execute external commands when loading
ftplugins, 2023-09-06), but the variable was still referenced. Since
the new function takes care of that automatically, the variable is no
longer needed.
cd8a3eaf53
Co-authored-by: D. Ben Knoble <ben.knoble+github@gmail.com>
This commit is contained in:
17
runtime/autoload/dist/vim.vim
vendored
Normal file
17
runtime/autoload/dist/vim.vim
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
vim9script
|
||||||
|
|
||||||
|
# Vim runtime support library
|
||||||
|
#
|
||||||
|
# Maintainer: The Vim Project <https://github.com/vim/vim>
|
||||||
|
# Last Change: 2023 Oct 25
|
||||||
|
|
||||||
|
export def IsSafeExecutable(filetype: string, executable: string): bool
|
||||||
|
var cwd = getcwd()
|
||||||
|
return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0))
|
||||||
|
&& (fnamemodify(exepath(executable), ':p:h') !=# cwd
|
||||||
|
|| (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1
|
||||||
|
&& cwd != '.'))
|
||||||
|
enddef
|
||||||
|
|
||||||
|
# Uncomment this line to check for compilation errors early
|
||||||
|
# defcompile
|
@ -11,10 +11,7 @@ fun s:check(cmd)
|
|||||||
let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
|
let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
|
||||||
if !exists("s:have_" . name)
|
if !exists("s:have_" . name)
|
||||||
" safety check, don't execute anything from the current directory
|
" safety check, don't execute anything from the current directory
|
||||||
let s:tmp_cwd = getcwd()
|
let f = dist#vim#IsSafeExecutable('gzip', name)
|
||||||
let f = (fnamemodify(exepath(name), ":p:h") !=# s:tmp_cwd
|
|
||||||
\ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
|
|
||||||
unlet s:tmp_cwd
|
|
||||||
if !f
|
if !f
|
||||||
echoerr "Warning: NOT executing " .. name .. " from current directory!"
|
echoerr "Warning: NOT executing " .. name .. " from current directory!"
|
||||||
endif
|
endif
|
||||||
|
@ -57,14 +57,10 @@ if !exists("g:zip_extractcmd")
|
|||||||
let g:zip_extractcmd= g:zip_unzipcmd
|
let g:zip_extractcmd= g:zip_unzipcmd
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let s:tmp_cwd = getcwd()
|
if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd)
|
||||||
if (fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd()
|
|
||||||
\ && (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) == -1 || s:tmp_cwd == '.'))
|
|
||||||
unlet s:tmp_cwd
|
|
||||||
echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
|
echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
unlet s:tmp_cwd
|
|
||||||
|
|
||||||
" ----------------
|
" ----------------
|
||||||
" Functions: {{{1
|
" Functions: {{{1
|
||||||
|
@ -37,8 +37,8 @@ if exists("g:awk_is_gawk")
|
|||||||
let b:undo_ftplugin .= " | setl fp<"
|
let b:undo_ftplugin .= " | setl fp<"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Disabled by default for security reasons.
|
" Disabled by default for security reasons.
|
||||||
if get(g:, 'awk_exec', get(g:, 'plugin_exec', 0))
|
if dist#vim#IsSafeExecutable('awk', 'gawk')
|
||||||
let path = system("gawk 'BEGIN { printf ENVIRON[\"AWKPATH\"] }'")
|
let path = system("gawk 'BEGIN { printf ENVIRON[\"AWKPATH\"] }'")
|
||||||
let path = substitute(path, '^\.\=:\|:\.\=$\|:\.\=:', ',,', 'g') " POSIX cwd
|
let path = substitute(path, '^\.\=:\|:\.\=$\|:\.\=:', ',,', 'g') " POSIX cwd
|
||||||
let path = substitute(path, ':', ',', 'g')
|
let path = substitute(path, ':', ',', 'g')
|
||||||
|
@ -57,8 +57,8 @@ if &filetype == 'changelog'
|
|||||||
endif
|
endif
|
||||||
let s:default_login = 'unknown'
|
let s:default_login = 'unknown'
|
||||||
|
|
||||||
" Disabled by default for security reasons.
|
" Disabled by default for security reasons.
|
||||||
if get(g:, 'changelog_exec', get(g:, 'plugin_exec', 0))
|
if dist#vim#IsSafeExecutable('changelog', 'whoami')
|
||||||
let login = s:login()
|
let login = s:login()
|
||||||
else
|
else
|
||||||
let login = s:default_login
|
let login = s:default_login
|
||||||
|
@ -56,12 +56,8 @@ endif
|
|||||||
|
|
||||||
" Set this once, globally.
|
" Set this once, globally.
|
||||||
if !exists("perlpath")
|
if !exists("perlpath")
|
||||||
let s:tmp_cwd = getcwd()
|
|
||||||
" safety check: don't execute perl binary by default
|
" safety check: don't execute perl binary by default
|
||||||
if executable("perl") && get(g:, 'perl_exec', get(g:, 'plugin_exec', 0))
|
if dist#vim#IsSafeExecutable('perl', 'perl')
|
||||||
\ && (fnamemodify(exepath("perl"), ":p:h") != s:tmp_cwd
|
|
||||||
\ || (index(split($PATH, has("win32") ? ';' : ':'), s:tmp_cwd) != -1
|
|
||||||
\ && s:tmp_cwd != '.'))
|
|
||||||
try
|
try
|
||||||
if &shellxquote != '"'
|
if &shellxquote != '"'
|
||||||
let perlpath = system('perl -e "print join(q/,/,@INC)"')
|
let perlpath = system('perl -e "print join(q/,/,@INC)"')
|
||||||
@ -77,7 +73,6 @@ if !exists("perlpath")
|
|||||||
" current directory and the directory of the current file.
|
" current directory and the directory of the current file.
|
||||||
let perlpath = ".,,"
|
let perlpath = ".,,"
|
||||||
endif
|
endif
|
||||||
unlet! s:tmp_cwd
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Append perlpath to the existing path value, if it is set. Since we don't
|
" Append perlpath to the existing path value, if it is set. Since we don't
|
||||||
|
@ -41,16 +41,13 @@ let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
|
|||||||
|
|
||||||
" Safety check: don't execute zig from current directory
|
" Safety check: don't execute zig from current directory
|
||||||
if !exists('g:zig_std_dir') && exists('*json_decode') &&
|
if !exists('g:zig_std_dir') && exists('*json_decode') &&
|
||||||
\ executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0))
|
\ executable('zig') && dist#vim#IsSafeExecutable('zig', 'zig')
|
||||||
\ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd
|
|
||||||
\ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
|
|
||||||
silent let s:env = system('zig env')
|
silent let s:env = system('zig env')
|
||||||
if v:shell_error == 0
|
if v:shell_error == 0
|
||||||
let g:zig_std_dir = json_decode(s:env)['std_dir']
|
let g:zig_std_dir = json_decode(s:env)['std_dir']
|
||||||
endif
|
endif
|
||||||
unlet! s:env
|
unlet! s:env
|
||||||
endif
|
endif
|
||||||
unlet! s:tmp_cwd
|
|
||||||
|
|
||||||
if exists('g:zig_std_dir')
|
if exists('g:zig_std_dir')
|
||||||
let &l:path = g:zig_std_dir . ',' . &l:path
|
let &l:path = g:zig_std_dir . ',' . &l:path
|
||||||
|
Reference in New Issue
Block a user