X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosodyctl;h=4d3c47908e864f60ed7bba4e0456d5cf994f48fb;hb=142cd12eac0f4b470a497f922fc65b3ead202e5a;hp=4511ec2c5ae14ffd91e243a0c4a42b15b6bcb9de;hpb=482138f5dc1ace179015b8df380fb73c59899f91;p=prosody.git

diff --git a/prosodyctl b/prosodyctl
index 4511ec2c..4d3c4790 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -50,6 +50,7 @@ local prosody = {
 	platform = "posix";
 	lock_globals = function () end;
 	unlock_globals = function () end;
+	installed = CFG_SOURCEDIR ~= nil;
 };
 _G.prosody = prosody;
 
@@ -119,6 +120,11 @@ end
 prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
 	          plugins = CFG_PLUGINDIR or "plugins", data = data_path };
 
+if prosody.installed then
+	-- Change working directory to data path.
+	require "lfs".chdir(data_path);
+end
+
 require "core.loggingmanager"
 
 dependencies.log_warnings();
@@ -155,10 +161,12 @@ if ok and pposix then
 	
 	-- Set our umask to protect data files
 	pposix.umask(config.get("*", "core", "umask") or "027");
+	pposix.setenv("HOME", data_path);
 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))
+	os.exit(1);
 end
 
 local function test_writeable(filename)
