xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lenormf/fix-3735' into master

Browse Source
This commit is contained in:
Maxime Coste 2020-09-22 21:17:12 +10:00
commit 0ef858da64
5 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
rc/detection/modeline.kak
View File

@ -12,33 +12,52 @@ declare-option -docstring "amount of lines that will be checked at the beginning
define-command -hidden modeline-parse-impl %{ define-command -hidden modeline-parse-impl %{
evaluate-commands %sh{ evaluate-commands %sh{
kakquote() { printf "%s" "$*" | sed "s/'/''/g; 1s/^/'/; \$s/\$/'/"; }
# Translate a vim option into the corresponding kakoune one # Translate a vim option into the corresponding kakoune one
translate_opt_vim() { translate_opt_vim() {
readonly key="$1" key="$1"
readonly value="$2" value="$2"
tr="" tr=""
case "${key}" in case "${key}" in
so|scrolloff) tr="scrolloff ${value},${kak_opt_scrolloff##*,}";; so|scrolloff)
siso|sidescrolloff) tr="scrolloff ${kak_opt_scrolloff%%,*},${value}";; key="scrolloff";
ts|tabstop) tr="tabstop ${value}";; value="${value},${kak_opt_scrolloff##*,}";;
sw|shiftwidth) tr="indentwidth ${value}";; siso|sidescrolloff)
tw|textwidth) tr="autowrap_column ${value}";; key="scrolloff";
value="${kak_opt_scrolloff%%,*},${value}";;
ts|tabstop) key="tabstop";;
sw|shiftwidth) key="indentwidth";;
tw|textwidth) key="autowrap_column";;
ff|fileformat) ff|fileformat)
key="eolformat";
case "${value}" in case "${value}" in
unix) tr="eolformat lf";; unix) value="lf";;
dos) tr="eolformat crlf";; dos) value="crlf";;
*) printf %s\\n "echo -debug 'Unsupported file format: ${value}'";; *)
printf 'echo -debug %s' "$(kakquote "Unsupported file format: ${value}")" \
| kak -p "${kak_session}";
return;;
esac esac
;; ;;
ft|filetype) tr="filetype ${value}";; ft|filetype) key="filetype";;
bomb) tr="BOM utf8";; bomb)
nobomb) tr="BOM none";; key="BOM";
spelllang|spl) tr="spell_lang ${value%%,*}";; value="utf8";;
*) printf %s\\n "echo -debug 'Unsupported vim variable: ${key}'";; nobomb)
key="BOM";
value="none";;
spelllang|spl)
key="spell_lang";
value="${value%%,*}";;
*)
printf 'echo -debug %s' "$(kakquote "Unsupported vim variable: ${key}")" \
| kak -p "${kak_session}";
return;;
esac esac
[ -n "${tr}" ] && printf %s\\n "set-option buffer ${tr}" printf 'set-option buffer %s %s\n' "${key}" "$(kakquote "${value}")"
} }
# Pass a few whitelisted options to kakoune directly # Pass a few whitelisted options to kakoune directly
@ -48,17 +67,19 @@ define-command -hidden modeline-parse-impl %{
case "${key}" in case "${key}" in
scrolloff|tabstop|indentwidth|autowrap_column|eolformat|filetype|BOM|spell_lang);; scrolloff|tabstop|indentwidth|autowrap_column|eolformat|filetype|BOM|spell_lang);;
*) printf %s\\n "echo -debug 'Unsupported kakoune variable: ${key}'" *) printf 'echo -debug %s' "$(kakquote "Unsupported kakoune variable: ${key}")" \
| kak -p "${kak_session}"
return;; return;;
esac esac
printf %s\\n "set-option buffer ${key} ${value}" printf 'set-option buffer %s %s\n' "${key}" "$(kakquote "${value}")"
} }
case "${kak_selection}" in case "${kak_selection}" in
*vi:*|*vim:*) type_selection="vim";; *vi:*|*vim:*) type_selection="vim";;
*kak:*|*kakoune:*) type_selection="kakoune";; *kak:*|*kakoune:*) type_selection="kakoune";;
*) echo "echo -debug Unsupported modeline format"; exit 1 ;; *) printf 'echo -debug %s' "$(kakquote "Unsupported modeline format: ${kak_selection}")" \
| kak -p "${kak_session}"; exit 1 ;;
esac esac
# The following subshell will keep the actual options of the modeline, and strip: # The following subshell will keep the actual options of the modeline, and strip:
@ -76,15 +97,15 @@ define-command -hidden modeline-parse-impl %{
name_option="${option%%=*}" name_option="${option%%=*}"
value_option="${option#*=}" value_option="${option#*=}"
[ -z "${option}" ] && continue if [ -z "${option}" ]; then
continue
fi
case "${type_selection}" in case "${type_selection}" in
vim) tr=$(translate_opt_vim "${name_option}" "${value_option}");; vim) translate_opt_vim "${name_option}" "${value_option}";;
kakoune) tr=$(translate_opt_kakoune "${name_option}" "${value_option}");; kakoune) translate_opt_kakoune "${name_option}" "${value_option}";;
*) tr="";; *) exit 1;;
esac esac
[ -n "${tr}" ] && printf %s\\n "${tr}"
done done
} }
} }
@ -97,7 +118,7 @@ define-command -hidden modeline-parse-impl %{
define-command modeline-parse -docstring "Read and interpret vi-format modelines at the beginning/end of the buffer" %{ define-command modeline-parse -docstring "Read and interpret vi-format modelines at the beginning/end of the buffer" %{
try %{ evaluate-commands -draft %{ try %{ evaluate-commands -draft %{
execute-keys <percent> "s(?S)\A(.+\n){,%opt{modelines}}|(.+\n){,%opt{modelines}}\z<ret>" \ execute-keys <percent> "s(?S)\A(.+\n){,%opt{modelines}}|(.+\n){,%opt{modelines}}\z<ret>" \
s^\S*?\s+?(vim?|kak(oune)?):\s?[^\n]+<ret> <a-x> s^\S*?\s+?\w+:\s?[^\n]+<ret> <a-x>
evaluate-commands -draft -itersel modeline-parse-impl evaluate-commands -draft -itersel modeline-parse-impl
} } } }
} }

3
test/regression/3735-modeline-arbitrary-code-execution/cmd Normal file
View File

@ -0,0 +1,3 @@
:modeline-parse<ret>
%
:exec c %opt{pwned}<ret>

1
test/regression/3735-modeline-arbitrary-code-execution/in Normal file
View File

@ -0,0 +1 @@
# kak: tabstop=2;set-option buffer pwned yes

1
test/regression/3735-modeline-arbitrary-code-execution/out Normal file
View File

@ -0,0 +1 @@
false

3
test/regression/3735-modeline-arbitrary-code-execution/rc Normal file
View File

@ -0,0 +1,3 @@
source "%val{runtime}/rc/detection/modeline.kak"
declare-option -hidden bool pwned no
set-option global tabstop 42