prosody: Invalid escape sequence in componentmanager deprecation warning (can cause...
[prosody.git] / prosody
diff --git a/prosody b/prosody
index 65fb16321e906aea4b95903fd6ac8b234d2e8328..b354089be1b8215c16ad3c3664812459b2d85593 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -7,6 +7,8 @@
 -- COPYING file in the source package for more information.
 --
 
+-- prosody - main executable for Prosody XMPP server
+
 -- Will be modified by configure script if run --
 
 CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
@@ -16,10 +18,22 @@ CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
+local function is_relative(path)
+       local path_sep = package.config:sub(1,1);
+        return ((path_sep == "/" and path:sub(1,1) ~= "/")
+       or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
+end
+
 -- Tell Lua where to find our libraries
 if CFG_SOURCEDIR then
-       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
-       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
+       local function filter_relative_paths(path)
+               if is_relative(path) then return ""; end
+       end
+       local function sanitise_paths(paths)
+               return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
+       end
+       package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
+       package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
 end
 
 -- Substitute ~ with path to home directory in data path
@@ -30,8 +44,14 @@ if CFG_DATADIR then
 end
 
 -- Global 'prosody' object
-prosody = { events = require "util.events".new(); };
-local prosody = prosody;
+local prosody = { events = require "util.events".new(); };
+_G.prosody = prosody;
+
+-- Check dependencies
+local dependencies = require "util.dependencies";
+if not dependencies.check_dependencies() then
+       os.exit(1);
+end
 
 -- Load the config-parsing module
 config = require "core.configmanager"
@@ -69,9 +89,15 @@ function read_config()
                print("\n");
                print("**************************");
                if level == "parser" then
-                       print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+                       print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":");
+                       print("");
                        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)));
+                       if err:match("chunk has too many syntax levels$") then
+                               print("An Include statement in a config file is including an already-included");
+                               print("file and causing an infinite loop. An Include statement in a config file is...");
+                       else
+                               print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err)));
+                       end
                        print("");
                elseif level == "file" then
                        print("Prosody was unable to find the configuration file.");
@@ -97,11 +123,21 @@ function init_logging()
        require "core.loggingmanager"
 end
 
-function check_dependencies()
-       -- Check runtime dependencies
-       if not require "util.dependencies".check_dependencies() then
-               os.exit(1);
+function log_dependency_warnings()
+       dependencies.log_warnings();
+end
+
+function sanity_check()
+       for host, host_config in pairs(configmanager.getconfig()) do
+               if host ~= "*"
+               and host_config.core.enabled ~= false
+               and not host_config.core.component_module then
+                       return;
+               end
        end
+       log("error", "No enabled VirtualHost entries found in the config file.");
+       log("error", "At least one active host is required for Prosody to function. Exiting...");
+       os.exit(1);
 end
 
 function sandbox_require()
@@ -160,26 +196,16 @@ function init_global_state()
        prosody.full_sessions = full_sessions;
        prosody.hosts = hosts;
        
-       prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
-                         plugins = CFG_PLUGINDIR, data = CFG_DATADIR };
-       
-       local path_sep = package.config:sub(1,1);
-       local rel_path_start = ".."..path_sep;
-       function prosody.resolve_relative_path(parent_path, path)
-               if path then
-                       local is_relative;
-                       if path_sep == "/" and path:sub(1,1) ~= "/" then
-                               is_relative = true;
-                       elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\") then
-                               is_relative = true;
-                       end
-                       if is_relative then
-                               return parent_path..path_sep..path;
-                       end
-               end
-               return path;
+       local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
+       local custom_plugin_paths = config.get("*", "core", "plugin_paths");
+       if custom_plugin_paths then
+               local path_sep = package.config:sub(3,3);
+               -- path1;path2;path3;defaultpath...
+               CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
        end
-       
+       prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
+                         plugins = CFG_PLUGINDIR or "plugins", data = data_path };
+
        prosody.arg = _G.arg;
 
        prosody.platform = "unknown";
@@ -244,7 +270,7 @@ function init_global_state()
                                if type(port) ~= "number" then
                                        log("error", "Non-numeric "..ports_option..": "..tostring(port));
                                else
