Mercurial > prosody-modules
annotate mod_muc_limits/mod_muc_limits.lua @ 6082:1a6cd0bbb7ab
mod_compliance_2023: Add 2023 Version of the compliance module, basis is the 2021 Version.
diff --git a/mod_compliance_2023/README.md b/mod_compliance_2023/README.md
new file mode 100644
--- /dev/null
+++ b/mod_compliance_2023/README.md
@@ -0,0 +1,22 @@
+---
+summary: XMPP Compliance Suites 2023 self-test
+labels:
+- Stage-Beta
+rockspec:
+ dependencies:
+ - mod_cloud_notify
+
+...
+
+Compare the list of enabled modules with
+[XEP-0479: XMPP Compliance Suites 2023] and produce basic report to the
+Prosody log file.
+
+If installed with the Prosody plugin installer then all modules needed for a green checkmark should be included. (With prosody 0.12 only [mod_cloud_notify] is not included with prosody and we need the community module)
+
+# Compatibility
+
+ Prosody-Version Status
+ --------------- ----------------------
+ trunk Works as of 2024-12-21
+ 0.12 Works
diff --git a/mod_compliance_2023/mod_compliance_2023.lua b/mod_compliance_2023/mod_compliance_2023.lua
new file mode 100644
--- /dev/null
+++ b/mod_compliance_2023/mod_compliance_2023.lua
@@ -0,0 +1,79 @@
+-- Copyright (c) 2021 Kim Alvefur
+--
+-- This module is MIT licensed.
+
+local hostmanager = require "core.hostmanager";
+
+local array = require "util.array";
+local set = require "util.set";
+
+local modules_enabled = module:get_option_inherited_set("modules_enabled");
+
+for host in pairs(hostmanager.get_children(module.host)) do
+ local component = module:context(host):get_option_string("component_module");
+ if component then
+ modules_enabled:add(component);
+ modules_enabled:include(module:context(host):get_option_set("modules_enabled", {}));
+ end
+end
+
+local function check(suggested, alternate, ...)
+ if set.intersection(modules_enabled, set.new({suggested; alternate; ...})):empty() then return suggested; end
+ return false;
+end
+
+local compliance = {
+ array {"Server"; check("tls"); check("disco")};
+
+ array {"Advanced Server"; check("pep", "pep_simple")};
+
+ array {"Web"; check("bosh"); check("websocket")};
+
+ -- No Server requirements for Advanced Web
+
+ array {"IM"; check("vcard_legacy", "vcard"); check("carbons"); check("http_file_share", "http_upload")};
+
+ array {
+ "Advanced IM";
+ check("vcard_legacy", "vcard");
+ check("blocklist");
+ check("muc");
+ check("private");
+ check("smacks");
+ check("mam");
+ check("bookmarks");
+ };
+
+ array {"Mobile"; check("smacks"); check("csi_simple", "csi_battery_saver")};
+
+ array {"Advanced Mobile"; check("cloud_notify")};
+
+ array {"A/V Calling"; check("turn_external", "external_services", "turncredentials", "extdisco")};
+
+};
+
+function check_compliance()
+ local compliant = true;
+ for _, suite in ipairs(compliance) do
+ local section = suite:pop(1);
+ if module:get_option_boolean("compliance_" .. section:lower():gsub("%A", "_"), true) then
+ local missing = set.new(suite:filter(function(m) return type(m) == "string" end):map(function(m) return "mod_" .. m end));
+ if suite[1] then
+ if compliant then
+ compliant = false;
+ module:log("warn", "Missing some modules for XMPP Compliance 2023");
+ end
+ module:log("info", "%s Compliance: %s", section, missing);
+ end
+ end
+ end
+
+ if compliant then module:log("info", "XMPP Compliance 2023: Compliant ✔️"); end
+end
+
+if prosody.start_time then
+ check_compliance()
+else
+ module:hook_global("server-started", check_compliance);
+end
+
| author | Menel <menel@snikket.de> |
|---|---|
| date | Sun, 22 Dec 2024 16:06:28 +0100 |
| parents | 6680a1f53353 |
| children |
| rev | line source |
|---|---|
|
1057
0b41122b19f9
mod_muc_limits: Abort loading on non-MUC hosts (thanks Ge0rG)
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
1 |
|
1768
163967467308
mod_muc_limits: Update to work with both the new and the old MUC API
Kim Alvefur <zash@zash.se>
parents:
1428
diff
changeset
|
2 local mod_muc = module:depends"muc"; |
|
163967467308
mod_muc_limits: Update to work with both the new and the old MUC API
Kim Alvefur <zash@zash.se>
parents:
1428
diff
changeset
|
3 local rooms = rawget(mod_muc, "rooms"); -- Old MUC API |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 |
|
1042
5fd0860c86cd
mod_muc_limits: Allow stanzas from affiliated users even if they are not in the room
Matthew Wild <mwild1@gmail.com>
parents:
1040
diff
changeset
|
5 local jid_split, jid_bare = require "util.jid".split, require "util.jid".bare; |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 local st = require "util.stanza"; |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 local new_throttle = require "util.throttle".create; |
|
1038
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
8 local t_insert, t_concat = table.insert, table.concat; |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 |
|
557
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
10 local xmlns_muc = "http://jabber.org/protocol/muc"; |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
11 |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
12 local period = math.max(module:get_option_number("muc_event_rate", 0.5), 0); |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 local burst = math.max(module:get_option_number("muc_burst_factor", 6), 1); |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
14 |
|
1036
a44e755f7579
mod_muc_limits: Add muc_max_nick_length option, defaulting to 23 (bytes)
Matthew Wild <mwild1@gmail.com>
parents:
1035
diff
changeset
|
15 local max_nick_length = module:get_option_number("muc_max_nick_length", 23); -- Default chosen through scientific methods |
|
5566
f71d66bd87be
mod_muc_limits: Add a limit on number of lines per message
Kim Alvefur <zash@zash.se>
parents:
5564
diff
changeset
|
16 local max_line_count = module:get_option_number("muc_max_line_count", 23); -- Default chosen through s/scientific methods/copy and paste/ |
|
5567
d52cc18f0aa8
mod_muc_limits: Add a limit on number of bytes in a message body
Kim Alvefur <zash@zash.se>
parents:
5566
diff
changeset
|
17 local max_char_count = module:get_option_number("muc_max_char_count", 5664); -- Default chosen by multiplying a number by 23 |
|
5601
6680a1f53353
mod_muc_limits: Reduce cost of multi-line messages, make configurable
Kim Alvefur <zash@zash.se>
parents:
5567
diff
changeset
|
18 local base_cost = math.max(module:get_option_number("muc_limit_base_cost", 1), 0); |
|
6680a1f53353
mod_muc_limits: Reduce cost of multi-line messages, make configurable
Kim Alvefur <zash@zash.se>
parents:
5567
diff
changeset
|
19 local line_multiplier = math.max(module:get_option_number("muc_line_count_multiplier", 0.1), 0); |
|
5566
f71d66bd87be
mod_muc_limits: Add a limit on number of lines per message
Kim Alvefur <zash@zash.se>
parents:
5564
diff
changeset
|
20 |
|
3965
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
21 local join_only = module:get_option_boolean("muc_limit_joins_only", false); |
|
1038
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
22 local dropped_count = 0; |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
23 local dropped_jids; |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
24 |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
25 local function log_dropped() |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
26 module:log("warn", "Dropped %d stanzas from %d JIDs: %s", dropped_count, #dropped_jids, t_concat(dropped_jids, ", ")); |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
27 dropped_count = 0; |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
28 dropped_jids = nil; |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
29 end |
|
1036
a44e755f7579
mod_muc_limits: Add muc_max_nick_length option, defaulting to 23 (bytes)
Matthew Wild <mwild1@gmail.com>
parents:
1035
diff
changeset
|
30 |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
31 local function handle_stanza(event) |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 local origin, stanza = event.origin, event.stanza; |
|
555
2356ad05fdb6
mod_muc_limits: Don't limit room leaving
Matthew Wild <mwild1@gmail.com>
parents:
554
diff
changeset
|
33 if stanza.name == "presence" and stanza.attr.type == "unavailable" then -- Don't limit room leaving |
|
2356ad05fdb6
mod_muc_limits: Don't limit room leaving
Matthew Wild <mwild1@gmail.com>
parents:
554
diff
changeset
|
34 return; |
|
2356ad05fdb6
mod_muc_limits: Don't limit room leaving
Matthew Wild <mwild1@gmail.com>
parents:
554
diff
changeset
|
35 end |
|
1042
5fd0860c86cd
mod_muc_limits: Allow stanzas from affiliated users even if they are not in the room
Matthew Wild <mwild1@gmail.com>
parents:
1040
diff
changeset
|
36 local dest_room, dest_host, dest_nick = jid_split(stanza.attr.to); |
|
3417
1534d0715d35
mod_muc_limits: Add support for new MUC API in Prosody 0.11
Kim Alvefur <zash@zash.se>
parents:
3402
diff
changeset
|
37 local room = event.room or rooms[dest_room.."@"..dest_host]; |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
38 if not room then return; end |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
39 local from_jid = stanza.attr.from; |
|
3418
9be9dd434813
mod_muc_limits: Simplify bypass for affiliated users
Kim Alvefur <zash@zash.se>
parents:
3417
diff
changeset
|
40 if room:get_affiliation(jid_bare(from_jid)) then |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
41 module:log("debug", "Skipping stanza from affiliated user..."); |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
42 return; |
|
1058
1255de347dd4
mod_muc_limits: Fix traceback on presence sent to the room's bare JID
Matthew Wild <mwild1@gmail.com>
parents:
1057
diff
changeset
|
43 elseif dest_nick and max_nick_length and stanza.name == "presence" and not room._occupants[stanza.attr.to] and #dest_nick > max_nick_length then |
|
1036
a44e755f7579
mod_muc_limits: Add muc_max_nick_length option, defaulting to 23 (bytes)
Matthew Wild <mwild1@gmail.com>
parents:
1035
diff
changeset
|
44 module:log("debug", "Forbidding long (%d bytes) nick in %s", #dest_nick, dest_room) |
|
a44e755f7579
mod_muc_limits: Add muc_max_nick_length option, defaulting to 23 (bytes)
Matthew Wild <mwild1@gmail.com>
parents:
1035
diff
changeset
|
45 origin.send(st.error_reply(stanza, "modify", "policy-violation", "Your nick name is too long, please use a shorter one") |
|
a44e755f7579
mod_muc_limits: Add muc_max_nick_length option, defaulting to 23 (bytes)
Matthew Wild <mwild1@gmail.com>
parents:
1035
diff
changeset
|
46 :up():tag("x", { xmlns = xmlns_muc })); |
|
a44e755f7579
mod_muc_limits: Add muc_max_nick_length option, defaulting to 23 (bytes)
Matthew Wild <mwild1@gmail.com>
parents:
1035
diff
changeset
|
47 return true; |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
48 end |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
49 local throttle = room.throttle; |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
50 if not room.throttle then |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
51 throttle = new_throttle(period*burst, burst); |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
52 room.throttle = throttle; |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
53 end |
|
5601
6680a1f53353
mod_muc_limits: Reduce cost of multi-line messages, make configurable
Kim Alvefur <zash@zash.se>
parents:
5567
diff
changeset
|
54 local cost = base_cost; |
|
5564
731ba9400c10
mod_muc_limits: Raise cost for multi-line messages
Kim Alvefur <zash@zash.se>
parents:
3965
diff
changeset
|
55 local body = stanza:get_child_text("body"); |
|
731ba9400c10
mod_muc_limits: Raise cost for multi-line messages
Kim Alvefur <zash@zash.se>
parents:
3965
diff
changeset
|
56 if body then |
|
731ba9400c10
mod_muc_limits: Raise cost for multi-line messages
Kim Alvefur <zash@zash.se>
parents:
3965
diff
changeset
|
57 -- TODO calculate a text diagonal cross-section or some mathemagical |
|
731ba9400c10
mod_muc_limits: Raise cost for multi-line messages
Kim Alvefur <zash@zash.se>
parents:
3965
diff
changeset
|
58 -- number, maybe some cost multipliers |
|
5567
d52cc18f0aa8
mod_muc_limits: Add a limit on number of bytes in a message body
Kim Alvefur <zash@zash.se>
parents:
5566
diff
changeset
|
59 if #body > max_char_count then |
|
d52cc18f0aa8
mod_muc_limits: Add a limit on number of bytes in a message body
Kim Alvefur <zash@zash.se>
parents:
5566
diff
changeset
|
60 origin.send(st.error_reply(stanza, "modify", "policy-violation", "Your message is too long, please write a shorter one") |
|
d52cc18f0aa8
mod_muc_limits: Add a limit on number of bytes in a message body
Kim Alvefur <zash@zash.se>
parents:
5566
diff
changeset
|
61 :up():tag("x", { xmlns = xmlns_muc })); |
|
d52cc18f0aa8
mod_muc_limits: Add a limit on number of bytes in a message body
Kim Alvefur <zash@zash.se>
parents:
5566
diff
changeset
|
62 return true; |
|
d52cc18f0aa8
mod_muc_limits: Add a limit on number of bytes in a message body
Kim Alvefur <zash@zash.se>
parents:
5566
diff
changeset
|
63 end |
|
5564
731ba9400c10
mod_muc_limits: Raise cost for multi-line messages
Kim Alvefur <zash@zash.se>
parents:
3965
diff
changeset
|
64 local body_lines = select(2, body:gsub("\n[^\n]*", "")); |
|
5566
f71d66bd87be
mod_muc_limits: Add a limit on number of lines per message
Kim Alvefur <zash@zash.se>
parents:
5564
diff
changeset
|
65 if body_lines > max_line_count then |
|
f71d66bd87be
mod_muc_limits: Add a limit on number of lines per message
Kim Alvefur <zash@zash.se>
parents:
5564
diff
changeset
|
66 origin.send(st.error_reply(stanza, "modify", "policy-violation", "Your message is too long, please write a shorter one"):up() |
|
f71d66bd87be
mod_muc_limits: Add a limit on number of lines per message
Kim Alvefur <zash@zash.se>
parents:
5564
diff
changeset
|
67 :tag("x", { xmlns = xmlns_muc; })); |
|
f71d66bd87be
mod_muc_limits: Add a limit on number of lines per message
Kim Alvefur <zash@zash.se>
parents:
5564
diff
changeset
|
68 return true; |
|
f71d66bd87be
mod_muc_limits: Add a limit on number of lines per message
Kim Alvefur <zash@zash.se>
parents:
5564
diff
changeset
|
69 end |
|
5601
6680a1f53353
mod_muc_limits: Reduce cost of multi-line messages, make configurable
Kim Alvefur <zash@zash.se>
parents:
5567
diff
changeset
|
70 cost = cost + (body_lines * line_multiplier); |
|
5564
731ba9400c10
mod_muc_limits: Raise cost for multi-line messages
Kim Alvefur <zash@zash.se>
parents:
3965
diff
changeset
|
71 end |
|
731ba9400c10
mod_muc_limits: Raise cost for multi-line messages
Kim Alvefur <zash@zash.se>
parents:
3965
diff
changeset
|
72 if not throttle:poll(cost) then |
|
1038
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
73 module:log("debug", "Dropping stanza for %s@%s from %s, over rate limit", dest_room, dest_host, from_jid); |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
74 if not dropped_jids then |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
75 dropped_jids = { [from_jid] = true, from_jid }; |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
76 module:add_timer(5, log_dropped); |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
77 elseif not dropped_jids[from_jid] then |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
78 dropped_jids[from_jid] = true; |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
79 t_insert(dropped_jids, from_jid); |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
80 end |
|
edb06824a5a4
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds
Matthew Wild <mwild1@gmail.com>
parents:
1036
diff
changeset
|
81 dropped_count = dropped_count + 1; |
|
1205
7d2d440e2fa5
mod_muc_limits: Just drop error stanzas instead of bouncing them with more error stanzas
Kim Alvefur <zash@zash.se>
parents:
1058
diff
changeset
|
82 if stanza.attr.type == "error" then -- We don't want to bounce errors |
|
7d2d440e2fa5
mod_muc_limits: Just drop error stanzas instead of bouncing them with more error stanzas
Kim Alvefur <zash@zash.se>
parents:
1058
diff
changeset
|
83 return true; |
|
7d2d440e2fa5
mod_muc_limits: Just drop error stanzas instead of bouncing them with more error stanzas
Kim Alvefur <zash@zash.se>
parents:
1058
diff
changeset
|
84 end |
|
557
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
85 local reply = st.error_reply(stanza, "wait", "policy-violation", "The room is currently overactive, please try again later"); |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
86 if body then |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
87 reply:up():tag("body"):text(body):up(); |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
88 end |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
89 local x = stanza:get_child("x", xmlns_muc); |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
90 if x then |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
91 reply:add_child(st.clone(x)); |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
92 end |
|
14f39769c9e0
mod_muc_limits: Echo any MUC <x> or <body> in the error reply (required to make Gajim display the error)
Matthew Wild <mwild1@gmail.com>
parents:
556
diff
changeset
|
93 origin.send(reply); |
|
554
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
94 return true; |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
95 end |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
96 end |
|
a2b0174b5c48
mod_muc_limits: New module to impose overall rate-limits on a MUC (not on individual users)
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
97 |
|
3449
5e91a34b1e71
mod_muc_limits: Fix being unload on trunk
Kim Alvefur <zash@zash.se>
parents:
3418
diff
changeset
|
98 if rooms then |
|
5e91a34b1e71
mod_muc_limits: Fix being unload on trunk
Kim Alvefur <zash@zash.se>
parents:
3418
diff
changeset
|
99 function module.unload() |
|
3964
15355caf4553
mod_muc_limits: Add [luacheck] annotation to silence unused loop variable warning
Matthew Wild <mwild1@gmail.com>
parents:
3449
diff
changeset
|
100 for room_jid, room in pairs(rooms) do --luacheck: ignore 213/room_jid |
|
3449
5e91a34b1e71
mod_muc_limits: Fix being unload on trunk
Kim Alvefur <zash@zash.se>
parents:
3418
diff
changeset
|
101 room.throttle = nil; |
|
5e91a34b1e71
mod_muc_limits: Fix being unload on trunk
Kim Alvefur <zash@zash.se>
parents:
3418
diff
changeset
|
102 end |
|
556
e50bdbaa7802
mod_muc_limits: Remove throttle object from all rooms on unload (to make sure new settings are applied on reload)
Matthew Wild <mwild1@gmail.com>
parents:
555
diff
changeset
|
103 end |
|
e50bdbaa7802
mod_muc_limits: Remove throttle object from all rooms on unload (to make sure new settings are applied on reload)
Matthew Wild <mwild1@gmail.com>
parents:
555
diff
changeset
|
104 |
|
3417
1534d0715d35
mod_muc_limits: Add support for new MUC API in Prosody 0.11
Kim Alvefur <zash@zash.se>
parents:
3402
diff
changeset
|
105 module:hook("presence/full", handle_stanza, 501); |
|
3965
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
106 if not join_only then |
|
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
107 module:hook("message/bare", handle_stanza, 501); |
|
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
108 module:hook("message/full", handle_stanza, 501); |
|
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
109 module:hook("presence/bare", handle_stanza, 501); |
|
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
110 end |
|
3417
1534d0715d35
mod_muc_limits: Add support for new MUC API in Prosody 0.11
Kim Alvefur <zash@zash.se>
parents:
3402
diff
changeset
|
111 else |
|
1534d0715d35
mod_muc_limits: Add support for new MUC API in Prosody 0.11
Kim Alvefur <zash@zash.se>
parents:
3402
diff
changeset
|
112 module:hook("muc-occupant-pre-join", handle_stanza); |
|
3965
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
113 if not join_only then |
|
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
114 module:hook("muc-occupant-pre-change", handle_stanza); |
|
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
115 module:hook("muc-occupant-groupchat", handle_stanza); |
|
2b10e51d85a6
mod_muc_limits: Add config option to limit to join stanzas only
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
116 end |
|
3417
1534d0715d35
mod_muc_limits: Add support for new MUC API in Prosody 0.11
Kim Alvefur <zash@zash.se>
parents:
3402
diff
changeset
|
117 end |
