Merge backout
[prosody.git] / prosodyctl
index db607833144ec7e1ce02c6c7aeba8aebc6e748fd..26183b21204af1db3b7ea35f26ea8256e2157645 100755 (executable)
@@ -1,5 +1,5 @@
 #!/usr/bin/env lua
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -29,10 +29,6 @@ if CFG_DATADIR then
        end
 end
 
--- Required to be able to find packages installed with luarocks
-pcall(require, "luarocks.require")
-
-
 config = require "core.configmanager"
 
 do
@@ -61,19 +57,75 @@ do
        end
 end
 
+require "core.loggingmanager"
+
+if not require "util.dependencies".check_dependencies() then
+       os.exit(1);
+end
+
+prosody = { hosts = {}, events = events, platform = "posix" };
+
+local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
+require "util.datamanager".set_data_path(data_path);
+
+-- Switch away from root and into the prosody user --
+local switched_user, current_uid;
+
+local want_pposix_version = "0.3.3";
+local ok, pposix = pcall(require, "util.pposix");
+
+if ok and pposix then
+       if pposix._VERSION ~= want_pposix_version then print(string.format("Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version)); return; end
+       current_uid = pposix.getuid();
+       if current_uid == 0 then
+               -- We haz root!
+               local desired_user = config.get("*", "core", "prosody_user") or "prosody";
+               local desired_group = config.get("*", "core", "prosody_group") or desired_user;
+               local ok, err = pposix.setgid(desired_group);
+               if ok then
+                       ok, err = pposix.setuid(desired_user);
+                       if ok then
+                               -- Yay!
+                               switched_user = true;
+                       end
+               end
+               if not switched_user then
+                       -- Boo!
+                       print("Warning: Couldn't switch to Prosody user/group '"..tostring(desired_user).."'/'"..tostring(desired_group).."': "..tostring(err));
+               end
+       end
+       
+       -- Set our umask to protect data files
+       pposix.umask(config.get("*", "core", "umask") or "027");
+else
+       print("Error: Unable to load pposix module. Check that Prosody is installed correctly.")
+       print("For more help send the below error to us through http://prosody.im/discuss");
+       print(tostring(pposix))
+end
+
 local error_messages = setmetatable({ 
                ["invalid-username"] = "The given username is invalid in a Jabber ID";
                ["invalid-hostname"] = "The given hostname is invalid";
                ["no-password"] = "No password was supplied";
                ["no-such-user"] = "The given user does not exist on the server";
+               ["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?";
+               ["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help";
+               ["no-such-method"] = "This module has no commands";
+               ["not-running"] = "Prosody is not running";
                }, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end });
 
-hosts = {};
+local events = require "util.events".new();
+
+hosts = prosody.hosts;
 
-require "core.hostmanager"
-require "core.eventmanager".fire_event("server-starting");
+for hostname, config in pairs(config.getconfig()) do
+       hosts[hostname] = { events = events };
+end
+       
+require "core.modulemanager"
 
 require "util.prosodyctl"
+require "socket"
 -----------------------
 
 function show_message(msg, ...)
@@ -92,18 +144,37 @@ function show_usage(usage, desc)
 end
 
 local function getchar(n)
-       os.execute("stty raw -echo");
-       local char = io.read(n or 1);
-       os.execute("stty sane");
-       return char;
+       local stty_ret = os.execute("stty raw -echo 2>/dev/null");
+       local ok, char;
+       if stty_ret == 0 then
+               ok, char = pcall(io.read, n or 1);
+               os.execute("stty sane");
+       else
+               ok, char = pcall(io.read, "*l");
+               if ok then
+                       char = char:sub(1, n or 1);
+               end
+       end
+       if ok then
+               return char;
+       end
 end
        
 local function getpass()
-       os.execute("stty -echo");
-       local pass = io.read("*l");
-       os.execute("stty sane");
+       local stty_ret = os.execute("stty -echo 2>/dev/null");
+       if stty_ret ~= 0 then
+               io.write("\027[08m"); -- ANSI 'hidden' text attribute
+       end
+       local ok, pass = pcall(io.read, "*l");
+       if stty_ret == 0 then
+               os.execute("stty sane");
+       else
+               io.write("\027[00m");
+       end
        io.write("\n");
-       return pass;
+       if ok then
+               return pass;
+       end
 end
 
 function show_yesno(prompt)
@@ -122,6 +193,10 @@ local function read_password()
        while true do
                io.write("Enter new password: ");
                password = getpass();
+               if not password then
+                       show_message("No password - cancelled");
+                       return;
+               end
                io.write("Retype new password: ");
                if getpass() ~= password then
                        if not show_yesno [=[Passwords did not match, try again? [Y/n]]=] then
@@ -133,6 +208,8 @@ local function read_password()
        end
        return password;
 end
+
+local prosodyctl_timeout = (config.get("*", "core", "prosodyctl_timeout") or 5) * 2;
 -----------------------
 local commands = {};
 local command = arg[1];
@@ -238,7 +315,11 @@ function commands.deluser(arg)
        return 1;
 end
 
-function commands.start()
+function commands.start(arg)
+       if arg[1] == "--help" then
+               show_usage([[start]], [[Start Prosody]]);
+               return 1;
+       end
        local ok, ret = prosodyctl.isrunning();
        if not ok then
                show_message(error_messages[ret]);
@@ -257,14 +338,38 @@ function commands.start()
        end
        
        local ok, ret = prosodyctl.start();
-       if ok then return 0; end
+       if ok then
+               if config.get("*", "core", "daemonize") ~= false then
+                       local i=1;
+                       while true do
+                               local ok, running = prosodyctl.isrunning();
+                               if ok and running then
+                                       break;
+                               elseif i == 5 then
+                                       show_message("Still waiting...");
+                               elseif i >= prosodyctl_timeout then
+                                       show_message("Prosody is still not running. Please give it some time or check your log files for errors.");
+                                       return 2;
+                               end
+                               socket.sleep(0.5);
+                               i = i + 1;
+                       end
+                       show_message("Started");
+               end
+               return 0;
+       end
 
        show_message("Failed to start Prosody");
        show_message(error_messages[ret])       
        return 1;       
 end
 
-function commands.status()
+function commands.status(arg)
+       if arg[1] == "--help" then
+               show_usage([[status]], [[Reports the running status of Prosody]]);
+               return 1;
+       end
+
        local ok, ret = prosodyctl.isrunning();
        if not ok then
                show_message(error_messages[ret]);
@@ -280,32 +385,78 @@ function commands.status()
                end
                show_message("Prosody is running with PID %s", ret or "(unknown)");
                return 0;
+       else
+               show_message("Prosody is not running");
+               if not switched_user and current_uid ~= 0 then
+                       print("\nNote:")
+                       print(" You will also see this if prosodyctl is not running under");
+                       print(" the same user account as Prosody. Try running as root (e.g. ");
+                       print(" with 'sudo' in front) to gain access to Prosody's real status.");
+               end
+               return 2
        end
        return 1;
 end
 
-function commands.stop()
+function commands.stop(arg)
+       if arg[1] == "--help" then
+               show_usage([[stop]], [[Stop a running Prosody server]]);
+               return 1;
+       end
+
        if not prosodyctl.isrunning() then
                show_message("Prosody is not running");
                return 1;
        end
        
        local ok, ret = prosodyctl.stop();
-       if ok then return 0; end
+       if ok then
+               local i=1;
+               while true do
+                       local ok, running = prosodyctl.isrunning();
+                       if ok and not running then
+                               break;
+                       elseif i == 5 then
+                               show_message("Still waiting...");
+                       elseif i >= prosodyctl_timeout then
+                               show_message("Prosody is still running. Please give it some time or check your log files for errors.");
+                               return 2;
+                       end
+                       socket.sleep(0.5);
+                       i = i + 1;
+               end
+               show_message("Stopped");
+               return 0;
+       end
 
-       show_message(error_messages[ret])       
+       show_message(error_messages[ret]);
        return 1;
 end
 
+function commands.restart(arg)
+       if arg[1] == "--help" then
+               show_usage([[restart]], [[Restart a running Prosody server]]);
+               return 1;
+       end
+       
+       local ret = commands.stop(arg);
+       if ret == 0 then
+               ret = commands.start(arg);
+       end
+       return ret;
+end
+
 -- ejabberdctl compatibility
 
 function commands.register(arg)
        local user, host, password = unpack(arg);
        if (not (user and host)) or arg[1] == "--help" then
-               if not user and user ~= "--help" then
-                       show_message [[No username specified]]
-               elseif not host then
-                       show_message [[Please specify which host you want to register the user on]];
+               if user ~= "--help" then
+                       if not user then
+                               show_message [[No username specified]]
+                       elseif not host then
+                               show_message [[Please specify which host you want to register the user on]];
+                       end
                end
                show_usage("register USER HOST [PASSWORD]", "Register a user on the server, with the given password");
                return 1;
@@ -329,12 +480,14 @@ end
 function commands.unregister(arg)
        local user, host = unpack(arg);
        if (not (user and host)) or arg[1] == "--help" then
-               if not user then
-                       show_message [[No username specified]]
-               elseif not host then
-                       show_message [[Please specify which host you want to unregister the user from]];
+               if user ~= "--help" then
+                       if not user then
+                               show_message [[No username specified]]
+                       elseif not host then
+                               show_message [[Please specify which host you want to unregister the user from]];
+                       end
                end
-               show_usage("register USER HOST [PASSWORD]", "Permanently remove a user account from the server");
+               show_usage("unregister USER HOST [PASSWORD]", "Permanently remove a user account from the server");
                return 1;
        end
 
@@ -346,9 +499,43 @@ function commands.unregister(arg)
        return 1;
 end
 
-
 ---------------------
 
+if command and command:match("^mod_") then -- Is a command in a module
+       local module_name = command:match("^mod_(.+)");
+       local ret, err = modulemanager.load("*", module_name);
+       if not ret then
+               show_message("Failed to load module '"..module_name.."': "..err);
+               os.exit(1);
+       end
+       
+       table.remove(arg, 1);
+       
+       local module = modulemanager.get_module("*", module_name);
+       if not module then
+               show_message("Failed to load module '"..module_name.."': Unknown error");
+               os.exit(1);
+       end
+       
+       if not modulemanager.module_has_method(module, "command") then
+               show_message("Fail: mod_"..module_name.." does not support any commands");
+               os.exit(1);
+       end
+       
+       local ok, ret = modulemanager.call_module_method(module, "command", arg);
+       if ok then
+               if type(ret) == "number" then
+                       os.exit(ret);
+               elseif type(ret) == "string" then
+                       show_message(ret);
+               end
+               os.exit(0); -- :)
+       else
+               show_message("Failed to execute command: "..error_messages[ret]);
+               os.exit(1); -- :(
+       end
+end
+
 if not commands[command] then -- Show help for all commands
        function show_usage(usage, desc)
                print(" "..usage);
@@ -361,7 +548,8 @@ if not commands[command] then -- Show help for all commands
        print("");
        print("Where COMMAND may be one of:\n");
 
-       local commands_order = { "adduser", "passwd", "deluser" };
+       local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
+       local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart" };
 
        local done = {};
 
@@ -375,7 +563,7 @@ if not commands[command] then -- Show help for all commands
        end
 
        for command_name, command in pairs(commands) do
-               if not done[command_name] then
+               if not done[command_name] and not hidden_commands:contains(command_name) then
                        command{ "--help" };
                        print""
                        done[command_name] = true;