diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-07-07 15:39:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 15:39:56 +0200 |
| commit | 1fad6c0eed398b1dd594dcf43cbc4013be7c396e (patch) | |
| tree | c2b57bf6195884a494a6e83dbd8fa20ebb96b018 | |
| parent | e13822e7096056ead944d1b7b3ff64864d80ccb5 (diff) | |
| parent | f73da9ca82ff8e0352c3942ea78ab7d1d0317668 (diff) | |
Merge pull request #2806 from dibdot/magic
system-wide: fix escaping of magic chars
| -rw-r--r-- | applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua | 2 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/cbi/datatypes.lua | 2 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/util.lua | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua index 0fa997c8b3..3736471f5d 100644 --- a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua +++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua @@ -26,7 +26,7 @@ pwd.password = false function pwd.write(self, section, value) local pass - if string.match(value, "^\$%d\$.*") then + if string.match(value, "^%$%d%$.*") then pass = value else local t = tonumber(nixio.getpid()*os.time()) diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua index 33d018d2d0..c1cf01f9cd 100644 --- a/modules/luci-base/luasrc/cbi/datatypes.lua +++ b/modules/luci-base/luasrc/cbi/datatypes.lua @@ -418,7 +418,7 @@ function maxlength(val, max) end function phonedigit(val) - return (val:match("^[0-9\*#!%.]+$") ~= nil) + return (val:match("^[0-9%*#!%.]+$") ~= nil) end function timehhmmss(val) diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua index 1a329f3f20..a30e8b72f3 100644 --- a/modules/luci-base/luasrc/util.lua +++ b/modules/luci-base/luasrc/util.lua @@ -207,9 +207,8 @@ end -- handling. It may actually be a property of the getopt function -- rather than the shell proper. function shellstartsqescape(value) - res, _ = string.gsub(value, "^\-", "\\-") - res, _ = string.gsub(res, "^-", "\-") - return shellsqescape(value) + res, _ = string.gsub(value, "^%-", "\\-") + return shellsqescape(res) end -- containing the resulting substrings. The optional max parameter specifies |