X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fprosodyctl.lua;h=b80a69f26eaafab55be94e4a2b47b65130e9818a;hb=ba0b5b929007fb47a7948cbd415aee5f6d4968a9;hp=d0045abc9d251ce3eaebf0e1666f65002dfb3ea7;hpb=a9f88956bbe70088cc32e75fe88e35bc277b6bca;p=prosody.git

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index d0045abc..b80a69f2 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -16,6 +16,7 @@ local signal = require "util.signal";
 local set = require "util.set";
 local lfs = require "lfs";
 local pcall = pcall;
+local type = type;
 
 local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
 
@@ -63,6 +64,13 @@ function getchar(n)
 	end
 end
 
+function getline()
+	local ok, line = pcall(io.read, "*l");
+	if ok then
+		return line;
+	end
+end
+
 function getpass()
 	local stty_ret = os.execute("stty -echo 2>/dev/null");
 	if stty_ret ~= 0 then
@@ -112,6 +120,13 @@ function read_password()
 	return password;
 end
 
+function show_prompt(prompt)
+	io.write(prompt, " ");
+	local line = getline();
+	line = line and line:gsub("\n$","");
+	return (line and #line > 0) and line or nil;
+end
+
 -- Server control
 function adduser(params)
 	local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
@@ -121,11 +136,16 @@ function adduser(params)
 		return false, "invalid-hostname";
 	end
 
-	local provider = prosody.hosts[host].users;
+	local host_session = prosody.hosts[host];
+	if not host_session then
+		return false, "no-such-host";
+	end
+
+	storagemanager.initialize_host(host);
+	local provider = host_session.users;
 	if not(provider) or provider.name == "null" then
 		usermanager.initialize_host(host);
 	end
-	storagemanager.initialize_host(host);
 	
 	local ok, errmsg = usermanager.create_user(user, password, host);
 	if not ok then
@@ -136,11 +156,12 @@ end
 
 function user_exists(params)
 	local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
+
+	storagemanager.initialize_host(host);
 	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
@@ -157,18 +178,18 @@ function deluser(params)
 	if not _M.user_exists(params) then
 		return false, "no-such-user";
 	end
-	params.password = nil;
+	local user, host = nodeprep(params.user), nameprep(params.host);
 	
-	return _M.adduser(params);
+	return usermanager.delete_user(user, host);
 end
 
 function getpid()
-	local pidfile = config.get("*", "core", "pidfile");
+	local pidfile = config.get("*", "pidfile");
 	if not pidfile then
 		return false, "no-pidfile";
 	end
 	
-	local modules_enabled = set.new(config.get("*", "core", "modules_enabled"));
+	local modules_enabled = set.new(config.get("*", "modules_enabled"));
 	if not modules_enabled:contains("posix") then
 		return false, "no-posix";
 	end
@@ -254,3 +275,5 @@ function reload()
 	signal.kill(pid, signal.SIGHUP);
 	return true;
 end
+
+return _M;