modules/rpc: remove uvl bindings

[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 dd00f63..7255c17 100644 (file)
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/rpc/luasrc/controller/rpc.lua
@@ -12,33 +12,153 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-module("luci.controller.rpc", package.seeall)
+
+local require = require
+local pairs = pairs
+local print = print
+local pcall = pcall
+local table = table
+
+module "luci.controller.rpc"
 
 function index()
-       local authenticator = function(validator)
-               require "luci.jsonrpc"
-               require "luci.http"
-               luci.http.setfilehandler()
-               
-               local loginstat
-               
-               local server = {}
-               server.login = function(...)
-                       loginstat = validator(...)
-                       return loginstat
+       local function authenticator(validator, accs)
+               local auth = luci.http.formvalue("auth", true)
+               if auth then
+                       local sdat = luci.sauth.read(auth)
+                       user = loadstring(sdat)().user
+                       if user and luci.util.contains(accs, user) then
+                               return user, auth
+                       end
+               end
+               luci.http.status(403, "Forbidden")
+       end
+       
+       local rpc = node("rpc")
+       rpc.sysauth = "root"
+       rpc.sysauth_authenticator = authenticator
+       rpc.notemplate = true
+       
+       entry({"rpc", "uci"}, call("rpc_uci"))
+       entry({"rpc", "fs"}, call("rpc_fs"))
+       entry({"rpc", "sys"}, call("rpc_sys"))
+       entry({"rpc", "ipkg"}, call("rpc_ipkg"))
+       entry({"rpc", "auth"}, call("rpc_auth")).sysauth = false
+end
+
+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"
+       local util    = require "luci.util"
+       
+       local loginstat
+       
+       local server = {}
+       server.challenge = function(user, pass)
+               local sid, token, secret
+
+               if sys.user.checkpasswd(user, pass) then
+                       sid = sys.uniqueid(16)
+                       token = sys.uniqueid(16)
+                       secret = sys.uniqueid(16)
+
+                       http.header("Set-Cookie", "sysauth=" .. sid.."; path=/")
+                       sauth.write(sid, util.get_bytecode({
+                               user=user,
+                               token=token,
+                               secret=secret
+                       }))
                end
                
-               luci.http.prepare_content("application/json")
-               luci.http.write(luci.jsonrpc.handle(server, luci.http.content()))
-               
-               return loginstat
+               return sid and {sid=sid, token=token, secret=secret}
+       end
+
+       server.login = function(...)
+               local challenge = server.challenge(...)
+               return challenge and challenge.sid
        end
        
-       uci = entry({"rpc", "uci"}, call("rpc_uci"))
-       uci.sysauth = "root"
-       uci.sysauth_authenticator = authenticator
+       http.prepare_content("application/json")
+       ltn12.pump.all(jsonrpc.handle(server, http.source()), http.write)
 end
 
 function rpc_uci()
-       luci.http.write("HELLO THAR!")
-end
\ No newline at end of file
+       if not pcall(require, "luci.model.uci") then
+               luci.http.status(404, "Not Found")
+               return nil
+       end
+       local uci     = require "luci.jsonrpcbind.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 "nixio.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()
+       if not pcall(require, "luci.model.ipkg") then
+               luci.http.status(404, "Not Found")
+               return nil
+       end
+       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