@@ -205,6 +213,7 @@ local error_messages = setmetatable({
 		["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";
+		["no-such-host"] = "The given hostname does not exist in the config";
 		["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-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info";
@@ -218,6 +227,7 @@ local function make_host(hostname)
 	return {
 		type = "local",
 		events = prosody.events,
+		modules = {},
 		users = require "core.usermanager".new_null_provider(hostname)
 	};
 end
@@ -226,12 +236,27 @@ for hostname, config in pairs(config.getconfig()) do
 	hosts[hostname] = make_host(hostname);
 end
 	
-require "core.modulemanager"
+local modulemanager = require "core.modulemanager"
 
-require "util.prosodyctl"
+local prosodyctl = require "util.prosodyctl"
 require "socket"
 -----------------------
 
+ -- FIXME: Duplicate code waiting for util.startup
+function read_version()
+	-- Try to determine version
+	local version_file = io.open((CFG_SOURCEDIR or ".").."/prosody.version");
+	if version_file then
+		prosody.version = version_file:read("*a"):gsub("%s*$", "");
+		version_file:close();
+		if #prosody.version == 12 and prosody.version:match("^[a-f0-9]+$") then
+			prosody.version = "hg:"..prosody.version;
+		end
+	else
+		prosody.version = "unknown";
+	end
+end
+
 local show_message, show_warning = prosodyctl.show_message, prosodyctl.show_warning;
 local show_usage = prosodyctl.show_usage;
 local getchar, getpass = prosodyctl.getchar, prosodyctl.getpass;
@@ -350,7 +375,7 @@ function commands.deluser(arg)
 		return 1;
 	end
 	
-	local ok, msg = prosodyctl.passwd { user = user, host = host };
+	local ok, msg = prosodyctl.deluser { user = user, host = host };
 	
 	if ok then return 0; end
 	
@@ -487,12 +512,13 @@ function commands.restart(arg)
 end
 
 function commands.about(arg)
+	read_version();
 	if arg[1] == "--help" then
 		show_usage([[about]], [[Show information about this Prosody installation]]);
 		return 1;
 	end
 	
-	require "util.array";
+	local array = require "util.array";
 	local keys = require "util.iterators".keys;
 	
 	print("Prosody "..(prosody.version or "(unknown version)"));
@@ -639,6 +665,9 @@ function cert_commands.config(arg)
 			end
 			nv = show_prompt(("%s (%s):"):format(k, nv or v));
 			nv = (not nv or nv == "") and v or nv;
+			if nv:find"[\192-\252][\128-\191]+" then
+				conf.req.string_mask = "utf8only"
+			end
 			conf.distinguished_name[k] = nv ~= "." and nv or nil;
 		end
 		local conf_file = io.open(conf_filename, "w");
@@ -648,7 +677,7 @@ function cert_commands.config(arg)
 		show_message("Config written to " .. conf_filename);
 		return nil, conf_filename;
 	else
-		show_usage("cert config HOSTNAME", "generates config for OpenSSL")
+		show_usage("cert config HOSTNAME [HOSTNAME+]", "Builds a certificate config file covering the supplied hostname(s)")
 	end
 end
 
@@ -658,16 +687,19 @@ function cert_commands.key(arg)
 		if ask_overwrite(key_filename) then
 			return nil, key_filename;
 		end
-		os.remove(key_filename); -- We chmod this file to not have write permissions
+		os.remove(key_filename); -- This file, if it exists is unlikely to have write permissions
 		local key_size = tonumber(arg[2] or show_prompt("Choose key size (2048):") or 2048);
+		local old_umask = pposix.umask("0377");
 		if openssl.genrsa{out=key_filename, key_size} then
 			os.execute(("chmod 400 '%s'"):format(key_filename));
 			show_message("Key written to ".. key_filename);
+			pposix.umask(old_umask);
 			return nil, key_filename;
 		end
 		show_message("There was a problem, see OpenSSL output");
 	else
-		show_usage("cert key HOSTNAME <bits>", "Generates a RSA key")
+		show_usage("cert key HOSTNAME <bits>", "Generates a RSA key named HOSTNAME.key\n "
+		.."Prompts for a key size if none given")
 	end
 end
 
@@ -678,14 +710,14 @@ function cert_commands.request(arg)
 			return nil, req_filename;
 		end
 		local _, key_filename = cert_commands.key({arg[1]});
-		local _, conf_filename = cert_commands.config({arg[1]});
+		local _, conf_filename = cert_commands.config(arg);
 		if openssl.req{new=true, key=key_filename, utf8=true, config=conf_filename, out=req_filename} then
 			show_message("Certificate request written to ".. req_filename);
 		else
 			show_message("There was a problem, see OpenSSL output");
 		end
 	else
-		show_usage("cert request HOSTNAME", "Generates a certificate request")
+		show_usage("cert request HOSTNAME [HOSTNAME+]", "Generates a certificate request for the supplied hostname(s)")
 	end
 end
 
@@ -693,10 +725,10 @@ function cert_commands.generate(arg)
 	if #arg >= 1 and arg[1] ~= "--help" then
 		local cert_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".cert";
 		if ask_overwrite(cert_filename) then
-			return nil, conf_filename;
+			return nil, cert_filename;
 		end
 		local _, key_filename = cert_commands.key({arg[1]});
-		local _, conf_filename = cert_commands.config({arg[1]});
+		local _, conf_filename = cert_commands.config(arg);
 		local ret;
 		if key_filename and conf_filename and cert_filename
 			and openssl.req{new=true, x509=true, nodes=true, key=key_filename,
@@ -706,7 +738,7 @@ function cert_commands.generate(arg)
 			show_message("There was a problem, see OpenSSL output");
 		end
 	else
-		show_usage("cert generate HOSTNAME", "Generates a self-signed certificate")
+		show_usage("cert generate HOSTNAME [HOSTNAME+]", "Generates a self-signed certificate for the current hostname(s)")
 	end
 end
 
@@ -714,10 +746,18 @@ function commands.cert(arg)
 	if #arg >= 1 and arg[1] ~= "--help" then
 		local subcmd = table.remove(arg, 1);
 		if type(cert_commands[subcmd]) == "function" then
+			if not arg[1] then
+				show_message"You need to supply at least one hostname"
+				arg = { "--help" };
+			end
+			if arg[1] ~= "--help" and not hosts[arg[1]] then
+				show_message(error_messages["no-such-host"]);
+				return
+			end
 			return cert_commands[subcmd](arg);
 		end
 	end
-	show_usage("cert config|request|generate|key", "Helpers for X.509 certificates.")
+	show_usage("cert config|request|generate|key", "Helpers for generating X.509 certificates and keys.")
 end
 
 ---------------------