fix(treesitter): validate language name

Problem: Some injections (like markdown) allow specifying arbitrary
language names for code blocks, which may be lead to errors when
looking for a corresponding parser in runtime path.

Solution: Validate that the language name only contains alphanumeric
characters and `_` (e.g., for `c_sharp`) and error otherwise.

(cherry picked from commit c032e83b22)
This commit is contained in:
Christian Clason
2023-01-26 09:42:23 +01:00
committed by github-actions[bot]
parent dd086292c7
commit 1e600d3b0a
3 changed files with 15 additions and 3 deletions

View File

@ -653,6 +653,7 @@ require_language({lang}, {path}, {silent}, {symbol_name})
Parameters: ~
• {lang} (string) Language the parser should parse
(alphanumerical and `_` only)
• {path} (string|nil) Optional path the parser is located at
• {silent} (boolean|nil) Don't throw an error if language not
found

View File

@ -6,7 +6,7 @@ local M = {}
---
--- Parsers are searched in the `parser` runtime directory, or the provided {path}
---
---@param lang string Language the parser should parse
---@param lang string Language the parser should parse (alphanumerical and `_` only)
---@param path (string|nil) Optional path the parser is located at
---@param silent (boolean|nil) Don't throw an error if language not found
---@param symbol_name (string|nil) Internal symbol name for the language to load
@ -16,13 +16,19 @@ function M.require_language(lang, path, silent, symbol_name)
return true
end
if path == nil then
local fname = 'parser/' .. vim.fn.fnameescape(lang) .. '.*'
if not (lang and lang:match('[%w_]+') == lang) then
if silent then
return false
end
error("'" .. lang .. "' is not a valid language name")
end
local fname = 'parser/' .. lang .. '.*'
local paths = a.nvim_get_runtime_file(fname, false)
if #paths == 0 then
if silent then
return false
end
error("no parser for '" .. lang .. "' language, see :help treesitter-parsers")
end
path = paths[1]

View File

@ -31,6 +31,11 @@ describe('treesitter language API', function()
pcall_err(exec_lua, 'vim.treesitter.require_language("c", nil, false, "borklang")'))
end)
it('shows error for invalid language name', function()
eq(".../language.lua:0: '/foo/' is not a valid language name",
pcall_err(exec_lua, 'vim.treesitter.require_language("/foo/", nil, false)'))
end)
it('inspects language', function()
local keys, fields, symbols = unpack(exec_lua([[
local lang = vim.treesitter.inspect_language('c')