patch 8.1.1365: source command doesn't check for the sandbox

Problem:    Source command doesn't check for the sandbox. (Armin Razmjou)
Solution:   Check for the sandbox when sourcing a file.

diff --git a/src/getchar.c b/src/getchar.c
index 9379a6a8d4530e456f5978045127eba77b6734ca..debad7efd2cde31641cc563f638bf634602dc389 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1407,6 +1407,12 @@ openscript(
        emsg(_(e_nesting));
        return;
     }
+
+    // Disallow sourcing a file in the sandbox, the commands would be executed
+    // later, possibly outside of the sandbox.
+    if (check_secure())
+       return;
+
 #ifdef FEAT_EVAL
     if (ignore_script)
        /* Not reading from script, also don't open one.  Warning message? */

diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim
index a33d286e75526434e6867dd0a23bd38175345586..5166bafb1546d6fd3991307e22ea678be9c46fee 100644 (file)
--- a/src/testdir/test_source.vim
+++ b/src/testdir/test_source.vim
@@ -36,3 +36,12 @@ func Test_source_cmd()
   au! SourcePre
   au! SourcePost
 endfunc
+
+func Test_source_sandbox()
+  new
+  call writefile(["Ohello\<Esc>"], 'Xsourcehello')
+  source! Xsourcehello | echo
+  call assert_equal('hello', getline(1))
+  call assert_fails('sandbox source! Xsourcehello', 'E48:')
+  bwipe!
+endfunc

diff --git a/src/version.c b/src/version.c
index b0736df46a786b0d0271c1070a9d326ca1cc4022..b2fcbfb14c1fe09db9be5e6c7303ed4d43e4b01f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1365,
 /**/
     1364,
 /**/