X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=main.lua;h=1513763e4453f7b9292416b72f657d1c84eee589;hb=53dfc67c1112927e0e1412ec590093d3d8fae744;hp=821b3273bd6b0fa69285c33da8362a2925b75316;hpb=514a28f20f30a9b53169b61785a9bac4d4ba11bd;p=prosody.git diff --git a/main.lua b/main.lua index 821b3273..1513763e 100644 --- a/main.lua +++ b/main.lua @@ -1,20 +1,48 @@ -require "luarocks.require" +pcall(require, "luarocks.require") + +local config = require "core.configmanager" +log = require "util.logger".init("general"); + +do + -- TODO: Check for other formats when we add support for them + -- Use lfs? Make a new conf/ dir? + local ok, err = config.load("lxmppd.cfg.lua"); + if not ok then + log("error", "Couldn't load config file: %s", err); + log("info", "Falling back to old config file format...") + ok, err = pcall(dofile, "lxmppd.cfg"); + if not ok then + log("error", "Old config format loading failed too: %s", err); + else + for _, host in ipairs(_G.config.hosts) do + config.set(host, "core", "defined", true); + end + + config.set("*", "core", "modules_enabled", _G.config.modules); + config.set("*", "core", "ssl", _G.config.ssl_ctx); + end + end +end -server = require "net.server" -require "socket" -require "ssl" -require "lxp" +local server = require "net.server" -function log(type, area, message) - print(type, area, message); -end +require "util.dependencies" -dofile "lxmppd.cfg" - +-- Maps connections to sessions -- sessions = {}; - +hosts = {}; + +local defined_hosts = config.getconfig(); + +for host, host_config in pairs(defined_hosts) do + if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then + hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} }; + end +end + +-- Load and initialise core modules -- + require "util.import" -require "core.stanza_dispatch" require "core.xmlhandlers" require "core.rostermanager" require "core.offlinemessage" @@ -22,86 +50,47 @@ require "core.modulemanager" require "core.usermanager" require "core.sessionmanager" require "core.stanza_router" -require "net.connhandlers" -require "util.stanza" -require "util.jid" - - --- Locals for faster access -- -local t_insert = table.insert; -local t_concat = table.concat; -local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end -local m_random = math.random; -local format = string.format; -local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); -local st = stanza; ------------------------------- +--[[ +pcall(require, "remdebug.engine"); +if remdebug then remdebug.engine.start() end +]] +local start = require "net.connlisteners".start; +require "util.stanza" +require "util.jid" -local hosts, users = hosts, users; +------------------------------------------------------------------------ -function connect_host(host) - hosts[host] = { type = "remote", sendbuffer = {} }; +-- Initialise modules +local modules_enabled = config.get("*", "core", "modules_enabled"); +if modules_enabled then + for _, module in pairs(modules_enabled) do + modulemanager.load(module); + end end -function handler(conn, data, err) - local session = sessions[conn]; +-- setup error handling +setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][]; - if not session then - sessions[conn] = sm_new_session(conn); - session = sessions[conn]; +local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end; +local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end; - -- Logging functions -- - local mainlog, log = log; - do - local conn_name = tostring(conn):match("%w+$"); - log = function (type, area, message) mainlog(type, conn_name, message); end - --log = function () end - end - local print = function (...) log("info", "core", t_concatall({...}, "\t")); end - session.log = log; - - print("Client connected"); - - session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end - - session.connhandler = connhandlers.new("xmpp-client", session); - - function session.disconnect(err) - if session.last_presence and session.last_presence.attr.type ~= "unavailable" then - local pres = st.presence{ type = "unavailable" }; - if err == "closed" then err = "connection closed"; end - pres:tag("status"):text("Disconnected: "..err); - session.stanza_dispatch(pres); - end - session = nil; - print("Disconnected: "..tostring(err)); - collectgarbage("collect"); - end - end - if data then - session.connhandler:data(data); - end - - --log("info", "core", "Client disconnected, connection closed"); +local global_ssl_ctx = config.get("*", "core", "ssl"); +if global_ssl_ctx then + local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; }; + setmetatable(global_ssl_ctx, { __index = default_ssl_ctx }); end -function disconnect(conn, err) - sm_destroy_session(sessions[conn]); - sessions[conn] = nil; -end - -modulemanager.loadall(); - -setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][]; +-- start listening on sockets +start("xmppclient", { ssl = global_ssl_ctx }) +start("xmppserver", { ssl = global_ssl_ctx }) +if config.get("*", "core", "console_enabled") then + start("console") +end -local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end; -local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end; - -server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, nil ) -- server.add will send a status message -server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5223, "*", 1, ssl_ctx ) -- server.add will send a status message +modulemanager.fire_event("server-started"); server.loop();