Software / code / prosody
Changeset
9784:7fa273f8869e
mod_c2s, mod_s2s, mod_component: Log invalid XML escaped (fixes #734)
See 6ed0d6224d64
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Jan 2019 20:08:30 +0100 |
| parents | 9783:4c91afc43639 |
| children | 9785:ff88b03c343f |
| files | plugins/mod_c2s.lua plugins/mod_component.lua plugins/mod_s2s/mod_s2s.lua |
| diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_c2s.lua Mon Jan 14 00:17:02 2019 +0100 +++ b/plugins/mod_c2s.lua Tue Jan 15 20:08:30 2019 +0100 @@ -290,7 +290,7 @@ if data then local ok, err = stream:feed(data); if not ok then - log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")); + log("debug", "Received invalid XML (%s) %d bytes: %q", tostring(err), #data, data:sub(1, 300)); session:close("not-well-formed"); end end
--- a/plugins/mod_component.lua Mon Jan 14 00:17:02 2019 +0100 +++ b/plugins/mod_component.lua Tue Jan 15 20:08:30 2019 +0100 @@ -310,7 +310,7 @@ function session.data(_, data) local ok, err = stream:feed(data); if ok then return; end - module:log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")); + log("debug", "Received invalid XML (%s) %d bytes: %q", tostring(err), #data, data:sub(1, 300)); session:close("not-well-formed"); end
--- a/plugins/mod_s2s/mod_s2s.lua Mon Jan 14 00:17:02 2019 +0100 +++ b/plugins/mod_s2s/mod_s2s.lua Tue Jan 15 20:08:30 2019 +0100 @@ -595,8 +595,7 @@ if data then local ok, err = stream:feed(data); if ok then return; end - log("warn", "Received invalid XML: %s", data); - log("warn", "Problem was: %s", err); + log("debug", "Received invalid XML (%s) %d bytes: %q", tostring(err), #data, data:sub(1, 300)); session:close("not-well-formed"); end end
