* luci/statistics: moving the graph controller to admin caused the images to be gener...

[project/luci.git] / libs / web / luasrc / dispatcher.lua

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index c867579d2efac9cd221013123b37f4674a4fddd1..ef6c6881b4fa2b32d0ba206549c6531996eec7f7 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -24,6 +24,7 @@ limitations under the License.
 
 ]]--
 module("luci.dispatcher", package.seeall)
+require("luci.init")
 require("luci.http")
 require("luci.sys")
 require("luci.fs")
@@ -49,12 +50,27 @@ dispatched = nil
 built_index = false
 built_tree  = false
 
+-- Fastindex
+local fi
+
 
 -- Builds a URL
 function build_url(...)
        return luci.http.dispatcher() .. "/" .. table.concat(arg, "/")
 end
 
+-- Prints an error message or renders the "error401" template if available
+function error401(message)
+       message = message or "Unauthorized"
+
+       require("luci.template")
+       if not pcall(luci.template.render, "error401") then
+               luci.http.prepare_content("text/plain")
+               print(message)
+       end
+       return false
+end
+
 -- Sends a 404 error code and renders the "error404" template if available
 function error404(message)
        luci.http.status(404, "Not Found")
@@ -112,6 +128,20 @@ function dispatch()
                end
        end
 
+       if track.sysauth then
+               local accs = track.sysauth
+               accs = (type(accs) == "string") and {accs} or accs
+               
+               local function sysauth(user, password)
+                       return (luci.util.contains(accs, user)
+                               and luci.sys.user.checkpasswd(user, password)) 
+               end
+               
+               if not luci.http.basic_auth(sysauth) then
+                       error401()
+                       return
+               end
+       end
 
        if track.i18n then
                require("luci.i18n").loadc(track.i18n)
@@ -157,22 +187,22 @@ function createindex()
        local path = luci.sys.libpath() .. "/controller/"
        local suff = ".lua"
        
-       --[[if pcall(require, "fastindex") then
+       if pcall(require, "luci.fastindex") then
                createindex_fastindex(path, suff)
        else
                createindex_plain(path, suff)
-       end]]--
-       
-       createindex_plain(path, suff)
+       end
        
        built_index = true
 end
 
 -- Uses fastindex to create the dispatching tree
 function createindex_fastindex(path, suffix)   
-       local fi = fastindex.new("index")
-       fi.add(path .. "*" .. suffix)
-       fi.add(path .. "*/*" .. suffix)
+       if not fi then
+               fi = luci.fastindex.new("index")
+               fi.add(path .. "*" .. suffix)
+               fi.add(path .. "*/*" .. suffix)
+       end
        fi.scan()
        
        for k, v in pairs(fi.indexes) do
@@ -181,7 +211,12 @@ function createindex_fastindex(path, suffix)
 end
 
 -- Calls the index function of all available controllers
+-- Fallback for transition purposes / Leave it in as long as it works otherwise throw it away
 function createindex_plain(path, suffix)
+       if built_index then
+               return
+       end
+
        local cache = nil 
        
        local controllers = luci.util.combine(
@@ -201,11 +236,12 @@ function createindex_plain(path, suffix)
 
        for i,c in ipairs(controllers) do
                local module = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
-               local cachefile = indexcache .. "/" .. module
+               local cachefile
                local stime
                local ctime
                
                if cache then
+                       cachefile = indexcache .. "/" .. module
                        stime = luci.fs.mtime(c) or 0
                        ctime = luci.fs.mtime(cachefile) or 0
                end
@@ -258,20 +294,29 @@ function createtree()
        built_tree = true
 end
 
--- Shortcut for creating a dispatching node
-function entry(path, target, title, order, add)
-       add = add or {}
+-- Reassigns a node to another position
+function assign(path, clone, title, order)
+       local obj  = node(path)
+       obj.nodes  = nil
+       obj.module = nil
+       
+       obj.title = title
+       obj.order = order
+       
+       setmetatable(obj, {__index = clone})
+       
+       return obj
+end
 
+-- Shortcut for creating a dispatching node
+function entry(path, target, title, order)
        local c = node(path)
+       
        c.target = target
        c.title  = title
        c.order  = order
        c.module = getfenv(2)._NAME
 
-       for k,v in pairs(add) do
-               c[k] = v
-       end
-
        return c
 end
 
@@ -291,6 +336,8 @@ function node(...)
                c = c.nodes[v]
        end
 
+       c.path = arg
+
        return c
 end