diff mod_dnsupdate/mod_dnsupdate.lua @ 6413:0703ef9f8db8

mod_dnsupdate: Support multiple hosts/components
author Kim Alvefur <zash@zash.se>
date Mon, 23 Feb 2026 16:22:33 +0100
parents 3ae0d518b739
children
line wrap: on
line diff
--- a/mod_dnsupdate/mod_dnsupdate.lua	Sun Feb 22 01:08:33 2026 -0500
+++ b/mod_dnsupdate/mod_dnsupdate.lua	Mon Feb 23 16:22:33 2026 +0100
@@ -33,7 +33,7 @@
 		value_params = { domain = true; primary = true; target = true; ttl = true };
 	});
 
-	if not arg[1] or arg[2] or not opts or opts.help or not opts.domain then
+	if not arg[1] or not opts or opts.help or not opts.domain then
 		local out = opts.help and io.stdout or io.stderr;
 		out:write("prosodyctl mod_dnsupdate [options] virtualhost\n");
 		out:write("\t-d --domain\tbase domain name *required*\n");
@@ -46,21 +46,6 @@
 		return opts and opts.help and 0 or 1;
 	end
 
-	local vhost = nameprep(arg[1]); -- TODO loop over arg[]?
-	if not vhost then
-		module:log("error", "Host %q fails normalization", arg[1]);
-		return 1;
-	end
-	local ihost = idna_to_ascii(vhost);
-	if not ihost then
-		module:log("error", "Host %q fails IDNA", vhost);
-		return 1;
-	end
-	if not config.get(vhost, "component_module") and not config.get(vhost, "defined") then
-		module:log("error", "Host %q is not defined in the config", vhost);
-		return 1;
-	end
-
 	local domain = validate_dnsname_option(opts, "domain");
 	if not domain then
 		module:log("error", "--domain is required");
@@ -72,64 +57,81 @@
 		module:log("error", "Could not discover primary name server, specify it with --primary");
 		return 1;
 	end
-	local target = validate_dnsname_option(opts, "target", module:context(vhost):get_option_string("xmpp_host", ihost));
-	-- TODO validate that target has A/AAAA
-
-	local configured_ports = {
-		["xmpp-client"] = module:get_option_array("c2s_ports", { 5222 });
-		["xmpp-server"] = module:get_option_array("s2s_ports", { 5269 });
-		["xmpps-client"] = module:get_option_array("c2s_direct_tls_ports", {});
-		["xmpps-server"] = module:get_option_array("s2s_direct_tls_ports", {});
-	};
-
-	local modules_enabled = modulemanager.get_modules_for_host(vhost);
-	if not modules_enabled:contains("c2s") then
-		configured_ports["xmpp-client"] = {};
-		configured_ports["xmpps-client"] = {};
-	end
-	if not modules_enabled:contains("s2s") then
-		configured_ports["xmpp-server"] = {};
-		configured_ports["xmpps-server"] = {};
-	end
-
-	if modules_enabled:contains("net_multiplex") then
-		for opt, ports in pairs(configured_ports) do
-			ports:append(module:get_option_array(opt:sub(1, 5) == "xmpps" and "ssl_ports" or "ports", {}));
-		end
-	end
-
-	local existing_srv = {};
-	for _, service in ipairs(services) do
-		existing_srv[service] = dns:lookup_promise(("_%s._tcp.%s"):format(service, ihost), "SRV");
-	end
 
 	print("zone", domain);
 	print("server", primary);
 	print("ttl " .. tostring(opts.ttl or 60 * 60));
 
-	for _, service in ipairs(services) do
-		local config_ports = set.new(configured_ports[service]);
-		local dns_ports = set.new();
+	for _, vhost in ipairs(arg) do
+		if not vhost then
+			module:log("error", "Host %q fails normalization", arg[1]);
+			return 1;
+		end
+		local ihost = idna_to_ascii(vhost);
+		if not ihost then
+			module:log("error", "Host %q fails IDNA", vhost);
+			return 1;
+		end
+		if not config.get(vhost, "component_module") and not config.get(vhost, "defined") then
+			module:log("error", "Host %q is not defined in the config", vhost);
+			return 1;
+		end
+
+		local target = validate_dnsname_option(opts, "target", module:context(vhost):get_option_string("xmpp_host", ihost));
+		-- TODO validate that target has A/AAAA
 
-		if (opts.reset or opts.remove) and not opts.each then
-			print(("del _%s._tcp.%s IN SRV"):format(service, ihost));
-		else
-			local records = (async.wait_for(existing_srv[service]));
-			for _, rr in ipairs(records) do
-				if target == nameprep(rr.srv.target):gsub("%.$", "") then
-					dns_ports:add(rr.srv.port)
-				elseif opts.each then
-					print(("del _%s._tcp.%s IN SRV %s"):format(service, ihost, rr));
-				end
+		local configured_ports = {
+			["xmpp-client"] = module:get_option_array("c2s_ports", { 5222 });
+			["xmpp-server"] = module:get_option_array("s2s_ports", { 5269 });
+			["xmpps-client"] = module:get_option_array("c2s_direct_tls_ports", {});
+			["xmpps-server"] = module:get_option_array("s2s_direct_tls_ports", {});
+		};
+
+		local modules_enabled = modulemanager.get_modules_for_host(vhost);
+		if not modules_enabled:contains("c2s") then
+			configured_ports["xmpp-client"] = {};
+			configured_ports["xmpps-client"] = {};
+		end
+		if not modules_enabled:contains("s2s") then
+			configured_ports["xmpp-server"] = {};
+			configured_ports["xmpps-server"] = {};
+		end
+
+		if modules_enabled:contains("net_multiplex") then
+			for opt, ports in pairs(configured_ports) do
+				ports:append(module:get_option_array(opt:sub(1, 5) == "xmpps" and "ssl_ports" or "ports", {}));
 			end
 		end
 
-		if not opts.remove then
-			if config_ports:empty() then
-				print(("add _%s._tcp.%s IN SRV 0 0 0 ."):format(service, ihost));
+		local existing_srv = {};
+		for _, service in ipairs(services) do
+			existing_srv[service] = dns:lookup_promise(("_%s._tcp.%s"):format(service, ihost), "SRV");
+		end
+
+		for _, service in ipairs(services) do
+			local config_ports = set.new(configured_ports[service]);
+			local dns_ports = set.new();
+
+			if (opts.reset or opts.remove) and not opts.each then
+				print(("del _%s._tcp.%s IN SRV"):format(service, ihost));
 			else
-				for port in (config_ports - dns_ports) do
-					print(("add _%s._tcp.%s IN SRV 1 1 %d %s"):format(service, ihost, port, target));
+				local records = (async.wait_for(existing_srv[service]));
+				for _, rr in ipairs(records) do
+					if target == nameprep(rr.srv.target):gsub("%.$", "") then
+						dns_ports:add(rr.srv.port)
+					elseif opts.each then
+						print(("del _%s._tcp.%s IN SRV %s"):format(service, ihost, rr));
+					end
+				end
+			end
+
+			if not opts.remove then
+				if config_ports:empty() then
+					print(("add _%s._tcp.%s IN SRV 0 0 0 ."):format(service, ihost));
+				else
+					for port in (config_ports - dns_ports) do
+						print(("add _%s._tcp.%s IN SRV 1 1 %d %s"):format(service, ihost, port, target));
+					end
 				end
 			end
 		end