prosodyctl: Nicer errors when addplugin command fails
[prosody.git] / prosodyctl
index 7998d033c52b0cf2e862762a5b81663a99847400..575948a1745833eb7ef6d9443bd37469efa486ca 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
 -- 
@@ -32,7 +32,6 @@ end
 -- Required to be able to find packages installed with luarocks
 pcall(require, "luarocks.require")
 
-
 config = require "core.configmanager"
 
 do
@@ -61,19 +60,65 @@ do
        end
 end
 
+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.1";
+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
+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 });
 
+local events = require "util.events".new();
+
 hosts = {};
+prosody = { hosts = hosts, events = events };
 
-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, ...)
@@ -93,17 +138,21 @@ end
 
 local function getchar(n)
        os.execute("stty raw -echo");
-       local char = io.read(n or 1);
+       local ok, char = pcall(io.read, n or 1);
        os.execute("stty sane");
-       return char;
+       if ok then
+               return char;
+       end
 end
        
 local function getpass()
        os.execute("stty -echo");
-       local pass = io.read("*l");
+       local ok, pass = pcall(io.read, "*l");
        os.execute("stty sane");
        io.write("\n");
-       return pass;
+       if ok then
+               return pass;
+       end
 end
 
 function show_yesno(prompt)
@@ -122,6 +171,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 +186,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];
@@ -261,7 +316,24 @@ function commands.start(arg)
        end
        
        local ok, ret = prosodyctl.start();
-       if ok then return 0; end
+       if ok 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");
+               return 0;
+       end
 
        show_message("Failed to start Prosody");
        show_message(error_messages[ret])       
@@ -291,6 +363,12 @@ function commands.status(arg)
                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;
@@ -308,7 +386,24 @@ function commands.stop(arg)
        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]);
        return 1;
@@ -367,9 +462,70 @@ function commands.unregister(arg)
        return 1;
 end
 
+local http_errors = {
+       [404] = "Plugin not found, did you type the address correctly?"
+       };
+
+function commands.addplugin(arg)
+       local url = arg[1];
+       if url:match("^http://") then
+               local http = require "socket.http";
+               show_message("Fetching...");
+               local code, err = http.request(url);
+               if not code or not tostring(err):match("^[23]") then
+                       show_message("Failed: "..(http_errors[err] or ("HTTP error "..err)));
+                       return 1;
+               end
+               if url:match("%.lua$") then
+                       local ok, err = datamanager.store(url:match("/mod_([^/]+)$"), "*", "plugins", {code});
+                       if not ok then
+                               show_message("Failed to save to data store: "..err);
+                               return 1;
+                       end
+               end
+               show_message("Saved. Don't forget to load the module using the config file or admin console!");
+       else
+               show_message("Sorry, I don't understand how to fetch plugins from there.");
+       end
+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);