Software `/` code `/` prosody

Annotate

prosodyctl @ 10159:2eabac18e3dc

prosodyctl: Removed the admin_add and admin_remove from the commands_order variable

author	João Duarte <jvsDuarte08@gmail.com>
date	Wed, 24 Jul 2019 04:53:02 -0700
parent	10157:c6e166272d94
child	10160:320ae3831b34

rev	line source
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 #!/usr/bin/env lua
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1501 diff changeset	2 -- Prosody IM
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	3 -- Copyright (C) 2008-2010 Matthew Wild
a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	4 -- Copyright (C) 2008-2010 Waqas Hussain
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	5 --
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	6 -- This project is MIT/X11 licensed. Please see the
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 -- COPYING file in the source package for more information.
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	8 --
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	9
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	10 -- prosodyctl - command-line controller for Prosody XMPP server
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	11
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 -- Will be modified by configure script if run --
7297 b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	13 CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	14 CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	15 CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	16 CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	17
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	18 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	19
3999 58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	20 local function is_relative(path)
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	21 local path_sep = package.config:sub(1,1);
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	22 return ((path_sep == "/" and path:sub(1,1) ~= "/")
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	23 or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	24 end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	25
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	26 -- Tell Lua where to find our libraries
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	27 if CFG_SOURCEDIR then
3999 58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	28 local function filter_relative_paths(path)
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	29 if is_relative(path) then return ""; end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	30 end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	31 local function sanitise_paths(paths)
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	32 return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	33 end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	34 package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	35 package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	36 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	37
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	38 -- Substitute ~ with path to home directory in data path
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	39 if CFG_DATADIR then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 if os.getenv("HOME") then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	41 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	43 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	44
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	45 -----------
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	46
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	47 local startup = require "util.startup";
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	48 startup.prosodyctl();
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	49
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	50 -----------
3339 7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	51
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	52 local error_messages = setmetatable({
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	53 ["invalid-username"] = "The given username is invalid in a Jabber ID";
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 ["invalid-hostname"] = "The given hostname is invalid";
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	55 ["no-password"] = "No password was supplied";
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	56 ["no-such-user"] = "The given user does not exist on the server";
4827 fefbfd76d2d3 prosodyctl: Show an error if the user doesn't supply a hostname to the certificate commands Kim Alvefur <zash@zash.se> parents: 4826 diff changeset	57 ["no-such-host"] = "The given hostname does not exist in the config";
1124 055cfdc96afa prosodyctl: Add message for unable-to-save-data error Matthew Wild <mwild1@gmail.com> parents: 1122 diff changeset	58 ["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?";
7359 a5a080c12c96 Update every link to the documentation to use HTTPS Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7313 diff changeset	59 ["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see https://prosody.im/doc/prosodyctl#pidfile for help";
a5a080c12c96 Update every link to the documentation to use HTTPS Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7313 diff changeset	60 ["invalid-pidfile"] = "The 'pidfile' option in the configuration file is not a string, see https://prosody.im/doc/prosodyctl#pidfile for help";
a5a080c12c96 Update every link to the documentation to use HTTPS Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7313 diff changeset	61 ["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see https://prosody.im/doc/prosodyctl for more info";
1390 ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	62 ["no-such-method"] = "This module has no commands";
1460 5882ed6219ff prosodyctl: Add message for not-running error Matthew Wild <mwild1@gmail.com> parents: 1459 diff changeset	63 ["not-running"] = "Prosody is not running";
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	64 }, { __index = function (_,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end });
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	65
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	66 local configmanager = require "core.configmanager";
5023 dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 4881 diff changeset	67 local modulemanager = require "core.modulemanager"
dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 4881 diff changeset	68 local prosodyctl = require "util.prosodyctl"
6784 4da860edc27c prosodyctl: Import LuaSocket to a local, don't assume that a global will be set Kim Alvefur <zash@zash.se> parents: 6751 diff changeset	69 local socket = require "socket"
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	70 local dependencies = require "util.dependencies";
8198 db82ce3decee prosody, prosodyctl: Set up TLS settings for HTTPS requests in net.http (part of fix for #659) Kim Alvefur <zash@zash.se> parents: 8190 diff changeset	71
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 -----------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	73
4142 caa78589598f prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	74 local show_message, show_warning = prosodyctl.show_message, prosodyctl.show_warning;
caa78589598f prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	75 local show_usage = prosodyctl.show_usage;
caa78589598f prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	76 local show_yesno = prosodyctl.show_yesno;
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	77 local show_prompt = prosodyctl.show_prompt;
4142 caa78589598f prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	78 local read_password = prosodyctl.read_password;
10153 a88fd34246bd prosodyctl: The install command now prints output regarding module configuration João Duarte <jvsDuarte08@gmail.com> parents: 10151 diff changeset	79 local show_module_configuration_help = prosodyctl.show_module_configuration_help;
1459 545208bc0e84 prosodyctl: Use prosodyctl_timeout option if it exists in the config Matthew Wild <mwild1@gmail.com> parents: 1458 diff changeset	80
6324 c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	81 local jid_split = require "util.jid".prepped_split;
c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	82
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	83 local prosodyctl_timeout = (configmanager.get("", "prosodyctl_timeout") or 5) 2;
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	84 -----------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	85 local commands = {};
9780 c7727c13260f prosodyctl: Pass the original argv table to subcommands (with first argument removed) Kim Alvefur <zash@zash.se> parents: 9709 diff changeset	86 local command = table.remove(arg, 1);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	87
10140 cf0ae6eb74e6 prosodyctl: Added the 'remove' command João Duarte <jvsDuarte08@gmail.com> parents: 10139 diff changeset	88 -- Command to remove a rockspec
cf0ae6eb74e6 prosodyctl: Added the 'remove' command João Duarte <jvsDuarte08@gmail.com> parents: 10139 diff changeset	89 -- Receives as an argument the name of the plugin to be removed from the plugins folder
cf0ae6eb74e6 prosodyctl: Added the 'remove' command João Duarte <jvsDuarte08@gmail.com> parents: 10139 diff changeset	90 function commands.remove(arg)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	91 if arg[1] == "--help" then
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	92 show_usage([[make]], [[Removes a module installed in the wroking directory's plugins folder]]);
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	93 return 1;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	94 end
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	95 local flag = "--tree="
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	96 -- I'm considering the flag is the first, but there can be many flags
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	97 if arg[1] and arg[1]:sub(1, #flag) == flag then
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	98 local dir = arg[1]:match("=(.+)$")
10149 0a24d886734a prosodyctl: Corrected output printed by the remove command João Duarte <jvsDuarte08@gmail.com> parents: 10147 diff changeset	99 print("Removing module "..arg[2].." at "..dir)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	100 -- These extra double brackets allow us to correctly process names with spaces
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	101 os.execute("luarocks remove --tree='"..dir.."' "..arg[2])
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	102 return 0;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	103 else
10149 0a24d886734a prosodyctl: Corrected output printed by the remove command João Duarte <jvsDuarte08@gmail.com> parents: 10147 diff changeset	104 print("Removing "..arg[1].." from "..prosody.paths.plugins)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	105 os.execute("luarocks --tree='"..prosody.paths.plugins.."' remove "..arg[1])
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	106 print("Done!")
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	107 return 0;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	108 end
10140 cf0ae6eb74e6 prosodyctl: Added the 'remove' command João Duarte <jvsDuarte08@gmail.com> parents: 10139 diff changeset	109 end
cf0ae6eb74e6 prosodyctl: Added the 'remove' command João Duarte <jvsDuarte08@gmail.com> parents: 10139 diff changeset	110
10141 cf70deac27f6 prosodyctl: Added the 'install' command João Duarte <jvsDuarte08@gmail.com> parents: 10140 diff changeset	111 function commands.install(arg)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	112 if arg[1] == "--help" then
10150 baded8cd7da3 prosodyctl: Corrected the outputs from the install command João Duarte <jvsDuarte08@gmail.com> parents: 10149 diff changeset	113 show_usage([[make]], [[Installs a prosody/luarocks plugin]]);
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	114 return 1;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	115 end
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	116 -- Need to think about the case with many flags
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	117 local flag = "--tree="
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	118 -- I'm considering the flag is the first, but there can be many flags
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	119 if arg[1] and arg[1]:sub(1, #flag) == flag then
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	120 local dir = arg[1]:match("=(.+)$")
10150 baded8cd7da3 prosodyctl: Corrected the outputs from the install command João Duarte <jvsDuarte08@gmail.com> parents: 10149 diff changeset	121 print("Installing module "..arg[2].." at "..dir)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	122 -- These extra double brackets allow us to correctly process names with spaces
10151 e58034955002 prosodyctl: The install command is now also checking a specified remote server João Duarte <jvsDuarte08@gmail.com> parents: 10150 diff changeset	123 os.execute("luarocks --tree='"..dir.."' --server='http://localhost/' install "..arg[2])
10153 a88fd34246bd prosodyctl: The install command now prints output regarding module configuration João Duarte <jvsDuarte08@gmail.com> parents: 10151 diff changeset	124 show_module_configuration_help(arg[2]);
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	125 return 0;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	126 else
10150 baded8cd7da3 prosodyctl: Corrected the outputs from the install command João Duarte <jvsDuarte08@gmail.com> parents: 10149 diff changeset	127 print("Installing module "..arg[1].." at "..prosody.paths.plugins)
10151 e58034955002 prosodyctl: The install command is now also checking a specified remote server João Duarte <jvsDuarte08@gmail.com> parents: 10150 diff changeset	128 -- I've build a local server to upload some new rockspecs, like mod_smacks'. We can replace this server by one from
e58034955002 prosodyctl: The install command is now also checking a specified remote server João Duarte <jvsDuarte08@gmail.com> parents: 10150 diff changeset	129 -- prosody's, where we can oficially disbrute rocks/rockspecs for all modules
e58034955002 prosodyctl: The install command is now also checking a specified remote server João Duarte <jvsDuarte08@gmail.com> parents: 10150 diff changeset	130 os.execute("luarocks --tree='"..prosody.paths.plugins.."' --server='http://localhost/' install "..arg[1])
10153 a88fd34246bd prosodyctl: The install command now prints output regarding module configuration João Duarte <jvsDuarte08@gmail.com> parents: 10151 diff changeset	131 show_module_configuration_help(arg[1]);
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	132 return 0;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	133 end
10141 cf70deac27f6 prosodyctl: Added the 'install' command João Duarte <jvsDuarte08@gmail.com> parents: 10140 diff changeset	134 end
cf70deac27f6 prosodyctl: Added the 'install' command João Duarte <jvsDuarte08@gmail.com> parents: 10140 diff changeset	135
10126 ad640c2e072e prosodyctl: Implemented the 'list' command, which is a bridge to 'luarocks list' João Duarte <jvsDuarte08@gmail.com> parents: 10125 diff changeset	136 function commands.list(arg)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	137 if arg[1] == "--help" then
10135 3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	138 show_usage([[list]], [[Shows installed rocks]]);
3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	139 return 1;
3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	140 end
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	141 -- Need to think about the case with many flags
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	142 local flag = "--tree="
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	143 -- I'm considering the flag is the first, but there can be many flags
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	144 if arg[1] and arg[1]:sub(1, #flag) == flag then
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	145 local dir = arg[1]:match("=(.+)$")
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	146 -- These extra double brackets allow us to correctly process names with spaces
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	147 os.execute("luarocks list --tree='"..dir.."'")
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	148 return 0;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	149 else
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	150 os.execute("luarocks list --tree="..prosody.paths.plugins)
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	151 return 0;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	152 end
10126 ad640c2e072e prosodyctl: Implemented the 'list' command, which is a bridge to 'luarocks list' João Duarte <jvsDuarte08@gmail.com> parents: 10125 diff changeset	153 end
ad640c2e072e prosodyctl: Implemented the 'list' command, which is a bridge to 'luarocks list' João Duarte <jvsDuarte08@gmail.com> parents: 10125 diff changeset	154
10135 3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	155 function commands.enabled_plugins(arg)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	156 if arg[1] == "--help" then
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	157 show_usage([[enabled_plugins]], [[Shows plugins currently enabled on prosody]]);
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	158 return 1;
10135 3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	159 end
10125 58fe5cff5ca2 prosodyctl: Renamed the command function 'test' to 'enabled_plugins', which now only shows the plugins, in a list João Duarte <jvsDuarte08@gmail.com> parents: 10124 diff changeset	160 for module in modulemanager.get_modules_for_host() do
10146 903db0fcb716 prosodyctl: Removed trailing whitespaces João Duarte <jvsDuarte08@gmail.com> parents: 10145 diff changeset	161 show_warning("%s", module)
10125 58fe5cff5ca2 prosodyctl: Renamed the command function 'test' to 'enabled_plugins', which now only shows the plugins, in a list João Duarte <jvsDuarte08@gmail.com> parents: 10124 diff changeset	162 end
10122 95814c597836 prosodyctl: Created a custom function, 'test', that prints back a welcoming message João Duarte <jvsDuarte08@gmail.com> parents: 9992 diff changeset	163 end
95814c597836 prosodyctl: Created a custom function, 'test', that prints back a welcoming message João Duarte <jvsDuarte08@gmail.com> parents: 9992 diff changeset	164
10135 3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	165 function commands.local_plugins(arg)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	166 if arg[1] == "--help" then
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	167 show_usage([[local_plugins]], [[Shows plugins currently available for prosody, locally]]);
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	168 return 1;
10135 3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	169 end
10124 5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	170 local directory = "./plugins"
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	171 local i, t, popen = 0, {}, io.popen
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	172 local pfile = popen('ls -a "'..directory..'"')
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	173 for filename in pfile:lines() do
10124 5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	174 if filename == "." or filename == ".." then
5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	175 i = i + 1
5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	176 else
5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	177 i = i + 1
5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	178 t[i] = filename
5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	179 show_warning("%s", t[i])
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	180 end
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	181 end
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	182 pfile:close()
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	183 return 0;
10124 5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	184 end
5a3611218709 prosodyctl: Added the 'local_plugins' command function, which prints back a list of locally available plugins João Duarte <jvsDuarte08@gmail.com> parents: 10123 diff changeset	185
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	186 function commands.adduser(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	187 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	188 show_usage([[adduser JID]], [[Create the specified user account in Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	189 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	190 end
6324 c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	191 local user, host = jid_split(arg[1]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	192 if not user and host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	193 show_message [[Failed to understand JID, please supply the JID you want to create]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	194 show_usage [[adduser user@host]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	195 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	196 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	197
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	198 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	199 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	200 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	202
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	203 if not prosody.hosts[host] then
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	204 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	205 show_warning("The user will not be able to log in until this is changed.");
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	206 prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	207 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	208
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	209 if prosodyctl.user_exists{ user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	210 show_message [[That user already exists]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	211 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	212 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	213
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	214 local password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	215 if not password then return 1; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	216
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	217 local ok, msg = prosodyctl.adduser { user = user, host = host, password = password };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	218
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	219 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	220
3777 5ecbcef42ffb mod_admin_adhoc: Support for reloading multiple modules Florian Zeitz <florob@babelmonkeys.de> parents: 3773 diff changeset	221 show_message(msg)
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	222 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	223 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	224
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	225 function commands.passwd(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	226 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	227 show_usage([[passwd JID]], [[Set the password for the specified user account in Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	228 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	229 end
5610 f73d5fb4ea13 prosodyctl: Use jid.split() to parse parameter to adduser/deluser/passwd Matthew Wild <mwild1@gmail.com> parents: 5592 diff changeset	230 local user, host = jid_split(arg[1]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	231 if not user and host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	232 show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	233 show_usage [[passwd user@host]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	234 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	236
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	237 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	238 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	239 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	240 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	241
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	242 if not prosody.hosts[host] then
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	243 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	244 show_warning("The user will not be able to log in until this is changed.");
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	245 prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	246 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	247
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	248 if not prosodyctl.user_exists { user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	249 show_message [[That user does not exist, use prosodyctl adduser to create a new user]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	250 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	251 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	252
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	253 local password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	254 if not password then return 1; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	255
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	256 local ok, msg = prosodyctl.passwd { user = user, host = host, password = password };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	257
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	258 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	259
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	260 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	261 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	262 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	263
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	264 function commands.deluser(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	265 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	266 show_usage([[deluser JID]], [[Permanently remove the specified user account from Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	267 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	268 end
6324 c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	269 local user, host = jid_split(arg[1]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	270 if not user and host then
7676 7311dc843718 prosodyctl: Fix copy/paste error in help text for deluser command Matthew Wild <mwild1@gmail.com> parents: 6498 diff changeset	271 show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]]
7311dc843718 prosodyctl: Fix copy/paste error in help text for deluser command Matthew Wild <mwild1@gmail.com> parents: 6498 diff changeset	272 show_usage [[deluser user@host]]
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	273 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	274 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	275
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	276 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	277 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	278 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	279 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	280
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	281 if not prosody.hosts[host] then
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	282 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	283 prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	284 end
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	285
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	286 if not prosodyctl.user_exists { user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	287 show_message [[That user does not exist on this server]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	288 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	289 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	290
5101 a94c43cad081 prosodyctl: Use util.prosodyctl.deluser Kim Alvefur <zash@zash.se> parents: 5024 diff changeset	291 local ok, msg = prosodyctl.deluser { user = user, host = host };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	292
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	293 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	294
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	295 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	296 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	297 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	298
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	299 function commands.start(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	300 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	301 show_usage([[start]], [[Start Prosody]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	302 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	303 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	304 local ok, ret = prosodyctl.isrunning();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	305 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	306 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	307 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	308 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	309
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	310 if ret then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	311 --luacheck: ignore 421/ret
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	312 local ok, ret = prosodyctl.getpid();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	313 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	314 show_message("Couldn't get running Prosody's PID");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	315 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	316 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	317 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	318 show_message("Prosody is already running with PID %s", ret or "(unknown)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	319 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	320 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	321
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	322 --luacheck: ignore 411/ret
9782 d844e197eedf prosodyctl: Use the same runtime for starting prosody Kim Alvefur <zash@zash.se> parents: 9780 diff changeset	323 local ok, ret = prosodyctl.start(prosody.paths.source, arg[-1]);
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	324 if ok then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	325 local daemonize = configmanager.get("*", "daemonize");
6062 6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	326 if daemonize == nil then
6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	327 daemonize = prosody.installed;
6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	328 end
6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	329 if daemonize then
2511 a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	330 local i=1;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	331 while true do
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	332 local ok, running = prosodyctl.isrunning();
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	333 if ok and running then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	334 break;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	335 elseif i == 5 then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	336 show_message("Still waiting...");
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	337 elseif i >= prosodyctl_timeout then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	338 show_message("Prosody is still not running. Please give it some time or check your log files for errors.");
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	339 return 2;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	340 end
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	341 socket.sleep(0.5);
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	342 i = i + 1;
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	343 end
2511 a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	344 show_message("Started");
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	345 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	346 return 0;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	347 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	348
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	349 show_message("Failed to start Prosody");
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	350 show_message(error_messages[ret])
2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	351 return 1;
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	352 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	353
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	354 function commands.status(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	355 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	356 show_usage([[status]], [[Reports the running status of Prosody]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	357 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	358 end
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	359
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	360 local ok, ret = prosodyctl.isrunning();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	361 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	362 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	363 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	364 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	365
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	366 if ret then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	367 --luacheck: ignore 421/ret
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	368 local ok, ret = prosodyctl.getpid();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	369 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	370 show_message("Couldn't get running Prosody's PID");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	371 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	372 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	373 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	374 show_message("Prosody is running with PID %s", ret or "(unknown)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	375 return 0;
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	376 else
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	377 show_message("Prosody is not running");
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	378 if not prosody.switched_user and prosody.current_uid ~= 0 then
1122 07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	379 print("\nNote:")
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	380 print(" You will also see this if prosodyctl is not running under");
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	381 print(" the same user account as Prosody. Try running as root (e.g. ");
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	382 print(" with 'sudo' in front) to gain access to Prosody's real status.");
1115 8a7bc1a5eae6 prosodyctl: status: Show warning if we can't find a running Prosody, and we didn't switch user Matthew Wild <mwild1@gmail.com> parents: 1114 diff changeset	383 end
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	384 return 2
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	385 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	386 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	387
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	388 function commands.stop(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	389 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	390 show_usage([[stop]], [[Stop a running Prosody server]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	391 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	392 end
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	393
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	394 if not prosodyctl.isrunning() then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	395 show_message("Prosody is not running");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	396 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	397 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	398
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	399 local ok, ret = prosodyctl.stop();
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	400 if ok then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	401 local i=1;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	402 while true do
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	403 local ok, running = prosodyctl.isrunning();
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	404 if ok and not running then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	405 break;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	406 elseif i == 5 then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	407 show_message("Still waiting...");
1459 545208bc0e84 prosodyctl: Use prosodyctl_timeout option if it exists in the config Matthew Wild <mwild1@gmail.com> parents: 1458 diff changeset	408 elseif i >= prosodyctl_timeout then
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	409 show_message("Prosody is still running. Please give it some time or check your log files for errors.");
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	410 return 2;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	411 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	412 socket.sleep(0.5);
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	413 i = i + 1;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	414 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	415 show_message("Stopped");
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	416 return 0;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	417 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	418
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	419 show_message(error_messages[ret]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	420 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	421 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	422
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	423 function commands.restart(arg)
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	424 if arg[1] == "--help" then
2705 8a5af6f14c07 prosodyctl: Fix 'restart' command to not report itself as the 'stop' command (thanks albert!) Matthew Wild <mwild1@gmail.com> parents: 2696 diff changeset	425 show_usage([[restart]], [[Restart a running Prosody server]]);
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	426 return 1;
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	427 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	428
3724 c12ebbd4ab61 prosodyctl: Make the 'restart' command start Prosody even if it wasn't already running Matthew Wild <mwild1@gmail.com> parents: 3630 diff changeset	429 commands.stop(arg);
c12ebbd4ab61 prosodyctl: Make the 'restart' command start Prosody even if it wasn't already running Matthew Wild <mwild1@gmail.com> parents: 3630 diff changeset	430 return commands.start(arg);
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	431 end
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	432
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	433 function commands.about(arg)
4331 9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	434 if arg[1] == "--help" then
9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	435 show_usage([[about]], [[Show information about this Prosody installation]]);
9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	436 return 1;
9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	437 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	438
6584 c3a56f8847ac prosodyctl: Show relative paths in about Kim Alvefur <zash@zash.se> parents: 6501 diff changeset	439 local pwd = ".";
5023 dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 4881 diff changeset	440 local array = require "util.array";
4815 04e6115e060b prosodyctl: Fix import of util.iterators Kim Alvefur <zash@zash.se> parents: 4487 diff changeset	441 local keys = require "util.iterators".keys;
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	442 local hg = require"util.mercurial";
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	443 local relpath = configmanager.resolve_relative_path;
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	444
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	445 print("Prosody "..(prosody.version or "(unknown version)"));
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	446 print("");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	447 print("# Prosody directories");
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	448 print("Data directory: "..relpath(pwd, prosody.paths.data));
47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	449 print("Config directory: "..relpath(pwd, prosody.paths.config or "."));
47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	450 print("Source directory: "..relpath(pwd, prosody.paths.source or "."));
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	451 print("Plugin directories:")
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	452 print(" "..(prosody.paths.plugins:gsub("([^;]+);?", function(path)
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	453 path = configmanager.resolve_relative_path(pwd, path);
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	454 local hgid, hgrepo = hg.check_id(path);
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	455 if not hgid and hgrepo then
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	456 return path.." - "..hgrepo .."!\n ";
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	457 end
6611 65dd3770bcb0 prosodyctl: Document magic commit ID Paul Aurich <paul@darkrain42.org> parents: 6587 diff changeset	458 -- 010452cfaf53 is the first commit in the prosody-modules repository
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	459 hgrepo = hgrepo == "010452cfaf53" and "prosody-modules";
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	460 return path..(hgid and " - "..(hgrepo or "HG").." rev: "..hgid or "")
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	461 .."\n ";
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	462 end)));
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	463 print("");
9826 bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	464 local have_pposix, pposix = pcall(require, "util.pposix");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	465 if have_pposix and pposix.uname then
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	466 print("# Operating system");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	467 local uname, err = pposix.uname();
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	468 print(uname and uname.sysname .. " " .. uname.release or "Unknown POSIX", err or "");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	469 print("");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	470 end
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	471 print("# Lua environment");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	472 print("Lua version: ", _G._VERSION);
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	473 print("");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	474 print("Lua module search paths:");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	475 for path in package.path:gmatch("[^;]+") do
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	476 print(" "..path);
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	477 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	478 print("");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	479 print("Lua C module search paths:");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	480 for path in package.cpath:gmatch("[^;]+") do
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	481 print(" "..path);
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	482 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	483 print("");
8701 b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	484 local luarocks_status = "Not installed"
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	485 if pcall(require, "luarocks.loader") then
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	486 luarocks_status = "Installed (2.x+)";
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	487 if package.loaded["luarocks.cfg"] then
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	488 luarocks_status = "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")";
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	489 end
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	490 elseif pcall(require, "luarocks.require") then
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	491 luarocks_status = "Installed (1.x)";
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	492 end
4333 040193dead77 prosodyctl: Add info about the presence of LuaRocks to 'about' command Matthew Wild <mwild1@gmail.com> parents: 4331 diff changeset	493 print("LuaRocks: ", luarocks_status);
040193dead77 prosodyctl: Add info about the presence of LuaRocks to 'about' command Matthew Wild <mwild1@gmail.com> parents: 4331 diff changeset	494 print("");
9856 4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	495 print("# Network");
4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	496 print("");
4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	497 print("Backend: "..require "net.server".get_backend());
4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	498 print("");
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	499 print("# Lua module versions");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	500 local module_versions, longest_name = {}, 8;
6711 76683a3f3d75 prosodyctl: Soft-require LuaSec and LuaEvent so they show up in the module version listing Kim Alvefur <zash@zash.se> parents: 6637 diff changeset	501 local luaevent =dependencies.softreq"luaevent";
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	502 dependencies.softreq"ssl";
9991 8cd180dc18a8 prosodyctl: Include version of LuaDBI in 'about' Kim Alvefur <zash@zash.se> parents: 9856 diff changeset	503 dependencies.softreq"DBI";
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	504 for name, module in pairs(package.loaded) do
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	505 if type(module) == "table" and rawget(module, "_VERSION")
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	506 and name ~= "_G" and not name:match("%.") then
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	507 if #name > longest_name then
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	508 longest_name = #name;
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	509 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	510 module_versions[name] = module._VERSION;
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	511 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	512 end
7249 c49f69bb68f7 prosodyctl: Include libevent version in "about" output if luaevent is available Kim Alvefur <zash@zash.se> parents: 7213 diff changeset	513 if luaevent then
c49f69bb68f7 prosodyctl: Include libevent version in "about" output if luaevent is available Kim Alvefur <zash@zash.se> parents: 7213 diff changeset	514 module_versions["libevent"] = luaevent.core.libevent_version();
c49f69bb68f7 prosodyctl: Include libevent version in "about" output if luaevent is available Kim Alvefur <zash@zash.se> parents: 7213 diff changeset	515 end
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	516 local sorted_keys = array.collect(keys(module_versions)):sort();
7250 6ffc9247417a prosodyctl: Use already sorted array of module names [luacheck] Kim Alvefur <zash@zash.se> parents: 7249 diff changeset	517 for _, name in ipairs(sorted_keys) do
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	518 print(name..":"..string.rep(" ", longest_name-#name), module_versions[name]);
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	519 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	520 print("");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	521 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	522
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	523 function commands.reload(arg)
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	524 if arg[1] == "--help" then
4476 53ce21286b8c prosodyctl: Adjust description of 'reload' command (thanks crocket) Matthew Wild <mwild1@gmail.com> parents: 4336 diff changeset	525 show_usage([[reload]], [[Reload Prosody's configuration and re-open log files]]);
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	526 return 1;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	527 end
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	528
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	529 if not prosodyctl.isrunning() then
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	530 show_message("Prosody is not running");
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	531 return 1;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	532 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	533
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	534 local ok, ret = prosodyctl.reload();
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	535 if ok then
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	536
4336 abcbcb15205c prosodyctl: Update message on reload success Matthew Wild <mwild1@gmail.com> parents: 4335 diff changeset	537 show_message("Prosody log files re-opened and config file reloaded. You may need to reload modules for some changes to take effect.");
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	538 return 0;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	539 end
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	540
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	541 show_message(error_messages[ret]);
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	542 return 1;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	543 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	544 -- ejabberdctl compatibility
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	545
7920 1db51061342b prosodyctl: Handle move of 'unpack' in Lua 5.2 Kim Alvefur <zash@zash.se> parents: 7679 diff changeset	546 local unpack = table.unpack or unpack; -- luacheck: ignore 113
1db51061342b prosodyctl: Handle move of 'unpack' in Lua 5.2 Kim Alvefur <zash@zash.se> parents: 7679 diff changeset	547
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	548 function commands.register(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	549 local user, host, password = unpack(arg);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	550 if (not (user and host)) or arg[1] == "--help" then
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	551 if user ~= "--help" then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	552 if not user then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	553 show_message [[No username specified]]
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	554 elseif not host then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	555 show_message [[Please specify which host you want to register the user on]];
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	556 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	557 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	558 show_usage("register USER HOST [PASSWORD]", "Register a user on the server, with the given password");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	559 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	560 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	561 if not password then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	562 password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	563 if not password then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	564 show_message [[Unable to register user with no password]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	565 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	566 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	567 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	568
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	569 local ok, msg = prosodyctl.adduser { user = user, host = host, password = password };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	570
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	571 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	572
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	573 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	574 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	575 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	576
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	577 function commands.unregister(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	578 local user, host = unpack(arg);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	579 if (not (user and host)) or arg[1] == "--help" then
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	580 if user ~= "--help" then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	581 if not user then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	582 show_message [[No username specified]]
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	583 elseif not host then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	584 show_message [[Please specify which host you want to unregister the user from]];
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	585 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	586 end
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	587 show_usage("unregister USER HOST [PASSWORD]", "Permanently remove a user account from the server");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	588 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	589 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	590
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	591 local ok, msg = prosodyctl.deluser { user = user, host = host };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	592
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	593 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	594
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	595 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	596 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	597 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	598
5292 46fbb5f1ef0a prosodyctl: Load LFS and util.openssl when actually needed (fixes unhelpful warnings if no LuaSec installed) Kim Alvefur <zash@zash.se> parents: 5152 diff changeset	599 local openssl;
46fbb5f1ef0a prosodyctl: Load LFS and util.openssl when actually needed (fixes unhelpful warnings if no LuaSec installed) Kim Alvefur <zash@zash.se> parents: 5152 diff changeset	600 local lfs;
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	601
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	602 local cert_commands = {};
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	603
6837 13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	604 -- If a file already exists, ask if the user wants to use it or replace it
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	605 -- Backups the old file if replaced
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	606 local function use_existing(filename)
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	607 local attrs = lfs.attributes(filename);
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	608 if attrs then
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	609 if show_yesno(filename .. " exists, do you want to replace it? [y/n]") then
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	610 local backup = filename..".bkp~"..os.date("%FT%T", attrs.change);
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	611 os.rename(filename, backup);
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	612 show_message(filename.." backed up to "..backup);
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	613 else
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	614 -- Use the existing file
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	615 return true;
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	616 end
13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	617 end
4826 1c4852da78c8 prosodyctl: Replace hack with lfs for checking if a file exists Kim Alvefur <zash@zash.se> parents: 4824 diff changeset	618 end
1c4852da78c8 prosodyctl: Replace hack with lfs for checking if a file exists Kim Alvefur <zash@zash.se> parents: 4824 diff changeset	619
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	620 local have_pposix, pposix = pcall(require, "util.pposix");
47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	621 local cert_basedir = prosody.paths.data == "." and "./certs" or prosody.paths.data;
8100 1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	622 if have_pposix and pposix.getuid() == 0 then
1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	623 -- FIXME should be enough to check if this directory is writable
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	624 local cert_dir = configmanager.get("*", "certificates") or "certs";
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	625 cert_basedir = configmanager.resolve_relative_path(prosody.paths.config, cert_dir);
8100 1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	626 end
1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	627
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	628 function cert_commands.config(arg)
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	629 if #arg >= 1 and arg[1] ~= "--help" then
8100 1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	630 local conf_filename = cert_basedir .. "/" .. arg[1] .. ".cnf";
6837 13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	631 if use_existing(conf_filename) then
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	632 return nil, conf_filename;
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	633 end
7193 1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	634 local distinguished_name;
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	635 if arg[#arg]:find("^/") then
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	636 distinguished_name = table.remove(arg);
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	637 end
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	638 local conf = openssl.config.new();
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	639 conf:from_prosody(prosody.hosts, configmanager, arg);
7193 1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	640 if distinguished_name then
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	641 local dn = {};
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	642 for k, v in distinguished_name:gmatch("/([^=/]+)=([^/]+)") do
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	643 table.insert(dn, k);
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	644 dn[k] = v;
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	645 end
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	646 conf.distinguished_name = dn;
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	647 else
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	648 show_message("Please provide details to include in the certificate config file.");
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	649 show_message("Leave the field empty to use the default value or '.' to exclude the field.")
7483 8c5320a4bfaf prosodyctl: remove unused one-letter loop variable [luacheck] Anton Shestakov <av6@dwimlabs.net> parents: 7455 diff changeset	650 for _, k in ipairs(openssl._DN_order) do
7193 1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	651 local v = conf.distinguished_name[k];
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	652 if v then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	653 local nv = nil;
7193 1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	654 if k == "commonName" then
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	655 v = arg[1]
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	656 elseif k == "emailAddress" then
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	657 v = "xmpp@" .. arg[1];
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	658 elseif k == "countryName" then
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	659 local tld = arg[1]:match"%.([a-z]+)$";
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	660 if tld and #tld == 2 and tld ~= "uk" then
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	661 v = tld:upper();
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	662 end
5547 f306daf2bf6d prosodyctl: Guess the country from the TLD for the cert config Kim Alvefur <zash@zash.se> parents: 5546 diff changeset	663 end
7193 1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	664 nv = show_prompt(("%s (%s):"):format(k, nv or v));
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	665 nv = (not nv or nv == "") and v or nv;
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	666 if nv:find"[\192-\252][\128-\191]+" then
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	667 conf.req.string_mask = "utf8only"
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	668 end
1c0104a56321 prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349) Kim Alvefur <zash@zash.se> parents: 7190 diff changeset	669 conf.distinguished_name[k] = nv ~= "." and nv or nil;
5546 edc97af48d19 prosodyctl: Ask about the distinguished name in a in a consistent order Kim Alvefur <zash@zash.se> parents: 5545 diff changeset	670 end
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	671 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	672 end
6035 1b5ca55bf895 prosodyctl: Show real error if certificate config file can't be opened Kim Alvefur <zash@zash.se> parents: 5547 diff changeset	673 local conf_file, err = io.open(conf_filename, "w");
1b5ca55bf895 prosodyctl: Show real error if certificate config file can't be opened Kim Alvefur <zash@zash.se> parents: 5547 diff changeset	674 if not conf_file then
1b5ca55bf895 prosodyctl: Show real error if certificate config file can't be opened Kim Alvefur <zash@zash.se> parents: 5547 diff changeset	675 show_warning("Could not open OpenSSL config file for writing");
1b5ca55bf895 prosodyctl: Show real error if certificate config file can't be opened Kim Alvefur <zash@zash.se> parents: 5547 diff changeset	676 show_warning(err);
1b5ca55bf895 prosodyctl: Show real error if certificate config file can't be opened Kim Alvefur <zash@zash.se> parents: 5547 diff changeset	677 os.exit(1);
1b5ca55bf895 prosodyctl: Show real error if certificate config file can't be opened Kim Alvefur <zash@zash.se> parents: 5547 diff changeset	678 end
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	679 conf_file:write(conf:serialize());
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	680 conf_file:close();
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	681 print("");
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	682 show_message("Config written to " .. conf_filename);
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	683 return nil, conf_filename;
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	684 else
4872 b2059452fb55 prosodyctl: Improve help messages for cert commands Kim Alvefur <zash@zash.se> parents: 4827 diff changeset	685 show_usage("cert config HOSTNAME [HOSTNAME+]", "Builds a certificate config file covering the supplied hostname(s)")
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	686 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	687 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	688
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	689 function cert_commands.key(arg)
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	690 if #arg >= 1 and arg[1] ~= "--help" then
8100 1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	691 local key_filename = cert_basedir .. "/" .. arg[1] .. ".key";
6837 13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	692 if use_existing(key_filename) then
4826 1c4852da78c8 prosodyctl: Replace hack with lfs for checking if a file exists Kim Alvefur <zash@zash.se> parents: 4824 diff changeset	693 return nil, key_filename;
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	694 end
5151 dfe6a70efaa2 prosodyctl: Set stricter umask while generating key (thanks darkrain) Kim Alvefur <zash@zash.se> parents: 5150 diff changeset	695 os.remove(key_filename); -- This file, if it exists is unlikely to have write permissions
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	696 local key_size = tonumber(arg[2] or show_prompt("Choose key size (2048):") or 2048);
5151 dfe6a70efaa2 prosodyctl: Set stricter umask while generating key (thanks darkrain) Kim Alvefur <zash@zash.se> parents: 5150 diff changeset	697 local old_umask = pposix.umask("0377");
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	698 if openssl.genrsa{out=key_filename, key_size} then
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	699 os.execute(("chmod 400 '%s'"):format(key_filename));
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	700 show_message("Key written to ".. key_filename);
5151 dfe6a70efaa2 prosodyctl: Set stricter umask while generating key (thanks darkrain) Kim Alvefur <zash@zash.se> parents: 5150 diff changeset	701 pposix.umask(old_umask);
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	702 return nil, key_filename;
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	703 end
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	704 show_message("There was a problem, see OpenSSL output");
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	705 else
4872 b2059452fb55 prosodyctl: Improve help messages for cert commands Kim Alvefur <zash@zash.se> parents: 4827 diff changeset	706 show_usage("cert key HOSTNAME <bits>", "Generates a RSA key named HOSTNAME.key\n "
4935 bc62abceef07 prosodyctl: Fix typo Kim Alvefur <zash@zash.se> parents: 4881 diff changeset	707 .."Prompts for a key size if none given")
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	708 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	709 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	710
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	711 function cert_commands.request(arg)
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	712 if #arg >= 1 and arg[1] ~= "--help" then
8100 1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	713 local req_filename = cert_basedir .. "/" .. arg[1] .. ".req";
6837 13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	714 if use_existing(req_filename) then
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	715 return nil, req_filename;
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	716 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	717 local _, key_filename = cert_commands.key({arg[1]});
4872 b2059452fb55 prosodyctl: Improve help messages for cert commands Kim Alvefur <zash@zash.se> parents: 4827 diff changeset	718 local _, conf_filename = cert_commands.config(arg);
6405 61801dacc90b prosodyctl: Use sha256 for certificate requests and self-signed certificates Kim Alvefur <zash@zash.se> parents: 6367 diff changeset	719 if openssl.req{new=true, key=key_filename, utf8=true, sha256=true, config=conf_filename, out=req_filename} then
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	720 show_message("Certificate request written to ".. req_filename);
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	721 else
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	722 show_message("There was a problem, see OpenSSL output");
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	723 end
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	724 else
4872 b2059452fb55 prosodyctl: Improve help messages for cert commands Kim Alvefur <zash@zash.se> parents: 4827 diff changeset	725 show_usage("cert request HOSTNAME [HOSTNAME+]", "Generates a certificate request for the supplied hostname(s)")
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	726 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	727 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	728
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	729 function cert_commands.generate(arg)
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	730 if #arg >= 1 and arg[1] ~= "--help" then
8100 1773559b03a8 prosodyctl cert: If running as root, write certificate files to config directory (fixes #530) Kim Alvefur <zash@zash.se> parents: 8099 diff changeset	731 local cert_filename = cert_basedir .. "/" .. arg[1] .. ".crt";
6837 13b44929ae49 prosodyctl: Move files out of the way when generating new cert or key Kim Alvefur <zash@zash.se> parents: 6784 diff changeset	732 if use_existing(cert_filename) then
5152 fee5f8d4ec74 prosodyctl: Fix copypaste error Kim Alvefur <zash@zash.se> parents: 5151 diff changeset	733 return nil, cert_filename;
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	734 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	735 local _, key_filename = cert_commands.key({arg[1]});
4872 b2059452fb55 prosodyctl: Improve help messages for cert commands Kim Alvefur <zash@zash.se> parents: 4827 diff changeset	736 local _, conf_filename = cert_commands.config(arg);
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	737 if key_filename and conf_filename and cert_filename
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	738 and openssl.req{new=true, x509=true, nodes=true, key=key_filename,
6405 61801dacc90b prosodyctl: Use sha256 for certificate requests and self-signed certificates Kim Alvefur <zash@zash.se> parents: 6367 diff changeset	739 days=365, sha256=true, utf8=true, config=conf_filename, out=cert_filename} then
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	740 show_message("Certificate written to ".. cert_filename);
7065 4fc3c008976f prosodyctl: Show an example ssl config after generating a certificate Kim Alvefur <zash@zash.se> parents: 6960 diff changeset	741 print();
4824 73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	742 else
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	743 show_message("There was a problem, see OpenSSL output");
73e261ed00a9 prosodyctl: Use util.openssl in certificate helpers. Improve feedback Kim Alvefur <zash@zash.se> parents: 4815 diff changeset	744 end
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	745 else
4872 b2059452fb55 prosodyctl: Improve help messages for cert commands Kim Alvefur <zash@zash.se> parents: 4827 diff changeset	746 show_usage("cert generate HOSTNAME [HOSTNAME+]", "Generates a self-signed certificate for the current hostname(s)")
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	747 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	748 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	749
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	750 local function sh_esc(s)
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	751 return "'" .. s:gsub("'", "'\\''") .. "'";
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	752 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	753
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	754 local function copy(from, to, umask, owner, group)
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	755 local old_umask = umask and pposix.umask(umask);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	756 local attrs = lfs.attributes(to);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	757 if attrs then -- Move old file out of the way
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	758 local backup = to..".bkp~"..os.date("%FT%T", attrs.change);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	759 os.rename(to, backup);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	760 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	761 -- FIXME friendlier error handling, maybe move above backup back?
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	762 local input = assert(io.open(from));
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	763 local output = assert(io.open(to, "w"));
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	764 local data = input:read(2^11);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	765 while data and output:write(data) do
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	766 data = input:read(2^11);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	767 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	768 assert(input:close());
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	769 assert(output:close());
9544 cbd3b9d4c60b prosodyctl: Change ownership of certs to same as the cert base dir when running from a source checkout Kim Alvefur <zash@zash.se> parents: 9543 diff changeset	770 if not prosody.installed then
cbd3b9d4c60b prosodyctl: Change ownership of certs to same as the cert base dir when running from a source checkout Kim Alvefur <zash@zash.se> parents: 9543 diff changeset	771 -- FIXME this is possibly specific to GNU chown
cbd3b9d4c60b prosodyctl: Change ownership of certs to same as the cert base dir when running from a source checkout Kim Alvefur <zash@zash.se> parents: 9543 diff changeset	772 os.execute(("chown -c --reference=%s %s"):format(sh_esc(cert_basedir), sh_esc(to)));
cbd3b9d4c60b prosodyctl: Change ownership of certs to same as the cert base dir when running from a source checkout Kim Alvefur <zash@zash.se> parents: 9543 diff changeset	773 elseif owner and group then
8560 489998717387 prosodyctl: Use correct separator in chown call (fixes #1093) Kim Alvefur <zash@zash.se> parents: 8419 diff changeset	774 local ok = os.execute(("chown %s:%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to)));
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	775 assert(ok == true or ok == 0, "Failed to change ownership of "..to);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	776 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	777 if old_umask then pposix.umask(old_umask); end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	778 return true;
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	779 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	780
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	781 function cert_commands.import(arg)
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	782 local hostnames = {};
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	783 -- Move hostname arguments out of arg, the rest should be a list of paths
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	784 while arg[1] and prosody.hosts[ arg[1] ] do
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	785 table.insert(hostnames, table.remove(arg, 1));
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	786 end
8247 2c386ee5cd5c prosodyctl: Use all enabled hosts if no hostnames passed to cert import Kim Alvefur <zash@zash.se> parents: 8202 diff changeset	787 if hostnames[1] == nil then
8249 cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	788 local domains = os.getenv"RENEWED_DOMAINS"; -- Set if invoked via certbot
cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	789 if domains then
cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	790 for host in domains:gmatch("%S+") do
8247 2c386ee5cd5c prosodyctl: Use all enabled hosts if no hostnames passed to cert import Kim Alvefur <zash@zash.se> parents: 8202 diff changeset	791 table.insert(hostnames, host);
2c386ee5cd5c prosodyctl: Use all enabled hosts if no hostnames passed to cert import Kim Alvefur <zash@zash.se> parents: 8202 diff changeset	792 end
8249 cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	793 else
cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	794 for host in pairs(prosody.hosts) do
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	795 if host ~= "*" and configmanager.get(host, "enabled") ~= false then
8249 cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	796 table.insert(hostnames, host);
cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	797 end
cc664a3917e2 prosodyctl: cert import: Use env variable set by certbot if invoked as post-renew hook Kim Alvefur <zash@zash.se> parents: 8248 diff changeset	798 end
8247 2c386ee5cd5c prosodyctl: Use all enabled hosts if no hostnames passed to cert import Kim Alvefur <zash@zash.se> parents: 8202 diff changeset	799 end
2c386ee5cd5c prosodyctl: Use all enabled hosts if no hostnames passed to cert import Kim Alvefur <zash@zash.se> parents: 8202 diff changeset	800 end
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	801 if not arg[1] or arg[1] == "--help" then -- Probably forgot the path
8247 2c386ee5cd5c prosodyctl: Use all enabled hosts if no hostnames passed to cert import Kim Alvefur <zash@zash.se> parents: 8202 diff changeset	802 show_usage("cert import [HOSTNAME+] /path/to/certs [/other/paths/]+",
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	803 "Copies certificates to "..cert_basedir);
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	804 return 1;
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	805 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	806 local owner, group;
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	807 if pposix.getuid() == 0 then -- We need root to change ownership
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	808 owner = configmanager.get("*", "prosody_user") or "prosody";
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	809 group = configmanager.get("*", "prosody_group") or owner;
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	810 end
8274 3798955049e3 prosodyctl: cert import: Reuse function from certmanager for locating certificates and keys Kim Alvefur <zash@zash.se> parents: 8265 diff changeset	811 local cm = require "core.certmanager";
8117 66d8f6b3c3ef prosodyctl: Delay reporting of successful certificate imports until all done Kim Alvefur <zash@zash.se> parents: 8111 diff changeset	812 local imported = {};
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	813 for _, host in ipairs(hostnames) do
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	814 for _, dir in ipairs(arg) do
8274 3798955049e3 prosodyctl: cert import: Reuse function from certmanager for locating certificates and keys Kim Alvefur <zash@zash.se> parents: 8265 diff changeset	815 local paths = cm.find_cert(dir, host);
3798955049e3 prosodyctl: cert import: Reuse function from certmanager for locating certificates and keys Kim Alvefur <zash@zash.se> parents: 8265 diff changeset	816 if paths then
3798955049e3 prosodyctl: cert import: Reuse function from certmanager for locating certificates and keys Kim Alvefur <zash@zash.se> parents: 8265 diff changeset	817 copy(paths.certificate, cert_basedir .. "/" .. host .. ".crt", nil, owner, group);
3798955049e3 prosodyctl: cert import: Reuse function from certmanager for locating certificates and keys Kim Alvefur <zash@zash.se> parents: 8265 diff changeset	818 copy(paths.key, cert_basedir .. "/" .. host .. ".key", "0377", owner, group);
8117 66d8f6b3c3ef prosodyctl: Delay reporting of successful certificate imports until all done Kim Alvefur <zash@zash.se> parents: 8111 diff changeset	819 table.insert(imported, host);
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	820 else
8119 94a1fdaf12d1 prosodyctl: Make note about reporting where certificates are searched for Kim Alvefur <zash@zash.se> parents: 8118 diff changeset	821 -- TODO Say where we looked
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	822 show_warning("No certificate for host "..host.." found :(");
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	823 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	824 -- TODO Additional checks
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	825 -- Certificate names matches the hostname
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	826 -- Private key matches public key in certificate
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	827 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	828 end
8117 66d8f6b3c3ef prosodyctl: Delay reporting of successful certificate imports until all done Kim Alvefur <zash@zash.se> parents: 8111 diff changeset	829 if imported[1] then
66d8f6b3c3ef prosodyctl: Delay reporting of successful certificate imports until all done Kim Alvefur <zash@zash.se> parents: 8111 diff changeset	830 show_message("Imported certificate and key for hosts "..table.concat(imported, ", "));
8120 3c5f0cb4381a prosodyctl: Attempt to reload prosody after importing certificates Kim Alvefur <zash@zash.se> parents: 8119 diff changeset	831 local ok, err = prosodyctl.reload();
3c5f0cb4381a prosodyctl: Attempt to reload prosody after importing certificates Kim Alvefur <zash@zash.se> parents: 8119 diff changeset	832 if not ok and err ~= "not-running" then
3c5f0cb4381a prosodyctl: Attempt to reload prosody after importing certificates Kim Alvefur <zash@zash.se> parents: 8119 diff changeset	833 show_message(error_messages[err]);
3c5f0cb4381a prosodyctl: Attempt to reload prosody after importing certificates Kim Alvefur <zash@zash.se> parents: 8119 diff changeset	834 end
8118 f8c52010bd37 prosodyctl: Return non-zero exit code from cert import if no certificates imported Kim Alvefur <zash@zash.se> parents: 8117 diff changeset	835 else
f8c52010bd37 prosodyctl: Return non-zero exit code from cert import if no certificates imported Kim Alvefur <zash@zash.se> parents: 8117 diff changeset	836 show_warning("No certificates imported :(");
f8c52010bd37 prosodyctl: Return non-zero exit code from cert import if no certificates imported Kim Alvefur <zash@zash.se> parents: 8117 diff changeset	837 return 1;
8117 66d8f6b3c3ef prosodyctl: Delay reporting of successful certificate imports until all done Kim Alvefur <zash@zash.se> parents: 8111 diff changeset	838 end
8111 3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	839 end
3cbb311f8468 prosodyctl: cert import: Command to copy certificates into prosodys certificate directory (fixes #892) Kim Alvefur <zash@zash.se> parents: 8110 diff changeset	840
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	841 function commands.cert(arg)
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	842 if #arg >= 1 and arg[1] ~= "--help" then
5292 46fbb5f1ef0a prosodyctl: Load LFS and util.openssl when actually needed (fixes unhelpful warnings if no LuaSec installed) Kim Alvefur <zash@zash.se> parents: 5152 diff changeset	843 openssl = require "util.openssl";
46fbb5f1ef0a prosodyctl: Load LFS and util.openssl when actually needed (fixes unhelpful warnings if no LuaSec installed) Kim Alvefur <zash@zash.se> parents: 5152 diff changeset	844 lfs = require "lfs";
8107 83d776b344ad prosodyctl: Verify permissions on directory that certificates are written to Kim Alvefur <zash@zash.se> parents: 8106 diff changeset	845 local cert_dir_attrs = lfs.attributes(cert_basedir);
8108 939ccedb509d prosodyctl: Verify that directory certs are written to exists Kim Alvefur <zash@zash.se> parents: 8107 diff changeset	846 if not cert_dir_attrs then
939ccedb509d prosodyctl: Verify that directory certs are written to exists Kim Alvefur <zash@zash.se> parents: 8107 diff changeset	847 show_warning("The directory "..cert_basedir.." does not exist");
939ccedb509d prosodyctl: Verify that directory certs are written to exists Kim Alvefur <zash@zash.se> parents: 8107 diff changeset	848 return 1; -- TODO Should we create it?
939ccedb509d prosodyctl: Verify that directory certs are written to exists Kim Alvefur <zash@zash.se> parents: 8107 diff changeset	849 end
9543 92bfb12684b0 prosodyctl: Allow cert dir to not be owned by root (fixes #1075) Kim Alvefur <zash@zash.se> parents: 8947 diff changeset	850 local uid = pposix.getuid();
92bfb12684b0 prosodyctl: Allow cert dir to not be owned by root (fixes #1075) Kim Alvefur <zash@zash.se> parents: 8947 diff changeset	851 if uid ~= 0 and uid ~= cert_dir_attrs.uid then
8107 83d776b344ad prosodyctl: Verify permissions on directory that certificates are written to Kim Alvefur <zash@zash.se> parents: 8106 diff changeset	852 show_warning("The directory "..cert_basedir.." is not owned by the current user, won't be able to write files to it");
83d776b344ad prosodyctl: Verify permissions on directory that certificates are written to Kim Alvefur <zash@zash.se> parents: 8106 diff changeset	853 return 1;
8419 57610304e30d prosodyctl: Fix traceback with lfs < 1.6.2 and show warning Matthew Wild <mwild1@gmail.com> parents: 8277 diff changeset	854 elseif not cert_dir_attrs.permissions then -- COMPAT with LuaFilesystem < 1.6.2 (hey CentOS!)
57610304e30d prosodyctl: Fix traceback with lfs < 1.6.2 and show warning Matthew Wild <mwild1@gmail.com> parents: 8277 diff changeset	855 show_message("Unable to check permissions on "..cert_basedir.." (LuaFilesystem 1.6.2+ required)");
57610304e30d prosodyctl: Fix traceback with lfs < 1.6.2 and show warning Matthew Wild <mwild1@gmail.com> parents: 8277 diff changeset	856 show_message("Please confirm that Prosody (and only Prosody) can write to this directory)");
8107 83d776b344ad prosodyctl: Verify permissions on directory that certificates are written to Kim Alvefur <zash@zash.se> parents: 8106 diff changeset	857 elseif cert_dir_attrs.permissions:match("^%.w..%-..%-.$") then
83d776b344ad prosodyctl: Verify permissions on directory that certificates are written to Kim Alvefur <zash@zash.se> parents: 8106 diff changeset	858 show_warning("The directory "..cert_basedir.." not only writable by its owner");
83d776b344ad prosodyctl: Verify permissions on directory that certificates are written to Kim Alvefur <zash@zash.se> parents: 8106 diff changeset	859 return 1;
83d776b344ad prosodyctl: Verify permissions on directory that certificates are written to Kim Alvefur <zash@zash.se> parents: 8106 diff changeset	860 end
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	861 local subcmd = table.remove(arg, 1);
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	862 if type(cert_commands[subcmd]) == "function" then
8248 259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	863 if subcmd ~= "import" then -- hostnames are optional for import
259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	864 if not arg[1] then
259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	865 show_message"You need to supply at least one hostname"
259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	866 arg = { "--help" };
259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	867 end
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	868 if arg[1] ~= "--help" and not prosody.hosts[arg[1]] then
8248 259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	869 show_message(error_messages["no-such-host"]);
259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	870 return 1;
259e0010a6d4 prosodyctl: Only demand a hostname argument to cert commands other than import Kim Alvefur <zash@zash.se> parents: 8247 diff changeset	871 end
4827 fefbfd76d2d3 prosodyctl: Show an error if the user doesn't supply a hostname to the certificate commands Kim Alvefur <zash@zash.se> parents: 4826 diff changeset	872 end
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	873 return cert_commands[subcmd](arg);
8177 f52cdad171b0 prosodyctl: Make `cert check` do the same as `check certs` Kim Alvefur <zash@zash.se> parents: 8144 diff changeset	874 elseif subcmd == "check" then
f52cdad171b0 prosodyctl: Make `cert check` do the same as `check certs` Kim Alvefur <zash@zash.se> parents: 8144 diff changeset	875 return commands.check({"certs"});
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	876 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	877 end
8122 e56a90168890 prosodyctl: Add cert import to short help Kim Alvefur <zash@zash.se> parents: 8120 diff changeset	878 show_usage("cert config\|request\|generate\|key\|import", "Helpers for generating X.509 certificates and keys.")
8144 8e9a36d0c7d1 prosodyctl: Show description of each certificate subcommand Kim Alvefur <zash@zash.se> parents: 8122 diff changeset	879 for _, cmd in pairs(cert_commands) do
8e9a36d0c7d1 prosodyctl: Show description of each certificate subcommand Kim Alvefur <zash@zash.se> parents: 8122 diff changeset	880 print()
8e9a36d0c7d1 prosodyctl: Show description of each certificate subcommand Kim Alvefur <zash@zash.se> parents: 8122 diff changeset	881 cmd{ "--help" }
8e9a36d0c7d1 prosodyctl: Show description of each certificate subcommand Kim Alvefur <zash@zash.se> parents: 8122 diff changeset	882 end
4487 5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	883 end
5f466a50e78b prosodyctl: Add commands for generating certificates and keys Kim Alvefur <zash@zash.se> parents: 4476 diff changeset	884
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	885 function commands.check(arg)
5655 6d7f7548b2c9 prosodyctl: Add 'prosodyctl check --help' Kim Alvefur <zash@zash.se> parents: 5620 diff changeset	886 if arg[1] == "--help" then
6d7f7548b2c9 prosodyctl: Add 'prosodyctl check --help' Kim Alvefur <zash@zash.se> parents: 5620 diff changeset	887 show_usage([[check]], [[Perform basic checks on your Prosody installation]]);
6d7f7548b2c9 prosodyctl: Add 'prosodyctl check --help' Kim Alvefur <zash@zash.se> parents: 5620 diff changeset	888 return 1;
6d7f7548b2c9 prosodyctl: Add 'prosodyctl check --help' Kim Alvefur <zash@zash.se> parents: 5620 diff changeset	889 end
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	890 local what = table.remove(arg, 1);
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	891 local set = require "util.set";
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	892 local it = require "util.iterators";
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	893 local ok = true;
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	894 local function disabled_hosts(host, conf) return host ~= "*" and conf.enabled ~= false; end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	895 local function enabled_hosts() return it.filter(disabled_hosts, pairs(configmanager.getconfig())); end
8947 f12cc1d7aa65 prosodyctl: Warn if attempting to run an unknown check (fixes #1161) Kim Alvefur <zash@zash.se> parents: 8881 diff changeset	896 if not (what == nil or what == "disabled" or what == "config" or what == "dns" or what == "certs") then
f12cc1d7aa65 prosodyctl: Warn if attempting to run an unknown check (fixes #1161) Kim Alvefur <zash@zash.se> parents: 8881 diff changeset	897 show_warning("Don't know how to check '%s'. Try one of 'config', 'dns', 'certs' or 'disabled'.", what);
f12cc1d7aa65 prosodyctl: Warn if attempting to run an unknown check (fixes #1161) Kim Alvefur <zash@zash.se> parents: 8881 diff changeset	898 return 1;
f12cc1d7aa65 prosodyctl: Warn if attempting to run an unknown check (fixes #1161) Kim Alvefur <zash@zash.se> parents: 8881 diff changeset	899 end
6159 4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	900 if not what or what == "disabled" then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	901 local disabled_hosts_set = set.new();
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	902 for host, host_options in it.filter("*", pairs(configmanager.getconfig())) do
6159 4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	903 if host_options.enabled == false then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	904 disabled_hosts_set:add(host);
6159 4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	905 end
4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	906 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	907 if not disabled_hosts_set:empty() then
6159 4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	908 local msg = "Checks will be skipped for these disabled hosts: %s";
4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	909 if what then msg = "These hosts are disabled: %s"; end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	910 show_warning(msg, tostring(disabled_hosts_set));
6159 4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	911 if what then return 0; end
4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	912 print""
4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	913 end
4ee14b7ef2cc prosodyctl: Add check that points out any disabled hosts Kim Alvefur <zash@zash.se> parents: 6158 diff changeset	914 end
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	915 if not what or what == "config" then
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	916 print("Checking config...");
6160 cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	917 local deprecated = set.new({
6486 64146196b142 prosodyctl: Add 'require_encryption' to list of deprecated options pointed out by the check command Kim Alvefur <zash@zash.se> parents: 6405 diff changeset	918 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
9795 02735bc82126 mod_websocket: Drop CORS code in favor of that in mod_http Kim Alvefur <zash@zash.se> parents: 9794 diff changeset	919 "vcard_compatibility", "cross_domain_bosh", "cross_domain_websocket"
6160 cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	920 });
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	921 local known_global_options = set.new({
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	922 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
6751 18f18bceb662 prosodyctl: check: Add some more known global config options Kim Alvefur <zash@zash.se> parents: 6711 diff changeset	923 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings",
18f18bceb662 prosodyctl: check: Add some more known global config options Kim Alvefur <zash@zash.se> parents: 6711 diff changeset	924 "network_backend", "http_default_host",
9709 f31ed70c993a prosodyctl check: Add statisticsmanager settings to known global options Kim Alvefur <zash@zash.se> parents: 9545 diff changeset	925 "statistics_interval", "statistics", "statistics_config",
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	926 });
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	927 local config = configmanager.getconfig();
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	928 -- Check that we have any global options (caused by putting a host at the top)
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	929 if it.count(it.filter("log", pairs(config["*"]))) == 0 then
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	930 ok = false;
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	931 print("");
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	932 print(" No global options defined. Perhaps you have put a host definition at the top")
7359 a5a080c12c96 Update every link to the documentation to use HTTPS Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7313 diff changeset	933 print(" of the config file? They should be at the bottom, see https://prosody.im/doc/configure#overview");
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	934 end
6162 fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	935 if it.count(enabled_hosts()) == 0 then
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	936 ok = false;
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	937 print("");
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	938 if it.count(it.filter("*", pairs(config))) == 0 then
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	939 print(" No hosts are defined, please add at least one VirtualHost section")
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	940 elseif config["*"]["enabled"] == false then
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	941 print(" No hosts are enabled. Remove enabled = false from the global section or put enabled = true under at least one VirtualHost section")
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	942 else
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	943 print(" All hosts are disabled. Remove enabled = false from at least one VirtualHost section")
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	944 end
fbc3b195dab8 prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined Kim Alvefur <zash@zash.se> parents: 6161 diff changeset	945 end
7082 8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	946 if not config["*"].modules_enabled then
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	947 print(" No global modules_enabled is set?");
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	948 local suggested_global_modules;
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	949 for host, options in enabled_hosts() do --luacheck: ignore 213/host
7082 8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	950 if not options.component_module and options.modules_enabled then
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	951 suggested_global_modules = set.intersection(suggested_global_modules or set.new(options.modules_enabled), set.new(options.modules_enabled));
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	952 end
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	953 end
8265 17ebd8ac8545 prosodyctl check: Fix traceback when no modules_enabled are defined (e.g., a completely empty config) Waqas Hussain <waqas20@gmail.com> parents: 8249 diff changeset	954 if suggested_global_modules and not suggested_global_modules:empty() then
7082 8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	955 print(" Consider moving these modules into modules_enabled in the global section:")
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	956 print(" "..tostring(suggested_global_modules / function (x) return ("%q"):format(x) end));
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	957 end
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	958 print();
8b590fc77d91 prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset Kim Alvefur <zash@zash.se> parents: 7080 diff changeset	959 end
8787 5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	960
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	961 do -- Check for modules enabled both normally and as components
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	962 local modules = set.new(config["*"]["modules_enabled"]);
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	963 for host, options in enabled_hosts() do
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	964 local component_module = options.component_module;
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	965 if component_module and modules:contains(component_module) then
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	966 print((" mod_%s is enabled both in modules_enabled and as Component %q %q"):format(component_module, host, component_module));
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	967 print(" This means the service is enabled on all VirtualHosts as well as the Component.");
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	968 print(" Are you sure this what you want? It may cause unexpected behaviour.");
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	969 end
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	970 end
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	971 end
5dbebb7627ef prosodyctl: Config check for modules that are also components (fixes #1138) Kim Alvefur <zash@zash.se> parents: 8718 diff changeset	972
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	973 -- Check for global options under hosts
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	974 local global_options = set.new(it.to_array(it.keys(config["*"])));
6160 cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	975 local deprecated_global_options = set.intersection(global_options, deprecated);
cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	976 if not deprecated_global_options:empty() then
cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	977 print("");
cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	978 print(" You have some deprecated options in the global section:");
cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	979 print(" "..tostring(deprecated_global_options))
cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	980 ok = false;
cf0f7caa885e prosodyctl: Check for deprecated config options Kim Alvefur <zash@zash.se> parents: 6159 diff changeset	981 end
9231 3d12b4f41b23 prosodyctl: Also look for options that belong in global section under disabled hosts (fixes #1207) Kim Alvefur <zash@zash.se> parents: 8948 diff changeset	982 for host, options in it.filter(function (h) return h ~= "*" end, pairs(configmanager.getconfig())) do
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	983 local host_options = set.new(it.to_array(it.keys(options)));
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	984 local misplaced_options = set.intersection(host_options, known_global_options);
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	985 for name in pairs(options) do
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	986 if name:match("^interfaces?")
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	987 or name:match("_ports?$") or name:match("_interfaces?$")
6914 5df76208e050 prosodyctl: check: Don't complain about c2s_ssl or s2s_ssl being in VirtualHost sections, that's supported Kim Alvefur <zash@zash.se> parents: 6845 diff changeset	988 or (name:match("_ssl$") and not name:match("^[cs]2s_ssl$")) then
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	989 misplaced_options:add(name);
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	990 end
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	991 end
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	992 if not misplaced_options:empty() then
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	993 ok = false;
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	994 print("");
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	995 local n = it.count(misplaced_options);
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	996 print(" You have "..n.." option"..(n>1 and "s " or " ").."set under "..host.." that should be");
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	997 print(" in the global section of the config file, above any VirtualHost or Component definitions,")
7359 a5a080c12c96 Update every link to the documentation to use HTTPS Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7313 diff changeset	998 print(" see https://prosody.im/doc/configure#overview for more information.")
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	999 print("");
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1000 print(" You need to move the following option"..(n>1 and "s" or "")..": "..table.concat(it.to_array(misplaced_options), ", "));
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1001 end
9231 3d12b4f41b23 prosodyctl: Also look for options that belong in global section under disabled hosts (fixes #1207) Kim Alvefur <zash@zash.se> parents: 8948 diff changeset	1002 end
3d12b4f41b23 prosodyctl: Also look for options that belong in global section under disabled hosts (fixes #1207) Kim Alvefur <zash@zash.se> parents: 8948 diff changeset	1003 for host, options in enabled_hosts() do
3d12b4f41b23 prosodyctl: Also look for options that belong in global section under disabled hosts (fixes #1207) Kim Alvefur <zash@zash.se> parents: 8948 diff changeset	1004 local host_options = set.new(it.to_array(it.keys(options)));
5616 a79c6717ee2b prosodyctl: check config: Show a suggestion to change hosts that begin with jabber/xmpp/chat/im subdomains, and link to DNS documentation Matthew Wild <mwild1@gmail.com> parents: 5610 diff changeset	1005 local subdomain = host:match("^[^.]+");
5619 6a87b75aedd5 prosodyctl: check config: Fix check for whether host is a component Matthew Wild <mwild1@gmail.com> parents: 5617 diff changeset	1006 if not(host_options:contains("component_module")) and (subdomain == "jabber" or subdomain == "xmpp"
5616 a79c6717ee2b prosodyctl: check config: Show a suggestion to change hosts that begin with jabber/xmpp/chat/im subdomains, and link to DNS documentation Matthew Wild <mwild1@gmail.com> parents: 5610 diff changeset	1007 or subdomain == "chat" or subdomain == "im") then
8109 2f214c4db170 prosodyctl: Normalize inconsistent whitespace [luacheck] Kim Alvefur <zash@zash.se> parents: 8108 diff changeset	1008 print("");
2f214c4db170 prosodyctl: Normalize inconsistent whitespace [luacheck] Kim Alvefur <zash@zash.se> parents: 8108 diff changeset	1009 print(" Suggestion: If "..host.. " is a new host with no real users yet, consider renaming it now to");
2f214c4db170 prosodyctl: Normalize inconsistent whitespace [luacheck] Kim Alvefur <zash@zash.se> parents: 8108 diff changeset	1010 print(" "..host:gsub("^[^.]+%.", "")..". You can use SRV records to redirect XMPP clients and servers to "..host..".");
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1011 print(" For more information see: https://prosody.im/doc/dns");
5616 a79c6717ee2b prosodyctl: check config: Show a suggestion to change hosts that begin with jabber/xmpp/chat/im subdomains, and link to DNS documentation Matthew Wild <mwild1@gmail.com> parents: 5610 diff changeset	1012 end
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1013 end
6959 aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1014 local all_modules = set.new(config["*"].modules_enabled);
6957 e442016918a9 prosodyctl check: Include global options when checking "all options" Kim Alvefur <zash@zash.se> parents: 6914 diff changeset	1015 local all_options = set.new(it.to_array(it.keys(config["*"])));
6844 8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1016 for host in enabled_hosts() do
8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1017 all_options:include(set.new(it.to_array(it.keys(config[host]))));
6959 aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1018 all_modules:include(set.new(config[host].modules_enabled));
aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1019 end
aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1020 for mod in all_modules do
aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1021 if mod:match("^mod_") then
aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1022 print("");
aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1023 print(" Modules in modules_enabled should not have the 'mod_' prefix included.");
aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1024 print(" Change '"..mod.."' to '"..mod:match("^mod_(.*)").."'.");
6960 50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1025 elseif mod:match("^auth_") then
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1026 print("");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1027 print(" Authentication modules should not be added to modules_enabled,");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1028 print(" but be specified in the 'authentication' option.");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1029 print(" Remove '"..mod.."' from modules_enabled and instead add");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1030 print(" authentication = '"..mod:match("^auth_(.*)").."'");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1031 print(" For more information see https://prosody.im/doc/authentication");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1032 elseif mod:match("^storage_") then
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1033 print("");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1034 print(" storage modules should not be added to modules_enabled,");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1035 print(" but be specified in the 'storage' option.");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1036 print(" Remove '"..mod.."' from modules_enabled and instead add");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1037 print(" storage = '"..mod:match("^storage_(.*)").."'");
50e2277ea05f prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570) Kim Alvefur <zash@zash.se> parents: 6959 diff changeset	1038 print(" For more information see https://prosody.im/doc/storage");
6959 aa8647a5105d prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix Kim Alvefur <zash@zash.se> parents: 6958 diff changeset	1039 end
6844 8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1040 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1041 for host, host_config in pairs(config) do --luacheck: ignore 213/host
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1042 if type(rawget(host_config, "storage")) == "string" and rawget(host_config, "default_storage") then
8067 91550b6f93d2 prosodyctl: Point out how default_storage is redundant if storage is a string Kim Alvefur <zash@zash.se> parents: 8012 diff changeset	1043 print("");
91550b6f93d2 prosodyctl: Point out how default_storage is redundant if storage is a string Kim Alvefur <zash@zash.se> parents: 8012 diff changeset	1044 print(" The 'default_storage' option is not needed if 'storage' is set to a string.");
91550b6f93d2 prosodyctl: Point out how default_storage is redundant if storage is a string Kim Alvefur <zash@zash.se> parents: 8012 diff changeset	1045 break;
91550b6f93d2 prosodyctl: Point out how default_storage is redundant if storage is a string Kim Alvefur <zash@zash.se> parents: 8012 diff changeset	1046 end
91550b6f93d2 prosodyctl: Point out how default_storage is redundant if storage is a string Kim Alvefur <zash@zash.se> parents: 8012 diff changeset	1047 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1048 local require_encryption = set.intersection(all_options, set.new({
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1049 "require_encryption", "c2s_require_encryption", "s2s_require_encryption"
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1050 })):empty();
6958 ebac87d80ef4 prosodyctl check: Really store imported LuaSec (must be a leftover from debugging) Kim Alvefur <zash@zash.se> parents: 6957 diff changeset	1051 local ssl = dependencies.softreq"ssl";
6844 8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1052 if not ssl then
7455 82d8c11ab0cb prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) Kim Alvefur <zash@zash.se> parents: 7445 diff changeset	1053 if not require_encryption then
6844 8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1054 print("");
8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1055 print(" You require encryption but LuaSec is not available.");
8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1056 print(" Connections will fail.");
8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1057 ok = false;
8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1058 end
6845 bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1059 elseif not ssl.loadcertificate then
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1060 if all_options:contains("s2s_secure_auth") then
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1061 print("");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1062 print(" You have set s2s_secure_auth but your version of LuaSec does ");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1063 print(" not support certificate validation, so all s2s connections will");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1064 print(" fail.");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1065 ok = false;
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1066 elseif all_options:contains("s2s_secure_domains") then
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1067 local secure_domains = set.new();
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1068 for host in enabled_hosts() do
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1069 if config[host].s2s_secure_auth == true then
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1070 secure_domains:add("*");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1071 else
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1072 secure_domains:include(set.new(config[host].s2s_secure_domains));
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1073 end
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1074 end
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1075 if not secure_domains:empty() then
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1076 print("");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1077 print(" You have set s2s_secure_domains but your version of LuaSec does ");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1078 print(" not support certificate validation, so s2s connections to/from ");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1079 print(" these domains will fail.");
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1080 ok = false;
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1081 end
bb7854355df1 prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old Kim Alvefur <zash@zash.se> parents: 6844 diff changeset	1082 end
7455 82d8c11ab0cb prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) Kim Alvefur <zash@zash.se> parents: 7445 diff changeset	1083 elseif require_encryption and not all_modules:contains("tls") then
82d8c11ab0cb prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) Kim Alvefur <zash@zash.se> parents: 7445 diff changeset	1084 print("");
82d8c11ab0cb prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) Kim Alvefur <zash@zash.se> parents: 7445 diff changeset	1085 print(" You require encryption but mod_tls is not enabled.");
82d8c11ab0cb prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) Kim Alvefur <zash@zash.se> parents: 7445 diff changeset	1086 print(" Connections will fail.");
82d8c11ab0cb prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) Kim Alvefur <zash@zash.se> parents: 7445 diff changeset	1087 ok = false;
6844 8946052e12d2 prosodyctl check: Warn if encryption is required but LuaSec is unavailable Kim Alvefur <zash@zash.se> parents: 6837 diff changeset	1088 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1089
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1090 print("Done.\n");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1091 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1092 if not what or what == "dns" then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1093 local dns = require "net.dns";
5809 be997c6a69be prosodyctl: check: Support for unicode (IDN) domains (thanks once again albert) Matthew Wild <mwild1@gmail.com> parents: 5723 diff changeset	1094 local idna = require "util.encodings".idna;
5592 5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1095 local ip = require "util.ip";
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1096 local c2s_ports = set.new(configmanager.get("*", "c2s_ports") or {5222});
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1097 local s2s_ports = set.new(configmanager.get("*", "s2s_ports") or {5269});
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1098
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1099 local c2s_srv_required, s2s_srv_required;
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1100 if not c2s_ports:contains(5222) then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1101 c2s_srv_required = true;
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1102 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1103 if not s2s_ports:contains(5269) then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1104 s2s_srv_required = true;
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1105 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1106
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1107 local problem_hosts = set.new();
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1108
5592 5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1109 local external_addresses, internal_addresses = set.new(), set.new();
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1110
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1111 local fqdn = socket.dns.tohostname(socket.dns.gethostname());
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1112 if fqdn then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1113 do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1114 local res = dns.lookup(idna.to_ascii(fqdn), "A");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1115 if res then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1116 for _, record in ipairs(res) do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1117 external_addresses:add(record.a);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1118 end
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1119 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1120 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1121 do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1122 local res = dns.lookup(idna.to_ascii(fqdn), "AAAA");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1123 if res then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1124 for _, record in ipairs(res) do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1125 external_addresses:add(record.aaaa);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1126 end
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1127 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1128 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1129 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1130
5723 24b6eb65480c prosodyctl: Import local_addresses from the new util.net intead of luasocket Kim Alvefur <zash@zash.se> parents: 5657 diff changeset	1131 local local_addresses = require"util.net".local_addresses() or {};
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1132
5592 5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1133 for addr in it.values(local_addresses) do
5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1134 if not ip.new_ip(addr).private then
5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1135 external_addresses:add(addr);
5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1136 else
5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1137 internal_addresses:add(addr);
5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1138 end
5705e21ba24b prosodyctl: check dns: Use socket.local_addresses() if available Matthew Wild <mwild1@gmail.com> parents: 5591 diff changeset	1139 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1140
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1141 if external_addresses:empty() then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1142 print("");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1143 print(" Failed to determine the external addresses of this server. Checks may be inaccurate.");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1144 c2s_srv_required, s2s_srv_required = true, true;
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1145 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1146
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1147 local v6_supported = not not socket.tcp6;
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1148
7311 e9526dd3e8fc prosodyctl: Only use host part of JIDs eg components that have node parts (thanks suzyo) Kim Alvefur <zash@zash.se> parents: 7297 diff changeset	1149 for jid, host_options in enabled_hosts() do
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1150 local all_targets_ok, some_targets_ok = true, false;
7311 e9526dd3e8fc prosodyctl: Only use host part of JIDs eg components that have node parts (thanks suzyo) Kim Alvefur <zash@zash.se> parents: 7297 diff changeset	1151 local node, host = jid_split(jid);
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1152
8923 ddd98e262519 prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031) Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8917 diff changeset	1153 local modules, component_module = modulemanager.get_modules_for_host(host);
ddd98e262519 prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031) Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8917 diff changeset	1154 if component_module then
ddd98e262519 prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031) Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8917 diff changeset	1155 modules:add(component_module);
ddd98e262519 prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031) Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8917 diff changeset	1156 end
ddd98e262519 prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031) Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8917 diff changeset	1157
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1158 local is_component = not not host_options.component_module;
7311 e9526dd3e8fc prosodyctl: Only use host part of JIDs eg components that have node parts (thanks suzyo) Kim Alvefur <zash@zash.se> parents: 7297 diff changeset	1159 print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."...");
e9526dd3e8fc prosodyctl: Only use host part of JIDs eg components that have node parts (thanks suzyo) Kim Alvefur <zash@zash.se> parents: 7297 diff changeset	1160 if node then
e9526dd3e8fc prosodyctl: Only use host part of JIDs eg components that have node parts (thanks suzyo) Kim Alvefur <zash@zash.se> parents: 7297 diff changeset	1161 print("Only the domain part ("..host..") is used in DNS.")
e9526dd3e8fc prosodyctl: Only use host part of JIDs eg components that have node parts (thanks suzyo) Kim Alvefur <zash@zash.se> parents: 7297 diff changeset	1162 end
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1163 local target_hosts = set.new();
8924 8fe98e365ab8 prosodyctl: Restrict c2s checks for when c2s is enabled Kim Alvefur <zash@zash.se> parents: 8923 diff changeset	1164 if modules:contains("c2s") then
5809 be997c6a69be prosodyctl: check: Support for unicode (IDN) domains (thanks once again albert) Matthew Wild <mwild1@gmail.com> parents: 5723 diff changeset	1165 local res = dns.lookup("_xmpp-client._tcp."..idna.to_ascii(host)..".", "SRV");
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1166 if res then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1167 for _, record in ipairs(res) do
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1168 target_hosts:add(record.srv.target);
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1169 if not c2s_ports:contains(record.srv.port) then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1170 print(" SRV target "..record.srv.target.." contains unknown client port: "..record.srv.port);
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1171 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1172 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1173 else
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1174 if c2s_srv_required then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1175 print(" No _xmpp-client SRV record found for "..host..", but it looks like you need one.");
7252 fa0169cc8511 prosodyctl: Fix typo'd variable name [luacheck] Matthew Wild <mwild1@gmail.com> parents: 7250 diff changeset	1176 all_targets_ok = false;
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1177 else
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1178 target_hosts:add(host);
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1179 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1180 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1181 end
8923 ddd98e262519 prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031) Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8917 diff changeset	1182 if modules:contains("s2s") then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1183 local res = dns.lookup("_xmpp-server._tcp."..idna.to_ascii(host)..".", "SRV");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1184 if res then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1185 for _, record in ipairs(res) do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1186 target_hosts:add(record.srv.target);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1187 if not s2s_ports:contains(record.srv.port) then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1188 print(" SRV target "..record.srv.target.." contains unknown server port: "..record.srv.port);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1189 end
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1190 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1191 else
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1192 if s2s_srv_required then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1193 print(" No _xmpp-server SRV record found for "..host..", but it looks like you need one.");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1194 all_targets_ok = false;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1195 else
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1196 target_hosts:add(host);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1197 end
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1198 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1199 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1200 if target_hosts:empty() then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1201 target_hosts:add(host);
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1202 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1203
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1204 if target_hosts:contains("localhost") then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1205 print(" Target 'localhost' cannot be accessed from other servers");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1206 target_hosts:remove("localhost");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1207 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1208
5620 8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1209 if modules:contains("proxy65") then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1210 local proxy65_target = configmanager.get(host, "proxy65_address") or host;
5809 be997c6a69be prosodyctl: check: Support for unicode (IDN) domains (thanks once again albert) Matthew Wild <mwild1@gmail.com> parents: 5723 diff changeset	1211 local A, AAAA = dns.lookup(idna.to_ascii(proxy65_target), "A"), dns.lookup(idna.to_ascii(proxy65_target), "AAAA");
5620 8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1212 local prob = {};
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1213 if not A then
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1214 table.insert(prob, "A");
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1215 end
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1216 if v6_supported and not AAAA then
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1217 table.insert(prob, "AAAA");
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1218 end
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1219 if #prob > 0 then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1220 print(" File transfer proxy "..proxy65_target.." has no "..table.concat(prob, "/")
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1221 .." record. Create one or set 'proxy65_address' to the correct host/IP.");
5620 8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1222 end
8349ae2a44ce prosodyctl: check dns: Add check that proxy65 addresses resolve correctly Matthew Wild <mwild1@gmail.com> parents: 5619 diff changeset	1223 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1224
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1225 for target_host in target_hosts do
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1226 local host_ok_v4, host_ok_v6;
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1227 do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1228 local res = dns.lookup(idna.to_ascii(target_host), "A");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1229 if res then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1230 for _, record in ipairs(res) do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1231 if external_addresses:contains(record.a) then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1232 some_targets_ok = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1233 host_ok_v4 = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1234 elseif internal_addresses:contains(record.a) then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1235 host_ok_v4 = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1236 some_targets_ok = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1237 print(" "..target_host.." A record points to internal address, external connections might fail");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1238 else
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1239 print(" "..target_host.." A record points to unknown address "..record.a);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1240 all_targets_ok = false;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1241 end
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1242 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1243 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1244 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1245 do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1246 local res = dns.lookup(idna.to_ascii(target_host), "AAAA");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1247 if res then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1248 for _, record in ipairs(res) do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1249 if external_addresses:contains(record.aaaa) then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1250 some_targets_ok = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1251 host_ok_v6 = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1252 elseif internal_addresses:contains(record.aaaa) then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1253 host_ok_v6 = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1254 some_targets_ok = true;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1255 print(" "..target_host.." AAAA record points to internal address, external connections might fail");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1256 else
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1257 print(" "..target_host.." AAAA record points to unknown address "..record.aaaa);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1258 all_targets_ok = false;
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1259 end
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1260 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1261 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1262 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1263
5590 597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1264 local bad_protos = {}
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1265 if not host_ok_v4 then
5590 597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1266 table.insert(bad_protos, "IPv4");
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1267 end
5590 597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1268 if not host_ok_v6 then
597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1269 table.insert(bad_protos, "IPv6");
597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1270 end
597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1271 if #bad_protos > 0 then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1272 print(" Host "..target_host.." does not seem to resolve to this server ("..table.concat(bad_protos, "/")..")");
5590 597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1273 end
597450c73ce6 prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) Matthew Wild <mwild1@gmail.com> parents: 5589 diff changeset	1274 if host_ok_v6 and not v6_supported then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1275 print(" Host "..target_host.." has AAAA records, but your version of LuaSocket does not support IPv6.");
7359 a5a080c12c96 Update every link to the documentation to use HTTPS Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7313 diff changeset	1276 print(" Please see https://prosody.im/doc/ipv6 for more information.");
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1277 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1278 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1279 if not all_targets_ok then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1280 print(" "..(some_targets_ok and "Only some" or "No").." targets for "..host.." appear to resolve to this server.");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1281 if is_component then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1282 print(" DNS records are necessary if you want users on other servers to access this component.");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1283 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1284 problem_hosts:add(host);
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1285 end
5591 f0bf2a1790d9 prosodyctl: check dns: Whitespace fix in output Matthew Wild <mwild1@gmail.com> parents: 5590 diff changeset	1286 print("");
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1287 end
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1288 if not problem_hosts:empty() then
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1289 print("");
7359 a5a080c12c96 Update every link to the documentation to use HTTPS Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7313 diff changeset	1290 print("For more information about DNS configuration please see https://prosody.im/doc/dns");
5585 3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1291 print("");
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1292 ok = false;
3e097acf82de prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records Matthew Wild <mwild1@gmail.com> parents: 5584 diff changeset	1293 end
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1294 end
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1295 if not what or what == "certs" then
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1296 local cert_ok;
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1297 print"Checking certificates..."
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1298 local x509_verify_identity = require"util.x509".verify_identity;
7208 f666d50cc32b prosodyctl: check certs: Use certmanager to get the final ssl config in order to support the new certificate(s) config option Kim Alvefur <zash@zash.se> parents: 7193 diff changeset	1299 local create_context = require "core.certmanager".create_context;
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1300 local ssl = dependencies.softreq"ssl";
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1301 -- local datetime_parse = require"util.datetime".parse_x509;
6612 6cc48b51d699 prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ssl.x509 export dissapears in 97b1974 or 356e03a Kim Alvefur <zash@zash.se> parents: 6611 diff changeset	1302 local load_cert = ssl and ssl.loadcertificate;
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1303 -- or ssl.cert_from_pem
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1304 if not ssl then
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1305 print("LuaSec not available, can't perform certificate checks")
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1306 if what == "certs" then cert_ok = false end
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1307 elseif not load_cert then
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1308 print("This version of LuaSec (" .. ssl._VERSION .. ") does not support certificate checking");
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1309 cert_ok = false
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1310 else
8190 331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1311 local function skip_bare_jid_hosts(host)
331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1312 if jid_split(host) then
331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1313 -- See issue #779
331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1314 return false;
331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1315 end
331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1316 return true;
331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1317 end
331caee0c774 prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779) Kim Alvefur <zash@zash.se> parents: 8177 diff changeset	1318 for host in it.filter(skip_bare_jid_hosts, enabled_hosts()) do
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1319 print("Checking certificate for "..host);
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1320 -- First, let's find out what certificate this host uses.
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1321 local host_ssl_config = configmanager.rawget(host, "ssl")
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1322 or configmanager.rawget(host:match("%.(.*)"), "ssl");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1323 local global_ssl_config = configmanager.rawget("*", "ssl");
7208 f666d50cc32b prosodyctl: check certs: Use certmanager to get the final ssl config in order to support the new certificate(s) config option Kim Alvefur <zash@zash.se> parents: 7193 diff changeset	1324 local ok, err, ssl_config = create_context(host, "server", host_ssl_config, global_ssl_config);
f666d50cc32b prosodyctl: check certs: Use certmanager to get the final ssl config in order to support the new certificate(s) config option Kim Alvefur <zash@zash.se> parents: 7193 diff changeset	1325 if not ok then
f666d50cc32b prosodyctl: check certs: Use certmanager to get the final ssl config in order to support the new certificate(s) config option Kim Alvefur <zash@zash.se> parents: 7193 diff changeset	1326 print(" Error: "..err);
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1327 cert_ok = false
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1328 elseif not ssl_config.certificate then
7209 92e5036bc55c prosodyctl: check certs: Update messages to account for 'ssl' option maybe not existing Kim Alvefur <zash@zash.se> parents: 7208 diff changeset	1329 print(" No 'certificate' found for "..host)
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1330 cert_ok = false
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1331 elseif not ssl_config.key then
7212 167dbd29fbeb prosodyctl: Fix typo (thanks av6) Kim Alvefur <zash@zash.se> parents: 7210 diff changeset	1332 print(" No 'key' found for "..host)
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1333 cert_ok = false
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1334 else
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1335 local key, err = io.open(ssl_config.key); -- Permissions check only
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1336 if not key then
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1337 print(" Could not open "..ssl_config.key..": "..err);
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1338 cert_ok = false
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1339 else
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1340 key:close();
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1341 end
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1342 local cert_fh, err = io.open(ssl_config.certificate); -- Load the file.
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1343 if not cert_fh then
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1344 print(" Could not open "..ssl_config.certificate..": "..err);
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1345 cert_ok = false
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1346 else
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1347 print(" Certificate: "..ssl_config.certificate)
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1348 local cert = load_cert(cert_fh:read"*a"); cert_fh:close();
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1349 if not cert:validat(os.time()) then
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1350 print(" Certificate has expired.")
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1351 cert_ok = false
7210 48149ecbb649 prosodyctl: check certs: Warn about certificate expiry in the near future Kim Alvefur <zash@zash.se> parents: 7209 diff changeset	1352 elseif not cert:validat(os.time() + 86400) then
48149ecbb649 prosodyctl: check certs: Warn about certificate expiry in the near future Kim Alvefur <zash@zash.se> parents: 7209 diff changeset	1353 print(" Certificate expires within one day.")
48149ecbb649 prosodyctl: check certs: Warn about certificate expiry in the near future Kim Alvefur <zash@zash.se> parents: 7209 diff changeset	1354 cert_ok = false
48149ecbb649 prosodyctl: check certs: Warn about certificate expiry in the near future Kim Alvefur <zash@zash.se> parents: 7209 diff changeset	1355 elseif not cert:validat(os.time() + 86400*7) then
48149ecbb649 prosodyctl: check certs: Warn about certificate expiry in the near future Kim Alvefur <zash@zash.se> parents: 7209 diff changeset	1356 print(" Certificate expires within one week.")
7213 193e4c65d218 prosodyctl: One month is 31 days, no 13 (thanks av6) Kim Alvefur <zash@zash.se> parents: 7212 diff changeset	1357 elseif not cert:validat(os.time() + 86400*31) then
7210 48149ecbb649 prosodyctl: check certs: Warn about certificate expiry in the near future Kim Alvefur <zash@zash.se> parents: 7209 diff changeset	1358 print(" Certificate expires within one month.")
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1359 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1360 if configmanager.get(host, "component_module") == nil
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1361 and not x509_verify_identity(host, "_xmpp-client", cert) then
7445 6d2038147d3d prosodyctl: Fix typo (thanks av6) Kim Alvefur <zash@zash.se> parents: 7311 diff changeset	1362 print(" Not valid for client connections to "..host..".")
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1363 cert_ok = false
08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1364 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1365 if (not (configmanager.get(host, "anonymous_login")
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1366 or configmanager.get(host, "authentication") == "anonymous"))
6637 ecc039288edc prosodyctl: check certs: Correctly check that certificates are valid for s2s Kim Alvefur <zash@zash.se> parents: 6612 diff changeset	1367 and not x509_verify_identity(host, "_xmpp-server", cert) then
7445 6d2038147d3d prosodyctl: Fix typo (thanks av6) Kim Alvefur <zash@zash.se> parents: 7311 diff changeset	1368 print(" Not valid for server-to-server connections to "..host..".")
6158 08e9c9d0beb3 prosodyctl: Only perform checks on enabled hosts Kim Alvefur <zash@zash.se> parents: 6062 diff changeset	1369 cert_ok = false
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1370 end
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1371 end
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1372 end
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1373 end
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1374 end
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1375 if cert_ok == false then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1376 print("")
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1377 print("For more information about certificates please see https://prosody.im/doc/certificates");
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1378 ok = false
5657 7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1379 end
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1380 print("")
7957f14038e8 prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates Kim Alvefur <zash@zash.se> parents: 5655 diff changeset	1381 end
5584 1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1382 if not ok then
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1383 print("Problems found, see above.");
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1384 else
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1385 print("All checks passed, congratulations!");
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1386 end
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1387 return ok and 0 or 2;
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1388 end
1d841117117c prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes Matthew Wild <mwild1@gmail.com> parents: 5554 diff changeset	1389
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1390 ---------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1391
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1392 local async = require "util.async";
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1393 local server = require "net.server";
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1394 local watchers = {
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1395 error = function (_, err)
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1396 error(err);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1397 end;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1398 waiting = function ()
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1399 server.loop();
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1400 end;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1401 };
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1402 local command_runner = async.runner(function ()
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1403 if command and command:match("^mod_") then -- Is a command in a module
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1404 local module_name = command:match("^mod_(.+)");
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1405 do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1406 local ret, err = modulemanager.load("*", module_name);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1407 if not ret then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1408 show_message("Failed to load module '"..module_name.."': "..err);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1409 os.exit(1);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1410 end
1390 ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	1411 end
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1412
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1413 local module = modulemanager.get_module("*", module_name);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1414 if not module then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1415 show_message("Failed to load module '"..module_name.."': Unknown error");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1416 os.exit(1);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1417 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1418
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1419 if not modulemanager.module_has_method(module, "command") then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1420 show_message("Fail: mod_"..module_name.." does not support any commands");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1421 os.exit(1);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1422 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1423
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1424 local ok, ret = modulemanager.call_module_method(module, "command", arg);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1425 if ok then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1426 if type(ret) == "number" then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1427 os.exit(ret);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1428 elseif type(ret) == "string" then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1429 show_message(ret);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1430 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1431 os.exit(0); -- :)
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1432 else
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1433 show_message("Failed to execute command: "..error_messages[ret]);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1434 os.exit(1); -- :(
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1435 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1436 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1437
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1438 if not commands[command] then -- Show help for all commands
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1439 function show_usage(usage, desc)
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1440 print(" "..usage);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1441 print(" "..desc);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1442 end
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1443
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1444 print("prosodyctl - Manage a Prosody server");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1445 print("");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1446 print("Usage: "..arg[0].." COMMAND [OPTIONS]");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1447 print("");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1448 print("Where COMMAND may be one of:\n");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1449
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1450 local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
10159 2eabac18e3dc prosodyctl: Removed the admin_add and admin_remove from the commands_order variable João Duarte <jvsDuarte08@gmail.com> parents: 10157 diff changeset	1451 local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart", "reload", "about", "local_plugins",
2eabac18e3dc prosodyctl: Removed the admin_add and admin_remove from the commands_order variable João Duarte <jvsDuarte08@gmail.com> parents: 10157 diff changeset	1452 "enabled_plugins", "list"};
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1453
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1454 local done = {};
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1455
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1456 for _, command_name in ipairs(commands_order) do
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1457 local command_func = commands[command_name];
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1458 if command_func then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1459 command_func{ "--help" };
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1460 print""
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1461 done[command_name] = true;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1462 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1463 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1464
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1465 for command_name, command_func in pairs(commands) do
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1466 if not done[command_name] and not hidden_commands:contains(command_name) then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	1467 command_func{ "--help" };
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1468 print""
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1469 done[command_name] = true;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1470 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1471 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1472
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1473
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1474 os.exit(0);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1475 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1476
9780 c7727c13260f prosodyctl: Pass the original argv table to subcommands (with first argument removed) Kim Alvefur <zash@zash.se> parents: 9709 diff changeset	1477 os.exit(commands[command](arg));
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1478 end, watchers);
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	1479
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	1480 command_runner:run(true);

prosody

2eabac18e3dc

prosodyctl

Software / code / prosody

Annotate

prosodyctl @ 10159:2eabac18e3dc

Software `/` code `/` prosody