luci-app-mwan3: refactoring diagnostics view and controller
[project/luci.git] / applications / luci-app-mwan3 / luasrc / controller / mwan3.lua
index 59d7796..e7e8dc9 100644 (file)
@@ -23,7 +23,7 @@ function index()
        entry({"admin", "status", "mwan", "troubleshooting"},
                template("mwan/status_troubleshooting"))
        entry({"admin", "status", "mwan", "interface_status"},
-               call("interfaceStatus"))
+               call("mwan_Status"))
        entry({"admin", "status", "mwan", "detailed_status"},
                call("detailedStatus"))
        entry({"admin", "status", "mwan", "diagnostics_display"},
@@ -33,100 +33,38 @@ function index()
 
 
        entry({"admin", "network", "mwan"},
-               alias("admin", "network", "mwan", "configuration"),
+               alias("admin", "network", "mwan", "interface"),
                _("Load Balancing"), 600)
 
-       entry({"admin", "network", "mwan", "configuration"},
-               alias("admin", "network", "mwan", "configuration", "interface"),
-               _("Configuration"), 20)
-       entry({"admin", "network", "mwan", "configuration", "globals"},
-               cbi("mwan/globalsconfig"),_("Globals"), 5).leaf = true
-       entry({"admin", "network", "mwan", "configuration", "interface"},
+       entry({"admin", "network", "mwan", "globals"},
+               cbi("mwan/globalsconfig"),
+               _("Globals"), 5).leaf = true
+       entry({"admin", "network", "mwan", "interface"},
                arcombine(cbi("mwan/interface"), cbi("mwan/interfaceconfig")),
                _("Interfaces"), 10).leaf = true
-       entry({"admin", "network", "mwan", "configuration", "member"},
+       entry({"admin", "network", "mwan", "member"},
                arcombine(cbi("mwan/member"), cbi("mwan/memberconfig")),
                _("Members"), 20).leaf = true
-       entry({"admin", "network", "mwan", "configuration", "policy"},
+       entry({"admin", "network", "mwan", "policy"},
                arcombine(cbi("mwan/policy"), cbi("mwan/policyconfig")),
                _("Policies"), 30).leaf = true
-       entry({"admin", "network", "mwan", "configuration", "rule"},
+       entry({"admin", "network", "mwan", "rule"},
                arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")),
                _("Rules"), 40).leaf = true
-       entry({"admin", "network", "mwan", "configuration", "notify"},
+       entry({"admin", "network", "mwan", "notify"},
                cbi("mwan/notify"),
                _("Notification"), 50).leaf = true
-
-       entry({"admin", "network", "mwan", "advanced"},
-               alias("admin", "network", "mwan", "advanced", "mwanconfig"),
-               _("Advanced"), 100)
-       entry({"admin", "network", "mwan", "advanced", "mwanconfig"},
-               form("mwan/advanced_mwanconfig"))
-       entry({"admin", "network", "mwan", "advanced", "networkconfig"},
-               form("mwan/advanced_networkconfig"))
-       entry({"admin", "network", "mwan", "advanced", "wirelessconfig"},
-               form("mwan/advanced_wirelessconfig"))
-end
-
-function getInterfaceStatus(ruleNumber, interfaceName)
-       if ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interfaceName .. ".enabled")) == "1" then
-               if ut.trim(sys.exec(ip .. "route list table " .. ruleNumber)) ~= "" then
-                       if ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interfaceName .. ".track_ip")) ~= "" then
-                               return "online"
-                       else
-                               return "notMonitored"
-                       end
-               else
-                       return "offline"
-               end
-       else
-               return "notEnabled"
-       end
 end
 
-function getInterfaceName()
-       local ruleNumber, status = 0, ""
-       uci.cursor():foreach("mwan3", "interface",
-               function (section)
-                       ruleNumber = ruleNumber+1
-                       status = status .. section[".name"] .. "[" .. getInterfaceStatus(ruleNumber, section[".name"]) .. "]"
-               end
-       )
-       return status
-end
-
-function interfaceStatus()
-       local ntm = require "luci.model.network".init()
-
-       local mArray = {}
-
-       -- overview status
-       local statusString = getInterfaceName()
-       if statusString ~= "" then
-               mArray.wans = {}
-               wansid = {}
-
-               for wanName, interfaceState in string.gfind(statusString, "([^%[]+)%[([^%]]+)%]") do
-                       local wanInterfaceName = ut.trim(sys.exec("uci -q -p /var/state get network." .. wanName .. ".ifname"))
-                               if wanInterfaceName == "" then
-                                       wanInterfaceName = "X"
-                               end
-                       local wanDeviceLink = ntm:get_interface(wanInterfaceName)
-                               wanDeviceLink = wanDeviceLink and wanDeviceLink:get_network()
-                               wanDeviceLink = wanDeviceLink and wanDeviceLink:adminlink() or "#"
-                       wansid[wanName] = #mArray.wans + 1
-                       mArray.wans[wansid[wanName]] = { name = wanName, link = wanDeviceLink, ifname = wanInterfaceName, status = interfaceState }
-               end
-       end
-
-       -- overview status log
-       local mwanLog = ut.trim(sys.exec("logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x' 2>/dev/null"))
-       if mwanLog ~= "" then
-               mArray.mwanlog = { mwanLog }
-       end
+function mwan_Status()
+       local status = ut.ubus("mwan3", "status", {})
 
        luci.http.prepare_content("application/json")
-       luci.http.write_json(mArray)
+       if status ~= nil then
+               luci.http.write_json(status)
+       else
+               luci.http.write_json({})
+       end
 end
 
 function detailedStatus()
@@ -142,9 +80,10 @@ function detailedStatus()
        luci.http.write_json(mArray)
 end
 
-function diagnosticsData(interface, tool, task)
-       function getInterfaceNumber()
+function diagnosticsData(interface, task)
+       function getInterfaceNumber(interface)
                local number = 0
+               local interfaceNumber
                uci.cursor():foreach("mwan3", "interface",
                        function (section)
                                number = number+1
@@ -153,82 +92,111 @@ function diagnosticsData(interface, tool, task)
                                end
                        end
                )
+               return interfaceNumber
        end
 
-       local mArray = {}
-
-       local results = ""
-       if tool == "service" then
-               os.execute("/usr/sbin/mwan3 " .. task)
-               if task == "restart" then
-                       results = "MWAN3 restarted"
-               elseif task == "stop" then
-                       results = "MWAN3 stopped"
-               else
-                       results = "MWAN3 started"
-               end
-       else
-               local interfaceDevice = ut.trim(sys.exec("uci -q -p /var/state get network." .. interface .. ".ifname"))
-               if interfaceDevice ~= "" then
-                       if tool == "ping" then
-                               local gateway = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $2}'"))
-                               if gateway ~= "" then
-                                       if task == "gateway" then
-                                               local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. gateway
-                                               results = pingCommand .. "\n\n" .. sys.exec(pingCommand)
-                                       else
-                                               local tracked = ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interface .. ".track_ip"))
-                                               if tracked ~= "" then
-                                                       for z in tracked:gmatch("[^ ]+") do
-                                                               local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. z
-                                                               results = results .. pingCommand .. "\n\n" .. sys.exec(pingCommand) .. "\n\n"
-                                                       end
-                                               else
-                                                       results = "No tracking IP addresses configured on " .. interface
-                                               end
-                                       end
-                               else
-                                       results = "No default gateway for " .. interface .. " found. Default route does not exist or is configured incorrectly"
+       function diag_command(cmd, addr)
+               if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
+                       local util = io.popen(cmd % addr)
+                       if util then
+                               while true do
+                                       local ln = util:read("*l")
+                                       if not ln then break end
+                                       luci.http.write(ln)
+                                       luci.http.write("\n")
                                end
