util.xml: Do not allow doctypes, comments or processing instructions Yes. This is as bad as it sounds. CVE pending. In Prosody itself, this only affects mod_websocket, which uses util.xml to parse the <open/> frame, thus allowing unauthenticated remote DoS using Billion Laughs. However, third-party modules using util.xml may also be affected by this. This commit installs handlers which disallow the use of doctype declarations and processing instructions without any escape hatch. It, by default, also introduces such a handler for comments, however, there is a way to enable comments nontheless. This is because util.xml is used to parse human-facing data, where comments are generally a desirable feature, and also because comments are generally harmless.

     1

local st = require "util.stanza";

     2

local xmlns_csi = "urn:xmpp:csi:0";

     3

local csi_feature = st.stanza("csi", { xmlns = xmlns_csi });

     4

     5

module:hook("stream-features", function (event)

     6

	if event.origin.username then

     7

		event.features:add_child(csi_feature);

     8

	end

     9

end);

    10

    11

function refire_event(name)

    12

	return function (event)

    13

		if event.origin.username then

    14

			event.origin.state = event.stanza.name;

    15

			module:fire_event(name, event);

    16

			return true;

    17

		end

    18

	end;

    19

end

    20

    21

module:hook("stanza/"..xmlns_csi..":active", refire_event("csi-client-active"));

    22

module:hook("stanza/"..xmlns_csi..":inactive", refire_event("csi-client-inactive"));

    23