diff options
| author | Kim Alvefur <zash@zash.se> | 2022-10-20 14:04:56 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-10-20 14:04:56 +0200 |
| commit | a46ae8cb89d83b98a5e3f8da1d958905b2cb78ac (patch) | |
| tree | 3fbee31fc79cb0dd3a92ba31017caa958d4d4064 /plugins | |
| parent | d4f4f76c3c703a323a712119e60eb3dbe053cbbd (diff) | |
| download | prosody-a46ae8cb89d83b98a5e3f8da1d958905b2cb78ac.tar.gz prosody-a46ae8cb89d83b98a5e3f8da1d958905b2cb78ac.zip | |
mod_c2s,mod_s2s: Adapt to XEP-xxxx: Stream Limits Advertisement
Thanks MattJ
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_c2s.lua | 3 | ||||
| -rw-r--r-- | plugins/mod_s2s.lua | 7 | ||||
| -rw-r--r-- | plugins/mod_s2s_auth_certs.lua | 10 |
3 files changed, 16 insertions, 4 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua index a99d965d..9af463b6 100644 --- a/plugins/mod_c2s.lua +++ b/plugins/mod_c2s.lua @@ -132,7 +132,8 @@ function stream_callbacks._streamopened(session, attr) if features.tags[1] or session.full_jid then if stanza_size_limit then features:reset(); - features:tag("stanza-size-limit", { xmlns = "xmpp:prosody.im/stream/limits", bytes = string.format("%d", stanza_size_limit) }); + features:tag("limits", { xmlns = "urn:xmpp:stream-limits:0" }) + :text_tag("max-size", string.format("%d", stanza_size_limit)):up(); end send(features); else diff --git a/plugins/mod_s2s.lua b/plugins/mod_s2s.lua index afed3575..24a301f1 100644 --- a/plugins/mod_s2s.lua +++ b/plugins/mod_s2s.lua @@ -250,9 +250,9 @@ function module.add_host(module) module:hook("s2s-authenticated", make_authenticated, -1); module:hook("s2s-read-timeout", keepalive, -1); module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza) -- luacheck: ignore 212/stanza - local limits = stanza:get_child("stanza-size-limit", "xmpp:prosody.im/stream/limits"); + local limits = stanza:get_child("limits", "urn:xmpp:stream-limits:0"); if limits then - session.outgoing_stanza_size_limit = tonumber(limits.attr.bytes); + session.outgoing_stanza_size_limit = tonumber(limits:get_child_text("max-size")); end if session.type == "s2sout" then -- Stream is authenticated and we are seem to be done with feature negotiation, @@ -524,7 +524,8 @@ function stream_callbacks._streamopened(session, attr) if ( session.type == "s2sin" or session.type == "s2sout" ) or features.tags[1] then if stanza_size_limit then features:reset(); - features:tag("stanza-size-limit", { xmlns = "xmpp:prosody.im/stream/limits", bytes = string.format("%d", stanza_size_limit) }); + features:tag("limits", { xmlns = "urn:xmpp:stream-limits:0" }) + :text_tag("max-size", string.format("%d", stanza_size_limit)):up(); end log("debug", "Sending stream features: %s", features); diff --git a/plugins/mod_s2s_auth_certs.lua b/plugins/mod_s2s_auth_certs.lua index bde3cb82..5f5cce02 100644 --- a/plugins/mod_s2s_auth_certs.lua +++ b/plugins/mod_s2s_auth_certs.lua @@ -12,6 +12,8 @@ module:hook("s2s-check-certificate", function(event) local conn = session.conn; local log = session.log or log; + local secure_hostname = conn.extra and conn.extra.dane_hostname; + if not cert then log("warn", "No certificate provided by %s", host or "unknown host"); return; @@ -37,6 +39,14 @@ module:hook("s2s-check-certificate", function(event) -- We'll go ahead and verify the asserted identity if the -- connecting server specified one. + if secure_hostname then + if cert_verify_identity(secure_hostname, "xmpp-server", cert) then + module:log("info", "Secure SRV name delegation %q -> %q", secure_hostname, host); + session.cert_identity_status = "valid" + else + session.cert_identity_status = "invalid" + end + end if host then if cert_verify_identity(host, "xmpp-server", cert) then session.cert_identity_status = "valid" |