Mercurial > prosody-modules

changeset 3811:eb25110696cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_rest: Factor out response content type selection Preparation for future addition of other encodings
author Kim Alvefur <zash@zash.se>
date Wed, 01 Jan 2020 16:01:25 +0100
parents 91ff86fc3b20
children f027b8b1e794
files mod_rest/mod_rest.lua
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mod_rest/mod_rest.lua	Wed Jan 01 15:43:47 2020 +0100
+++ b/mod_rest/mod_rest.lua	Wed Jan 01 16:01:25 2020 +0100
@@ -32,6 +32,10 @@
 	return nil, "unknown-payload-type";
 end
 
+local function decide_type()
+	return "application/xmpp+xml";
+end
+
 local function handle_post(event)
 	local request, response = event.request, event.response;
 	if not request.headers.authorization then
@@ -72,19 +76,20 @@
 		["xml:lang"] = payload.attr["xml:lang"],
 	};
 	module:log("debug", "Received[rest]: %s", payload:top_tag());
+	local send_type = decide_type(request.headers.accept)
 	if payload.name == "iq" then
 		if payload.attr.type ~= "get" and payload.attr.type ~= "set" then
 			return errors.new({ code = 422, text = "'iq' stanza must be of type 'get' or 'set'" });
 		end
 		return module:send_iq(payload):next(
 			function (result)
-				response.headers.content_type = "application/xmpp+xml";
 				module:log("debug", "Sending[rest]: %s", result.stanza:top_tag());
+				response.headers.content_type = send_type;
 				return tostring(result.stanza);
 			end,
 			function (error)
 				if error.context.stanza then
-					response.headers.content_type = "application/xmpp+xml";
+					response.headers.content_type = send_type;
 					module:log("debug", "Sending[rest]: %s", error.context.stanza:top_tag());
 					return tostring(error.context.stanza);
 				else
@@ -95,10 +100,10 @@
 		local origin = {};
 		function origin.send(stanza)
 			module:log("debug", "Sending[rest]: %s", stanza:top_tag());
+			response.headers.content_type = send_type;
 			response:send(tostring(stanza));
 			return true;
 		end
-		response.headers.content_type = "application/xmpp+xml";
 		if module:send(payload, origin) then
 			return 202;
 		else
@@ -118,6 +123,7 @@
 -- Forward stanzas from XMPP to HTTP and return any reply
 local rest_url = module:get_option_string("rest_callback_url", nil);
 if rest_url then
+	local send_type = module:get_option_string("rest_callback_content_type", "application/xmpp+xml");
 
 	local code2err = {
 		[400] = { condition = "bad-request"; type = "modify" };
@@ -164,7 +170,7 @@
 		http.request(rest_url, {
 				body = request_body,
 				headers = {
-					["Content-Type"] = "application/xmpp+xml",
+					["Content-Type"] = send_type,
 					["Content-Language"] = stanza.attr["xml:lang"],
 					Accept = "application/xmpp+xml, text/plain",
 				},