libs/sys: properly handle passwords with apostrophes

[project/luci.git] / libs / sys / luasrc / sys.lua

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 61da6f1..1333cd8 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -166,6 +166,7 @@ end
 -- @return     String containing the memory used for caching in kB
 -- @return     String containing the memory used for buffering in kB
 -- @return     String containing the free memory amount in kB
+-- @return     String containing the cpu bogomips (number)
 function sysinfo()
        local cpuinfo = fs.readfile("/proc/cpuinfo")
        local meminfo = fs.readfile("/proc/meminfo")
@@ -176,6 +177,7 @@ function sysinfo()
        local memcached = tonumber(meminfo:match("\nCached:%s*(%d+)"))
        local memfree = tonumber(meminfo:match("MemFree:%s*(%d+)"))
        local membuffers = tonumber(meminfo:match("Buffers:%s*(%d+)"))
+       local bogomips = tonumber(cpuinfo:match("BogoMIPS.-:%s*([^\n]+)"))
 
        if not system then
                system = nixio.uname().machine
@@ -187,7 +189,7 @@ function sysinfo()
                model = cpuinfo:match("cpu model.-:%s*([^\n]+)")
        end
 
-       return system, model, memtotal, memcached, membuffers, memfree
+       return system, model, memtotal, memcached, membuffers, memfree, bogomips
 end
 
 --- Retrieves the output of the "logread" command.
@@ -602,16 +604,17 @@ end
 -- @return                     Number containing 0 on success and >= 1 on error
 function user.setpasswd(username, password)
        if password then
-               password = password:gsub("'", "")
+               password = password:gsub("'", [['"'"']])
        end
 
        if username then
-               username = username:gsub("'", "")
+               username = username:gsub("'", [['"'"']])
        end
 
-       local cmd = "(echo '"..password.."';sleep 1;echo '"..password.."')|"
-       cmd = cmd .. "passwd '"..username.."' >/dev/null 2>&1"
-       return os.execute(cmd)
+       return os.execute(
+               "(echo '" .. password .. "'; sleep 1; echo '" .. password .. "') | " ..
+               "passwd '" .. username .. "' >/dev/null 2>&1"
+       )
 end
 
 
@@ -720,10 +723,14 @@ end
 -- @param iface        Wireless interface (optional)
 -- @return             Table of available channels
 function wifi.channels(iface)
-       local t = iwinfo.type(iface or "")
+       local stat, iwinfo = pcall(require, "iwinfo")
        local cns
-       if iface and t and iwinfo[t] then
-               cns = iwinfo[t].freqlist(iface)
+
+       if stat then
+               local t = iwinfo.type(iface or "")
+               if iface and t and iwinfo[t] then
+                       cns = iwinfo[t].freqlist(iface)
+               end
        end
 
        if not cns or #cns == 0 then