Merge with 0.10

[prosody.git] / util / dependencies.lua

diff --git a/util/dependencies.lua b/util/dependencies.lua
index 6024dd63e6b5154fe7ac7f4cd7914be48da00631..ea19d9a8b606b4f5cfa1d372b54d0f117035135c 100644 (file)
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -35,11 +35,32 @@ function missingdep(name, sources, msg)
        print("");
 end
 
+-- COMPAT w/pre-0.8 Debian: The Debian config file used to use
+-- util.ztact, which has been removed from Prosody in 0.8. This
+-- is to log an error for people who still use it, so they can
+-- update their configs.
+package.preload["util.ztact"] = function ()
+       if not package.loaded["core.loggingmanager"] then
+               error("util.ztact has been removed from Prosody and you need to fix your config "
+                   .."file. More information can be found at http://prosody.im/doc/packagers#ztact", 0);
+       else
+               error("module 'util.ztact' has been deprecated in Prosody 0.8.");
+       end
+end;
+
 function check_dependencies()
+       if _VERSION ~= "Lua 5.1" then
+               print "***********************************"
+               print("Unsupported Lua version: ".._VERSION);
+               print("Only Lua 5.1 is supported.");
+               print "***********************************"
+               return false;
+       end
+
        local fatal;
-       
+
        local lxp = softreq "lxp"
-       
+
        if not lxp then
                missingdep("luaexpat", {
                                ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";
@@ -48,9 +69,9 @@ function check_dependencies()
                        });
                fatal = true;
        end
-       
+
        local socket = softreq "socket"
-       
+
        if not socket then
                missingdep("luasocket", {
                                ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2";
@@ -59,7 +80,7 @@ function check_dependencies()
                        });
                fatal = true;
        end
-       
+
        local lfs, err = softreq "lfs"
        if not lfs then
                missingdep("luafilesystem", {
@@ -69,22 +90,17 @@ function check_dependencies()
                        });
                fatal = true;
        end
-       
+
        local ssl = softreq "ssl"
-       
+
        if not ssl then
                missingdep("LuaSec", {
                                ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu";
                                ["luarocks"] = "luarocks install luasec";
                                ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
                        }, "SSL/TLS support will not be available");
-       else
-               local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");
-               if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then
-                       log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
-               end
        end
-       
+
        local encodings, err = softreq "util.encodings"
        if not encodings then
                if err:match("not found") then
@@ -121,5 +137,29 @@ function check_dependencies()
        return not fatal;
 end
 
+function log_warnings()
+       if ssl then
+               local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");
+               if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then
+                       log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
+               end
+       end
+       if lxp then
+               if not pcall(lxp.new, { StartDoctypeDecl = false }) then
+                       log("error", "The version of LuaExpat on your system leaves Prosody "
+                               .."vulnerable to denial-of-service attacks. You should upgrade to "
+                               .."LuaExpat 1.3.0 or higher as soon as possible. See "
+                               .."http://prosody.im/doc/depends#luaexpat for more information.");
+               end
+               if not lxp.new({}).getcurrentbytecount then
+                       log("error", "The version of LuaExpat on your system does not support "
+                               .."stanza size limits, which may leave servers on untrusted "
+                               .."networks (e.g. the internet) vulnerable to denial-of-service "
+                               .."attacks. You should upgrade to LuaExpat 1.3.0 or higher as "
+                               .."soon as possible. See "
+                               .."http://prosody.im/doc/depends#luaexpat for more information.");
+               end
+       end
+end
 
 return _M;