diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-10-01 18:26:14 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2023-10-01 20:00:23 +0800 |
| commit | 5821c857e025a292c17bd80192366dc7bfb1fbc6 (patch) | |
| tree | 389848e98083072ef47365ebb2870e3de5ec914b /test | |
| parent | 81be8407681cee350984299e1be03d4351e7bd14 (diff) | |
| download | rneovim-5821c857e025a292c17bd80192366dc7bfb1fbc6.tar.gz rneovim-5821c857e025a292c17bd80192366dc7bfb1fbc6.tar.bz2 rneovim-5821c857e025a292c17bd80192366dc7bfb1fbc6.zip | |
vim-patch:9.0.1968: cmdline completion should consider key option
Problem: cmdline completion should consider key option
Solution: Disable cmdline completion for key option, slightly
refactor how P_NO_CMD_EXPAND is handled
Harden crypto 'key' option: turn off cmdline completion, disable set-=
"set-=" can be used maliciously with a crypto key, as it allows an
attacker (who either has access to the computer or a plugin author) to
guess a substring by observing the modified state. Simply turn off
set+=/-=/^= for this option as there is no good reason for them to be
used.
Update docs to make that clear as well.
Also, don't allow cmdline completion for 'key' as it just shows *****
which is not useful and confusing to the user what it means (if the user
accidentally hits enter they will have replaced their key with "*****"
instead).
Move logic to better location, don't use above 32-bit for flags
Move P_NO_CMD_EXPAND to use the unused 0x20 instead of going above
32-bits, as currently the flags parameter is only 32-bits on some
systems. Left a comment to warn that future additions will need to
change how the flags work either by making it 64-bit or split into two
member vars.
Also, move the logic for detecting P_NO_CMD_EXPAND earlier so it's not
up to each handler to decide, and you won't see the temporary "..." that
Vim shows while waiting for completion handler to complete.
closes: vim/vim#13224
https://github.com/vim/vim/commit/6ee7b521fa7531ef356ececc8be7575c3800f872
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/old/testdir/test_history.vim | 5 | ||||
| -rw-r--r-- | test/old/testdir/test_options.vim | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/test/old/testdir/test_history.vim b/test/old/testdir/test_history.vim index f1c31dee04..bb6d671725 100644 --- a/test/old/testdir/test_history.vim +++ b/test/old/testdir/test_history.vim @@ -244,8 +244,13 @@ endfunc " Test for making sure the key value is not stored in history func Test_history_crypt_key() CheckFeature cryptv + call feedkeys(":set bs=2 key=abc ts=8\<CR>", 'xt') call assert_equal('set bs=2 key= ts=8', histget(':')) + + call assert_fails("call feedkeys(':set bs=2 key-=abc ts=8\<CR>', 'xt')") + call assert_equal('set bs=2 key-= ts=8', histget(':')) + set key& bs& ts& endfunc diff --git a/test/old/testdir/test_options.vim b/test/old/testdir/test_options.vim index 9068546c3e..d524ea85a8 100644 --- a/test/old/testdir/test_options.vim +++ b/test/old/testdir/test_options.vim @@ -369,13 +369,15 @@ func Test_set_completion() call feedkeys(":set spellsuggest=best,file:test_options.v\<Tab>\<C-B>\"\<CR>", 'xt') call assert_equal("\"set spellsuggest=best,file:test_options.vim", @:) - " Expand value for 'key' - " set key=abcd - " call feedkeys(":set key=\<Tab>\<C-B>\"\<CR>", 'xt') - " call assert_equal('"set key=*****', @:) - " call feedkeys(":set key-=\<Tab>\<C-B>\"\<CR>", 'xt') - " call assert_equal('"set key-=*****', @:) - " set key= + " Expanding value for 'key' is disallowed + if exists('+key') + set key=abcd + call feedkeys(":set key=\<Tab>\<C-B>\"\<CR>", 'xt') + call assert_equal('"set key=', @:) + call feedkeys(":set key-=\<Tab>\<C-B>\"\<CR>", 'xt') + call assert_equal('"set key-=', @:) + set key= + endif " Expand values for 'filetype' call feedkeys(":set filetype=sshdconfi\<Tab>\<C-B>\"\<CR>", 'xt') |