Software / code / prosody
Changeset
8208:b69b40a828fd
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 04 Sep 2017 10:08:04 +0200 |
| parents | 8203:a7863f4aae65 (current diff) 8207:8ea0484871e8 (diff) |
| children | 8209:39f24de4f53f |
| files | |
| diffstat | 3 files changed, 36 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/man/prosodyctl.man Tue Aug 29 15:24:53 2017 +0200 +++ b/man/prosodyctl.man Mon Sep 04 10:08:04 2017 +0200 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 1.19.2.1 .\" -.TH "PROSODYCTL" "1" "2015\-12\-23" "" "" +.TH "PROSODYCTL" "1" "2017\-09\-02" "" "" .hy .SH NAME .PP @@ -118,6 +118,12 @@ needed. .RS .RE +.TP +.B import hosts paths +Copy certificates for hosts into the certificate path and reload +prosody. +.RS +.RE .SS Debugging .PP prosodyctl can also show some information about the environment,
--- a/man/prosodyctl.markdown Tue Aug 29 15:24:53 2017 +0200 +++ b/man/prosodyctl.markdown Mon Sep 04 10:08:04 2017 +0200 @@ -2,7 +2,7 @@ author: - 'Dwayne Bent <dbb.1@liqd.org>' - Kim Alvefur -date: '2015-12-23' +date: '2017-09-02' section: 1 title: PROSODYCTL --- @@ -104,6 +104,10 @@ : Produce a config file for the list of hosts. Invoked automatically by 'request' and 'generate' if needed. +import hosts paths +: Copy certificates for hosts into the certificate path and reload + prosody. + Debugging --------- @@ -111,8 +115,8 @@ dependencies and such to aid in debugging. about -: Shows environment, various paths used by Prosody and - installed dependencies. +: Shows environment, various paths used by Prosody and installed + dependencies. check \[what\] : Performs various sanity checks on the configuration, DNS setup and
--- a/plugins/mod_mam/mod_mam.lua Tue Aug 29 15:24:53 2017 +0200 +++ b/plugins/mod_mam/mod_mam.lua Mon Sep 04 10:08:04 2017 +0200 @@ -228,6 +228,22 @@ return default; end +local function strip_stanza_id(stanza, user) + if stanza:get_child("stanza-id", xmlns_st_id) then + stanza = st.clone(stanza); + stanza:maptags(function (tag) + if tag.name == "stanza-id" and tag.attr.xmlns == xmlns_st_id then + local by_user, by_host, res = jid_prepped_split(tag.attr.by); + if not res and by_host == host and by_user == user then + return nil; + end + end + return tag; + end); + end + return stanza; +end + -- Handle messages local function message_handler(event, c2s) local origin, stanza = event.origin, event.stanza; @@ -243,19 +259,7 @@ local with = jid_bare(c2s and orig_to or orig_from); -- Filter out <stanza-id> that claim to be from us - if stanza:get_child("stanza-id", xmlns_st_id) then - stanza = st.clone(stanza); - stanza:maptags(function (tag) - if tag.name == "stanza-id" and tag.attr.xmlns == xmlns_st_id then - local by_user, by_host, res = jid_prepped_split(tag.attr.by); - if not res and by_host == module.host and by_user == store_user then - return nil; - end - end - return tag; - end); - event.stanza = stanza; - end + event.stanza = strip_stanza_id(stanza, store_user); -- We store chat messages or normal messages that have a body if not(orig_type == "chat" or (orig_type == "normal" and stanza:get_child("body")) ) then @@ -312,17 +316,13 @@ return message_handler(event, true); end -local function strip_stanza_id(event) - local strip_by = jid_bare(event.origin.full_jid); - event.stanza:maptags(function(tag) - if not ( tag.attr.xmlns == xmlns_st_id and tag.attr.by == strip_by ) then - return tag; - end - end); +-- Filter out <stanza-id> before the message leaves the server to prevent privacy leak. +local function strip_stanza_id_after_other_events(event) + event.stanza = strip_stanza_id(event.stanza, event.origin.username); end -module:hook("pre-message/bare", strip_stanza_id, -1); -module:hook("pre-message/full", strip_stanza_id, -1); +module:hook("pre-message/bare", strip_stanza_id_after_other_events, -1); +module:hook("pre-message/full", strip_stanza_id_after_other_events, -1); local cleanup_after = module:get_option_string("archive_expires_after", "1w"); local cleanup_interval = module:get_option_number("archive_cleanup_interval", 4 * 60 * 60);
