Publish luci.model.ipkg via JSON-RPC

[project/luci.git] / modules / rpc / luasrc / controller / rpc.lua

diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/rpc/luasrc/controller/rpc.lua
index 41d4c59..fdfbdb3 100644 (file)
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/rpc/luasrc/controller/rpc.lua
@@ -12,20 +12,140 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-module("luci.controller.rpc", package.seeall)
 
-function index()       
-       entry({"rpc", "uci"}, call("rpc_uci")).sysauth = "root"
-       entry({"rpc", "auth"}, call("rpc_auth"))
+local require = require
+local pairs = pairs
+local print = print
+local pcall = pcall
+local table = table
+
+module "luci.controller.rpc"
+
+function index()
+       local function authenticator(validator, accs)
+               local auth = luci.http.formvalue("auth", true)
+               if auth then
+                       local user = luci.sauth.read(auth)
+                       if user and luci.util.contains(accs, user) then
+                               return user, auth
+                       end
+               end
+               luci.http.status(403, "Forbidden")
+       end
+       
+       uci = entry({"rpc", "uci"}, call("rpc_uci"))
+       uci.sysauth = "root"
+       uci.sysauth_authenticator = authenticator
+       
+       fs = entry({"rpc", "fs"}, call("rpc_fs"))
+       fs.sysauth = "root"
+       fs.sysauth_authenticator = authenticator
+
+       fs = entry({"rpc", "sys"}, call("rpc_sys"))
+       fs.sysauth = "root"
+       fs.sysauth_authenticator = authenticator
+       
+       fs = entry({"rpc", "ipkg"}, call("rpc_ipkg"))
+       fs.sysauth = "root"
+       fs.sysauth_authenticator = authenticator
+       
+       uci = entry({"rpc", "auth"}, call("rpc_auth"))
 end
 
-function rpc_proxy(tbl, jsonrpc, method, params, id)
-       local res = {luci.util.copcall(tbl[function], ...)}
-       local stat = table.remove(res, 1)
+function rpc_auth()
+       local jsonrpc = require "luci.jsonrpc"
+       local sauth   = require "luci.sauth"
+       local http    = require "luci.http"
+       local sys     = require "luci.sys"
+       local ltn12   = require "luci.ltn12"
        
-       if not stat then
-               return nil, {code=-32602, message="Invalid params.", data=table.remove(res, 1)} 
-       else
-               return res, nil
+       http.setfilehandler()
+       
+       local loginstat
+       
+       local server = {}
+       server.login = function(user, pass)
+               local sid
+               
+               if sys.user.checkpasswd(user, pass) then
+                       sid = sys.uniqueid(16)
+                       http.header("Set-Cookie", "sysauth=" .. sid.."; path=/")
+                       sauth.write(sid, user)
+               end
+               
+               return sid
        end
-end
\ No newline at end of file
+       
+       http.prepare_content("application/json")
+       ltn12.pump.all(jsonrpc.handle(server, http.source()), http.write)
+end
+
+function rpc_uci()
+       local uci     = require "luci.controller.rpc.uci"
+       local jsonrpc = require "luci.jsonrpc"
+       local http    = require "luci.http"
+       local ltn12   = require "luci.ltn12"
+       
+       http.prepare_content("application/json")
+       ltn12.pump.all(jsonrpc.handle(uci, http.source()), http.write)
+end
+
+function rpc_fs()
+       local util    = require "luci.util"
+       local io      = require "io"
+       local fs2     = util.clone(require "luci.fs")
+       local jsonrpc = require "luci.jsonrpc"
+       local http    = require "luci.http"
+       local ltn12   = require "luci.ltn12"
+
+       function fs2.readfile(filename)
+               local stat, mime = pcall(require, "mime")
+               if not stat then
+                       error("Base64 support not available. Please install LuaSocket.")
+               end
+
+               local fp = io.open(filename)
+               if not fp then
+                       return nil
+               end
+
+               local output = {}
+               local sink = ltn12.sink.table(output)
+               local source = ltn12.source.chain(ltn12.source.file(fp), mime.encode("base64"))
+               return ltn12.pump.all(source, sink) and table.concat(output)
+       end
+       
+       function fs2.writefile(filename, data)
+               local stat, mime = pcall(require, "mime")
+               if not stat then
+                       error("Base64 support not available. Please install LuaSocket.")
+               end
+
+               local  file = io.open(filename, "w")
+               local  sink = file and ltn12.sink.chain(mime.decode("base64"), ltn12.sink.file(file))
+               return sink and ltn12.pump.all(ltn12.source.string(data), sink) or false
+       end
+       
+       http.prepare_content("application/json")
+       ltn12.pump.all(jsonrpc.handle(fs2, http.source()), http.write)
+end
+
+function rpc_sys()
+       local sys     = require "luci.sys"
+       local jsonrpc = require "luci.jsonrpc"
+       local http    = require "luci.http"
+       local ltn12   = require "luci.ltn12"
+       
+       http.prepare_content("application/json")
+       ltn12.pump.all(jsonrpc.handle(sys, http.source()), http.write)
+end
+
+function rpc_ipkg()
+       local ipkg    = require "luci.model.ipkg"
+       local jsonrpc = require "luci.jsonrpc"
+       local http    = require "luci.http"
+       local ltn12   = require "luci.ltn12"
+
+       http.prepare_content("application/json")
+       ltn12.pump.all(jsonrpc.handle(ipkg, http.source()), http.write)
+end