-                       elseif tool == "rulechk" then
-                               getInterfaceNumber()
-                               local rule1 = sys.exec(ip .. "rule | grep $(echo $((" .. interfaceNumber .. " + 1000)))")
-                               local rule2 = sys.exec(ip .. "rule | grep $(echo $((" .. interfaceNumber .. " + 2000)))")
-                               if rule1 ~= "" and rule2 ~= "" then
-                                       results = "All required interface IP rules found:\n\n" .. rule1 .. rule2
-                               elseif rule1 ~= "" or rule2 ~= "" then
-                                       results = "Missing 1 of the 2 required interface IP rules\n\n\nRules found:\n\n" .. rule1 .. rule2
-                               else
-                                       results = "Missing both of the required interface IP rules"
-                               end
-                       elseif tool == "routechk" then
-                               getInterfaceNumber()
-                               local routeTable = sys.exec(ip .. "route list table " .. interfaceNumber)
-                               if routeTable ~= "" then
-                                       results = "Interface routing table " .. interfaceNumber .. " was found:\n\n" .. routeTable
-                               else
-                                       results = "Missing required interface routing table " .. interfaceNumber
+                               util:close()
+                       end
+                       return
+               end
+       end
+
+       function get_gateway(inteface)
+               local dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {})
+               local gateway
+               if dump then
+                       local _, route
+                       for _, route in ipairs(dump.route) do
+                               if dump.route[_].target == "0.0.0.0" then
+                                       gateway =  dump.route[_].nexthop
                                end
