aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2019-06-26 08:11:51 +0200
committerBjörn Linse <bjorn.linse@gmail.com>2019-06-26 08:19:57 +0200
commit619a86cb1e8640e4b834ef1f85bd62b0fb5609f2 (patch)
tree31e8f78201b225c73423c1d5a2716942014b7d88
parent10c983fabeae6f2cda93404f3aa4ee814baa43f3 (diff)
downloadrneovim-619a86cb1e8640e4b834ef1f85bd62b0fb5609f2.tar.gz
rneovim-619a86cb1e8640e4b834ef1f85bd62b0fb5609f2.tar.bz2
rneovim-619a86cb1e8640e4b834ef1f85bd62b0fb5609f2.zip
eval/api: don't allow the API to be called in the sandbox.
Identifying and maintaining a "secure" subset of the API would be too much busywork. So just disable the entire thing.
-rw-r--r--src/nvim/eval.c4
-rw-r--r--test/functional/eval/api_functions_spec.lua9
2 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index cd2888883b..ca2f4da22c 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6669,6 +6669,10 @@ static void float_op_wrapper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
static void api_wrapper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
+ if (check_restricted() || check_secure()) {
+ return;
+ }
+
ApiDispatchWrapper fn = (ApiDispatchWrapper)fptr;
Array args = ARRAY_DICT_INIT;
diff --git a/test/functional/eval/api_functions_spec.lua b/test/functional/eval/api_functions_spec.lua
index 0e3a88802d..3947f88c0a 100644
--- a/test/functional/eval/api_functions_spec.lua
+++ b/test/functional/eval/api_functions_spec.lua
@@ -4,7 +4,8 @@ local lfs = require('lfs')
local neq, eq, command = helpers.neq, helpers.eq, helpers.command
local clear, curbufmeths = helpers.clear, helpers.curbufmeths
local exc_exec, expect, eval = helpers.exc_exec, helpers.expect, helpers.eval
-local insert = helpers.insert
+local insert, meth_pcall = helpers.insert, helpers.meth_pcall
+local meths = helpers.meths
describe('eval-API', function()
before_each(clear)
@@ -145,4 +146,10 @@ describe('eval-API', function()
]])
screen:detach()
end)
+
+ it('cannot be called from sandbox', function()
+ eq({false, 'Vim(call):E48: Not allowed in sandbox'},
+ meth_pcall(command, "sandbox call nvim_input('ievil')"))
+ eq({''}, meths.buf_get_lines(0, 0, -1, true))
+ end)
end)