X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=42e4eb502d909fe33133eef6b2f6686daf1c79be;hb=f4e25c6725eabf3bfec0ce01bf2c9bc785fbf92b;hp=98d15da2a6c3783c5b6f3b31dd26e38eb7101308;hpb=88e5c422ce6f04b5961af13f1804f4d31d5464f2;p=prosody.git diff --git a/prosody b/prosody index 98d15da2..42e4eb50 100755 --- a/prosody +++ b/prosody @@ -1,31 +1,20 @@ #!/usr/bin/env lua --- Prosody IM v0.2 --- Copyright (C) 2008 Matthew Wild --- Copyright (C) 2008 Waqas Hussain +-- Prosody IM v0.4 +-- Copyright (C) 2008-2009 Matthew Wild +-- Copyright (C) 2008-2009 Waqas Hussain -- --- This program is free software; you can redistribute it and/or --- modify it under the terms of the GNU General Public License --- as published by the Free Software Foundation; either version 2 --- of the License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. -- --- Config here -- +-- Will be modified by configure script if run -- CFG_SOURCEDIR=nil; CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); CFG_PLUGINDIR=nil; CFG_DATADIR=os.getenv("PROSODY_DATADIR"); --- -- -- -- -- -- +-- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- -- if CFG_SOURCEDIR then package.path = CFG_SOURCEDIR.."/?.lua;"..package.path @@ -43,36 +32,43 @@ pcall(require, "luarocks.require") config = require "core.configmanager" -log = require "util.logger".init("general"); - --- Disable log output, needs to read from config --- require "util.logger".setwriter(function () end); do -- TODO: Check for other formats when we add support for them -- Use lfs? Make a new conf/ dir? - local ok, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.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); + print(""); + print("**************************"); + if level == "parser" then + print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)"); + print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err))); + print(""); + elseif level == "file" then + print("Prosody was unable to find the configuration file."); + print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist"); + print("Copy or rename it to prosody.cfg.lua and edit as necessary."); end + print("More help on configuring Prosody can be found at http://prosody.im/doc/configure"); + print("Good luck!"); + print("**************************"); + print(""); + os.exit(1); end end -local server = require "net.server" +log = require "util.logger".init("general"); + +-- Disable log output, needs to read from config +-- require "util.logger".setwriter(function () end); require "util.dependencies" +local server = require "net.server" + + -- Maps connections to sessions -- sessions = {}; hosts = {}; @@ -82,7 +78,6 @@ hosts = {}; require "util.import" require "core.xmlhandlers" require "core.rostermanager" -require "core.offlinemessage" require "core.eventmanager" require "core.hostmanager" require "core.modulemanager" @@ -90,7 +85,12 @@ require "core.usermanager" require "core.sessionmanager" require "core.stanza_router" ---[[ +require "util.array" +require "util.iterators" + +-- Commented to protect us from +-- the second kind of people +--[[ pcall(require, "remdebug.engine"); if remdebug then remdebug.engine.start() end ]] @@ -107,39 +107,14 @@ require "util.jid" local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; require "util.datamanager".set_data_path(data_path); - - -local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end -local _mkdir = {} -function mkdir(path) - path = path:gsub("/", path_separator); - local x = io.popen("mkdir \""..path.."\" 2>&1"):read("*a"); -end -function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end -function mkdirs(host) - if not _mkdir[host] then - local host_dir = string.format("%s/%s", data_path, encode(host)); - mkdir(host_dir); - mkdir(host_dir.."/accounts"); - mkdir(host_dir.."/vcard"); - mkdir(host_dir.."/roster"); - mkdir(host_dir.."/private"); - mkdir(host_dir.."/offline"); - _mkdir[host] = true; - end -end -mkdir(data_path); - -eventmanager.add_event_hook("host-activated", mkdirs); +require "util.datamanager".set_callback(function(username, host, datastore) + return config.get(host, "core", "anonymous_login"); +end); ----------- End of out-of-place code -------------- eventmanager.fire_event("server-starting"); - --- setup error handling -setmetatable(_G, { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }); - 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"; }; @@ -147,9 +122,10 @@ if global_ssl_ctx then end -- start listening on sockets -local function do_ports(option, listener, default, key) +function net_activate_ports(option, listener, default, conntype) local ports = config.get("*", "core", option) or default; - --if type(ports) == "number" then ports = {ports} end; + if type(ports) == "number" then ports = {ports} end; + if type(ports) ~= "table" then log("error", "core."..option.." is not a table"); else @@ -157,24 +133,54 @@ local function do_ports(option, listener, default, key) if type(port) ~= "number" then log("error", "Non-numeric "..option..": "..tostring(port)); else - cl.start(listener, { ssl = global_ssl_ctx, [key] = port }); + cl.start(listener, { ssl = conntype ~= "tcp" and global_ssl_ctx, port = port, type = conntype }); end end end end -do_ports("c2s_ports", "xmppclient", {5222}, "port"); -do_ports("s2s_ports", "xmppserver", {5269}, "port"); -do_ports("legacy_ssl_ports", "xmppclient", {}, "legacy_ssl_port"); +net_activate_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp"); +net_activate_ports("s2s_ports", "xmppserver", {5269}, "tcp"); +net_activate_ports("legacy_ssl_ports", "xmppclient", {}, "ssl"); if config.get("*", "core", "console_enabled") then if cl.get("console") then - cl.start("console") + cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" }) else log("error", "Console is enabled, but the console module appears not to be loaded"); end end +-- setup error handling +local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end } + +function unlock_globals() + setmetatable(_G, nil); +end + +function lock_globals() + setmetatable(_G, locked_globals_mt); +end + +lock_globals(); + eventmanager.fire_event("server-started"); -server.loop(); +local quitting; +while not quitting do + xpcall(server.loop, function (err) + if err:match("%d*: interrupted!$") then + quitting = true; + return; + end + + log("error", "Top-level error, please report:\n%s", tostring(err)); + + local traceback = debug.traceback("", 2); + if traceback then + log("error", "%s", traceback); + end + + eventmanager.fire_event("very-bad-error", "*", err, traceback); + end); +end