Mercurial > prosody-modules
annotate mod_block_s2s_subscriptions/mod_block_s2s_subscriptions.lua @ 4931:13070c6a7ce8
mod_http_muc_log: Fix exception on lack of trailing slash in room path
A request to /room leads to the match call returning nil which in turn
calls nodeprep(nil). In Prosody 0.11.x this does nothing and simply
returns the nil, while in 0.12 it is an error.
Now it redirects to the calendar view at /room/ - even for non-existant
rooms.
Discovered at a deployment with http_paths = { muc_log = "/" } and
requests to /robots.txt and similar, which now result in a uses redirect
before returning 404.
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Fri, 22 Apr 2022 14:29:32 +0200 |
parents | 70ff25db37fa |
children |
rev | line source |
---|---|
775
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
1 |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
2 local jid_split = require "util.jid".split; |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 local jid_bare = require "util.jid".bare; |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 local load_roster = require "core.rostermanager".load_roster; |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 local blocked_servers = module:get_option_set("block_s2s_subscriptions")._items; |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
8 function filter_presence(event) |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 if blocked_servers[event.origin.from_host] and event.stanza.attr.type == "subscribe" then |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
10 local stanza = event.stanza; |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
11 local to_user, to_host = jid_split(stanza.attr.to); |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
12 local roster = load_roster(to_user, to_host); |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 if roster and roster[jid_bare(stanza.attr.from)] then |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
14 return; -- In roster, pass through |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
15 end |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
16 return true; -- Drop |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
17 end |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
18 end |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
19 |
70ff25db37fa
mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 module:hook("presence/bare", filter_presence, 200); -- Client receiving |