prosody: sandboxed require(): Point __index of _G at current env for modules that...
[prosody.git] / prosody
diff --git a/prosody b/prosody
index b093e4fdd08c3d1b2dd1f0efcf5466732dc2bb82..f79910b723b9f3985e313cfa7ca43b3a1336fa16 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -18,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
@@ -115,6 +127,19 @@ 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()
        -- Replace require() with one that doesn't pollute _G, required
        -- for neat sandboxing of modules
@@ -125,10 +150,14 @@ function sandbox_require()
                local curr_env_mt = getmetatable(getfenv(2));
                local _realG_mt = getmetatable(_realG);
                if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then
-                       local old_newindex
+                       local old_newindex, old_index;
                        old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
+                       old_index, _realG_mt.__index = _realG_mt.__index, function (_G, k)
+                               return rawget(curr_env, k);
+                       end;
                        local ret = _real_require(...);
                        _realG_mt.__newindex = old_newindex;
+                       _realG_mt.__index = old_index;
                        return ret;
                end
                return _real_require(...);
@@ -171,9 +200,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 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 or ".", 
+                         plugins = CFG_PLUGINDIR or "plugins", data = data_path };
+
        prosody.arg = _G.arg;
 
        prosody.platform = "unknown";
@@ -222,61 +258,6 @@ function init_global_state()
        local global_ssl_ctx = certmanager.create_context("*", "server");
        prosody.global_ssl_ctx = global_ssl_ctx;
 
-       local cl = require "net.connlisteners";
-       function prosody.net_activate_ports(option, listener, default, conntype)
-               conntype = conntype or (global_ssl_ctx and "tls") or "tcp";
-               local ports_option = option and option.."_ports" or "ports";
-               if not cl.get(listener) then return; end
-               local ports = config.get("*", "core", ports_option) or default;
-               if type(ports) == "number" then ports = {ports} end;
-               
-               if type(ports) ~= "table" then
-                       log("error", "core."..ports_option.." is not a table");
-               else
-                       for _, port in ipairs(ports) do
-                               port = tonumber(port);
-                               if type(port) ~= "number" then
-                                       log("error", "Non-numeric "..ports_option..": "..tostring(port));
-                               else
-                                       local ok, err = cl.start(listener, {
-                                               ssl = conntype == "ssl" and global_ssl_ctx,
-                                               port = port,
-                                               interface = (option and config.get("*", "core", option.."_interface"))
-                                                       or cl.get(listener).default_interface
-                                                       or config.get("*", "core", "interface"),
-                                               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";
-                                                       end
-                                               end
-                                               log("error", "Failed to open server port %d, %s", port, friendly_message);
-                                       end
-                               end
-                       end
-               end
-       end
 end
 
 function read_version()
@@ -304,7 +285,7 @@ function load_secondary_libraries()
        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[\s\t]*([^\n]*)"));
+               log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));
                return function() end
        end});
 
@@ -325,15 +306,13 @@ function load_secondary_libraries()
        if remdebug then remdebug.engine.start() end
        ]]
 
-       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 "core.storagemanager";
 end
 
@@ -341,20 +320,6 @@ function prepare_to_start()
        log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
        -- Signal to modules that we are ready to start
        prosody.events.fire_event("server-starting");
-
-       -- start listening on sockets
-       if config.get("*", "core", "ports") then
-               prosody.net_activate_ports(nil, "multiplex", {5222, 5269});
-               if config.get("*", "core", "ssl_ports") then
-                       prosody.net_activate_ports("ssl", "multiplex", {5223}, "ssl");
-               end
-       else
-               prosody.net_activate_ports("c2s", "xmppclient", {5222});
-               prosody.net_activate_ports("s2s", "xmppserver", {5269});
-               prosody.net_activate_ports("component", "xmppcomponent", {5347}, "tcp");
-               prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
-       end
-
        prosody.start_time = os.time();
 end    
 
@@ -445,6 +410,7 @@ end
 -- previous steps to have already been performed
 read_config();
 init_logging();
+sanity_check();
 sandbox_require();
 set_function_metatable();
 load_libraries();