Mercurial > prosody-modules
comparison mod_s2s_never_encrypt_blacklist/mod_s2s_never_encrypt_blacklist.lua @ 922:661e2322b4df
mod_s2s_never_encrypt_blacklist: cleanup code, also hooks were mixed up.
author | Marco Cirillo <maranda@lightwitch.org> |
---|---|
date | Thu, 07 Mar 2013 16:55:28 +0100 |
parents | ef859c9d42c4 |
children | 5f38d762d071 |
comparison
equal
deleted
inserted
replaced
921:ef859c9d42c4 | 922:661e2322b4df |
---|---|
2 | 2 |
3 local bad_servers = module:get_option_set("tls_s2s_blacklist", {}) | 3 local bad_servers = module:get_option_set("tls_s2s_blacklist", {}) |
4 local bad_servers_ip = module:get_option_set("tls_s2s_blacklist_ip", {}) | 4 local bad_servers_ip = module:get_option_set("tls_s2s_blacklist_ip", {}) |
5 | 5 |
6 local function disable_tls_for_baddies_in(event) | 6 local function disable_tls_for_baddies_in(event) |
7 if bad_servers:contains(event.origin.to_host) or bad_servers_ip:contains(event.origin.conn:ip()) | 7 local session = event.origin |
8 then event.origin.conn.starttls = nil end | 8 if bad_servers:contains(session.from_host) or bad_servers_ip:contains(session.conn:ip()) then |
9 module:log("debug", "disabling tls on incoming stream from %s...", tostring(session.from_host)); | |
10 session.conn.starttls = nil | |
11 end | |
9 end | 12 end |
10 | 13 |
11 local function disable_tls_for_baddies_out(event) | 14 local function disable_tls_for_baddies_out(event) |
12 if bad_servers:contains(event.origin.from_host) or bad_servers_ip:contains(event.origin.conn:ip()) | 15 local session = event.origin |
13 then event.origin.conn.starttls = nil end | 16 if bad_servers:contains(session.to_host) then |
17 module:log("debug", "disabling tls on outgoing stream from %s...", tostring(session.to_host)); | |
18 session.conn.starttls = nil | |
19 end | |
14 end | 20 end |
15 | 21 |
16 module:hook("s2s-stream-features", disable_tls_for_baddies_out, 10) | 22 module:hook("s2s-stream-features", disable_tls_for_baddies_in, 600) |
17 module:hook("stanza/http://etherx.jabber.org/streams:features", disable_tls_for_baddies_in, 510) | 23 module:hook("stanza/http://etherx.jabber.org/streams:features", disable_tls_for_baddies_out, 600) |
18 |