mirror of
https://github.com/appgurueu/modlib.git
synced 2024-08-20 13:24:11 +02:00
texmod
: Stricter file name validation
This commit is contained in:
parent
8e5bdc817c
commit
73640f11d1
@ -11,6 +11,8 @@ setmetatable(texmod, {__call = new})
|
|||||||
-- Constructors / "generators"
|
-- Constructors / "generators"
|
||||||
|
|
||||||
function texmod.file(filename)
|
function texmod.file(filename)
|
||||||
|
-- See `TEXTURENAME_ALLOWED_CHARS` in Minetest (`src/network/networkprotocol.h`)
|
||||||
|
assert(not filename:find"[^%w_.-]", "invalid characters in file name")
|
||||||
return new{
|
return new{
|
||||||
type = "file",
|
type = "file",
|
||||||
filename = filename
|
filename = filename
|
||||||
|
@ -251,6 +251,9 @@ function rm.fname(r)
|
|||||||
-- This is overly permissive, as is Minetest;
|
-- This is overly permissive, as is Minetest;
|
||||||
-- we just allow arbitrary characters up until a character which may terminate the name.
|
-- we just allow arbitrary characters up until a character which may terminate the name.
|
||||||
-- Inside an inventorycube, `&` also terminates names.
|
-- Inside an inventorycube, `&` also terminates names.
|
||||||
|
-- Note that the constructor will however - unlike Minetest - perform validation.
|
||||||
|
-- We could leverage the knowledge of the allowed charset here already,
|
||||||
|
-- but that might lead to more confusing error messages.
|
||||||
return r:match_str(r.invcube and "[^:^&){]" or "[^:^){]")
|
return r:match_str(r.invcube and "[^:^&){]" or "[^:^){]")
|
||||||
end
|
end
|
||||||
function rm.subtexp(r)
|
function rm.subtexp(r)
|
||||||
|
@ -123,7 +123,6 @@ return function(self, write_str)
|
|||||||
end
|
end
|
||||||
function w.tex(tex)
|
function w.tex(tex)
|
||||||
if tex.type == "file" then
|
if tex.type == "file" then
|
||||||
assert(not tex.filename:find"[:^\\&{[]", "invalid character in filename")
|
|
||||||
w.str(tex.filename)
|
w.str(tex.filename)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user