-                                       local ok, err = cl.start(listener, {
+                                       local ok, errors = cl.start(listener, {
                                                ssl = conntype == "ssl" and global_ssl_ctx,
                                                port = port,
                                                interface = (option and config.get("*", "core", option.."_interface"))
@@ -253,31 +279,33 @@ function init_global_state()
                                                type = conntype
                                        });
                                        if not ok then
-                                               local friendly_message = err;
-                                               if err:match(" in use") then
-                                                       if port == 5222 or port == 5223 or port == 5269 then
-                                                               friendly_message = "check that Prosody or another XMPP server is "
-                                                                       .."not already running and using this port";
-                                                       elseif port == 80 or port == 81 then
-                                                               friendly_message = "check that a HTTP server is not already using "
-                                                                       .."this port";
-                                                       elseif port == 5280 then
-                                                               friendly_message = "check that Prosody or a BOSH connection manager "
-                                                                       .."is not already running";
-                                                       else
-                                                               friendly_message = "this port is in use by another application";
-                                                       end
-                                               elseif err:match("permission") then
-                                                       friendly_message = "Prosody does not have sufficient privileges to use this port";
-                                               elseif err == "no ssl context" then
-                                                       if not config.get("*", "core", "ssl") then
-                                                               friendly_message = "there is no 'ssl' config under Host \"*\" which is "
-                                                                       .."require for legacy SSL ports";
-                                                       else
-                                                               friendly_message = "initializing SSL support failed, see previous log entries";
+                                               for addr, err in pairs(errors) do
+                                                       local friendly_message = err;
+                                                       if err:match(" in use") then
+                                                               if port == 5222 or port == 5223 or port == 5269 then
+                                                                       friendly_message = "check that Prosody or another XMPP server is "
+                                                                               .."not already running and using this port";
+                                                               elseif port == 80 or port == 81 then
+                                                                       friendly_message = "check that a HTTP server is not already using "
+                                                                               .."this port";
+                                                               elseif port == 5280 then
+                                                                       friendly_message = "check that Prosody or a BOSH connection manager "
+                                                                               .."is not already running";
+                                                               else
+                                                                       friendly_message = "this port is in use by another application";
+                                                               end
+                                                       elseif err:match("permission") then
+                                                               friendly_message = "Prosody does not have sufficient privileges to use this port";
+                                                       elseif err == "no ssl context" then
+                                                               if not config.get("*", "core", "ssl") then
+                                                                       friendly_message = "there is no 'ssl' config under Host \"*\" which is "
+                                                                               .."require for legacy SSL ports";
+                                                               else
+                                                                       friendly_message = "initializing SSL support failed, see previous log entries";
+                                                               end
                                                        end
+                                                       log("error", "Failed to open server port %d on %s, %s", port, addr, friendly_message);
                                                end
-                                               log("error", "Failed to open server port %d, %s", port, friendly_message);
                                        end
                                end
                        end
@@ -303,13 +331,16 @@ function load_secondary_libraries()
        --- Load and initialise core modules
        require "util.import"
        require "util.xmppstream"
-       require "core.xmlhandlers"
        require "core.rostermanager"
        require "core.hostmanager"
        require "core.modulemanager"
        require "core.usermanager"
        require "core.sessionmanager"
        require "core.stanza_router"
+       package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
+               log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));
+               return function() end
+       end});
 
        require "net.http"
        
@@ -329,20 +360,13 @@ function load_secondary_libraries()
        ]]
 
        require "net.connlisteners";
+       require "net.httpserver";
        
        require "util.stanza"
        require "util.jid"
 end
 
 function init_data_store()
-       local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
-       require "util.datamanager".set_data_path(data_path);
-       require "util.datamanager".add_callback(function(username, host, datastore, data)
-               if config.get(host, "core", "anonymous_login") then
-                       return false;
-               end
-               return username, host, datastore, data;
-       end);
        require "core.storagemanager";
 end
 
@@ -454,13 +478,14 @@ end
 -- previous steps to have already been performed
 read_config();
 init_logging();
-check_dependencies();
+sanity_check();
 sandbox_require();
 set_function_metatable();
 load_libraries();
 init_global_state();
 read_version();
 log("info", "Hello and welcome to Prosody version %s", prosody.version);
+log_dependency_warnings();
 load_secondary_libraries();
 init_data_store();
 init_global_protection();