util.pluginloader: Return full file path from internal file loader on success, not...

[prosody.git] / util / prosodyctl.lua

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 2213e2d711939ae1d636cc7b29fc30c2a28c8b6d..aa1850b259e14e07d0abb277a44956e4c62f6092 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -1,19 +1,118 @@
+-- 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.
+--
+
 
 local config = require "core.configmanager";
 local encodings = require "util.encodings";
 local stringprep = encodings.stringprep;
+local storagemanager = require "core.storagemanager";
 local usermanager = require "core.usermanager";
 local signal = require "util.signal";
+local set = require "util.set";
+local lfs = require "lfs";
+local pcall = pcall;
 
 local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
 
 local io, os = io, os;
+local print = print;
 local tostring, tonumber = tostring, tonumber;
 
 local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
 
+local _G = _G;
+local prosody = prosody;
+
 module "prosodyctl"
 
+-- UI helpers
+function show_message(msg, ...)
+       print(msg:format(...));
+end
+
+function show_warning(msg, ...)
+       print(msg:format(...));
+end
+
+function show_usage(usage, desc)
+       print("Usage: ".._G.arg[0].." "..usage);
+       if desc then
+               print(" "..desc);
+       end
+end
+
+function getchar(n)
+       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
+
+function getpass()
+       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");
+       if ok then
+               return pass;
+       end
+end
+
+function show_yesno(prompt)
+       io.write(prompt, " ");
+       local choice = getchar():lower();
+       io.write("\n");
+       if not choice:match("%a") then
+               choice = prompt:match("%[.-(%U).-%]$");
+               if not choice then return nil; end
+       end
+       return (choice == "y");
+end
+
+function read_password()
+       local 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
+                               return;
+                       end
+               else
+                       break;
+               end
+       end
+       return password;
+end
+
+-- Server control
 function adduser(params)
        local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
        if not user then
@@ -21,16 +120,29 @@ function adduser(params)
        elseif not host then
                return false, "invalid-hostname";
        end
+
+       local provider = prosody.hosts[host].users;
+       if not(provider) or provider.name == "null" then
+               usermanager.initialize_host(host);
+       end
+       storagemanager.initialize_host(host);
        
-       local ok = usermanager.create_user(user, password, host);
+       local ok, errmsg = usermanager.create_user(user, password, host);
        if not ok then
-               return false, "unable-to-save-data";
+               return false, errmsg;
        end
        return true;
 end
 
 function user_exists(params)
-       return usermanager.user_exists(params.user, params.host);
+       local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
+       local provider = prosody.hosts[host].users;
+       if not(provider) or provider.name == "null" then
+               usermanager.initialize_host(host);
+       end
+       storagemanager.initialize_host(host);
+       
+       return usermanager.user_exists(user, host);
 end
 
 function passwd(params)
@@ -56,11 +168,22 @@ function getpid()
                return false, "no-pidfile";
        end
        
-       local file, err = io.open(pidfile);
+       local modules_enabled = set.new(config.get("*", "core", "modules_enabled"));
+       if not modules_enabled:contains("posix") then
+               return false, "no-posix";
+       end
+       
+       local file, err = io.open(pidfile, "r+");
        if not file then
                return false, "pidfile-read-failed", err;
        end
        
+       local locked, err = lfs.lock(file, "w");
+       if locked then
+               file:close();
+               return false, "pidfile-not-locked";
+       end
+       
        local pid = tonumber(file:read("*a"));
        file:close();
        
@@ -74,7 +197,7 @@ end
 function isrunning()
        local ok, pid, err = _M.getpid();
        if not ok then
-               if pid == "pidfile-read-failed" then
+               if pid == "pidfile-read-failed" or pid == "pidfile-not-locked" then
                        -- Report as not running, since we can't open the pidfile
                        -- (it probably doesn't exist)
                        return true, false;
@@ -94,10 +217,8 @@ function start()
        end
        if not CFG_SOURCEDIR then
                os.execute("./prosody");
-       elseif CFG_SOURCEDIR:match("^/usr/local") then
-               os.execute("/usr/local/bin/prosody");
        else
-               os.execute("prosody");
+               os.execute(CFG_SOURCEDIR.."/../../bin/prosody");
        end
        return true;
 end