SASLprep usernames and passwords.

[prosody.git] / prosody

diff --git a/prosody b/prosody
index e9f00598875278829e720cc1b79f6e23b5fccc0e..e22e59454ab3070649284db4fe938bc2bb49e610 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -9,9 +9,9 @@
 
 -- Will be modified by configure script if run --
 
-CFG_SOURCEDIR=nil;
+CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=nil;
+CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
 -- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
@@ -33,6 +33,25 @@ end
 -- Required to be able to find packages installed with luarocks
 pcall(require, "luarocks.require")
 
+-- Replace require with one that doesn't pollute _G
+do
+       local _realG = _G;
+       local _real_require = require;
+       function require(...)
+               local curr_env = getfenv(2);
+               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
+                       old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
+                       local ret = _real_require(...);
+                       _realG_mt.__newindex = old_newindex;
+                       return ret;
+               end
+               return _real_require(...);
+       end
+end
+
 
 config = require "core.configmanager"
 
@@ -93,6 +112,17 @@ function init_global_state()
 
        prosody.events = require "util.events".new();
        
+       prosody.platform = "unknown";
+       if os.getenv("WINDIR") then
+               prosody.platform = "windows";
+       elseif package.config:sub(1,1) == "/" then
+               prosody.platform = "posix";
+       end
+       
+       prosody.installed = nil;
+       if CFG_SOURCEDIR and (prosody.platform == "windows" or CFG_SOURCEDIR:match("^/")) then
+               prosody.installed = true;
+       end
        
        -- Function to reload the config file
        function prosody.reload_config()
@@ -151,11 +181,16 @@ function load_secondary_libraries()
        require "core.sessionmanager"
        require "core.stanza_router"
 
+       require "net.http"
+       
        require "util.array"
+       require "util.datetime"
        require "util.iterators"
        require "util.timer"
        require "util.helpers"
        
+       pcall(require, "util.signal") -- Not on Windows
+       
        -- Commented to protect us from 
        -- the second kind of people
        --[[ 
@@ -186,7 +221,7 @@ function prepare_to_start()
        prosody.events.fire_event("server-starting");
 
        -- Load SSL settings from config, and create a ctx table
-       local global_ssl_ctx = ssl and config.get("*", "core", "ssl");
+       local global_ssl_ctx = rawget(_G, "ssl") and 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 });
@@ -194,7 +229,7 @@ function prepare_to_start()
 
        local cl = require "net.connlisteners";
        -- start listening on sockets
-       function net_activate_ports(option, listener, default, conntype)
+       function prosody.net_activate_ports(option, listener, default, conntype)
                if not cl.get(listener) then return; end
                local ports = config.get("*", "core", option.."_ports") or default;
                if type(ports) == "number" then ports = {ports} end;
@@ -219,11 +254,11 @@ function prepare_to_start()
                end
        end
 
-       net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
-       net_activate_ports("s2s", "xmppserver", {5269}, "tcp");
-       net_activate_ports("component", "xmppcomponent", {}, "tcp");
-       net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
-       net_activate_ports("console", "console", {5582}, "tcp");
+       prosody.net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
+       prosody.net_activate_ports("s2s", "xmppserver", {5269}, (global_ssl_ctx and "tls") or "tcp");
+       prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp");
+       prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
+       prosody.net_activate_ports("console", "console", {5582}, "tcp");
 
        prosody.start_time = os.time();
 end    
@@ -247,7 +282,7 @@ end
 function loop()
        -- Error handler for errors that make it this far
        local function catch_uncaught_error(err)
-               if err:match("%d*: interrupted!$") then
+               if type(err) == "string" and err:match("%d*: interrupted!$") then
                        return "quitting";
                end
                
@@ -314,8 +349,8 @@ read_version();
 log("info", "Hello and welcome to Prosody version %s", prosody.version);
 load_secondary_libraries();
 init_data_store();
-prepare_to_start();
 init_global_protection();
+prepare_to_start();
 
 eventmanager.fire_event("server-started");
 prosody.events.fire_event("server-started");