-                       elseif tool == "hotplug" then
-                               if task == "ifup" then
-                                       os.execute("/usr/sbin/mwan3 ifup " .. interface)
-                                       results = "Hotplug ifup sent to interface " .. interface .. "..."
-                               else
-                                       os.execute("/usr/sbin/mwan3 ifdown " .. interface)
-                                       results = "Hotplug ifdown sent to interface " .. interface .. "..."
+                       end
+               end
+               return gateway
+       end
+
+       local mArray = {}
+       local results = ""
+       local number = getInterfaceNumber(interface)
+
+       local uci = uci.cursor(nil, "/var/state")
+       local device = uci:get("network", interface, "ifname")
+
+       luci.http.prepare_content("text/plain")
+       if device ~= "" then
+               if task == "ping_gateway" then
+                       local gateway = get_gateway(interface)
+                       if gateway ~= nil then
+                               diag_command("ping -c 5 -W 1 %q 2>&1", gateway)
+                       else
+                               luci.http.prepare_content("text/plain")
+                               luci.http.write(string.format("No gateway for interface %s found.", interface))
+                       end
+               elseif task == "ping_trackips" then
+                       local trackips = uci:get("mwan3", interface, "track_ip")
+                       if #trackips > 0 then
+                               for i in pairs(trackips) do
+                                       diag_command("ping -c 5 -W 1 %q 2>&1", trackips[i])
                                end
+                       else
+                               luci.http.write(string.format("No tracking Hosts for interface %s defined.", interface))
                        end
+               elseif task == "check_rules" then
+                       local number = getInterfaceNumber(interface)
+                       local iif = 1000 + number
+                       local fwmark = 2000 + number
+                       local iif_rule  = sys.exec(string.format("ip rule | grep %d", iif))
+                       local fwmark_rule = sys.exec(string.format("ip rule | grep %d", fwmark))
+                       if iif_rule ~= "" and fwmark_rule ~= "" then
+                               luci.http.write(string.format("All required IP rules for interface %s found", interface))
+                               luci.http.write("\n")
+                               luci.http.write(fwmark_rule)
+                               luci.http.write(iif_rule)
+                       elseif iif_rule == "" and fwmark_rule ~= "" then
+                               luci.http.write(string.format("Only one IP rules for interface %s found", interface))
+                               luci.http.write("\n")
+                               luci.http.write(fwmark_rule)
+                       elseif iif_rule ~= "" and fwmark_rule == "" then
+                               luci.http.write(string.format("Only one IP rules for interface %s found", interface))
+                               luci.http.write("\n")
+                               luci.http.write(iif_rule)
+                       else
+                               luci.http.write(string.format("Missing both IP rules for interface %s", interface))
+                       end
+               elseif task == "check_routes" then
+                       local number = getInterfaceNumber(interface)
+                       local routeTable = sys.exec(string.format("ip route list table %s", number))
+                       if routeTable ~= "" then
+                               luci.http.write(string.format("Routing table %s for interface %s found", number, interface))
+                               luci.http.write("\n")
+                               luci.http.write(routeTable)
+                       else
+                               luci.http.write(string.format("Routing table %s for interface %s not found", number, interface))
+                       end
+               elseif task == "hotplug_ifup" then
+                       os.execute(string.format("/usr/sbin/mwan3 ifup %s", interface))
+                       luci.http.write(string.format("Hotplug ifup sent to interface %s", interface))
+               elseif task == "hotplug_ifdown" then
+                       os.execute(string.format("/usr/sbin/mwan3 ifdown %s", interface))
+                       luci.http.write(string.format("Hotplug ifdown sent to interface %s", interface))
                else
-                       results = "Unable to perform diagnostic tests on " .. interface .. ". There is no physical or virtual device associated with this interface"
+                       luci.http.write("Unknown task")
                end
+       else
+               luci.http.write(string.format("Unable to perform diagnostic tests on %s.", interface))
+               luci.http.write("\n")
+               luci.http.write("There is no physical or virtual device associated with this interface.")
        end
-       if results ~= "" then
-               results = ut.trim(results)
-               mArray.diagnostics = { results }
-       end
-
-       luci.http.prepare_content("application/json")
-       luci.http.write_json(mArray)
 end
 
 function troubleshootingData()