prosody-hg: plugins/mod_s2s.lua history

Merge 13.0->trunk

Wed, 29 Apr 2026 17:12:59 +0100

Merge 13.0->trunk

Merge 0.12->13.0

Wed, 29 Apr 2026 17:12:11 +0100

Merge 0.12->13.0

mod_c2s, mod_s2s: Add configurable limit for stanza max child elements

Thu, 16 Apr 2026 18:53:34 +0100

mod_c2s, mod_s2s: Add configurable limit for stanza max child elements

mod_c2s,mod_s2s: Introduce separate pre-authentication stanza size limit

Tue, 07 Apr 2026 20:35:41 +0200

mod_c2s,mod_s2s: Introduce separate pre-authentication stanza size limit

This should prevent unauthenticated resource use via the XML parser.

Merge 13.0->trunk

Fri, 17 Apr 2026 19:43:00 +0100

Merge 13.0->trunk

mod_s2s: Update event data to include session if created

Fri, 17 Apr 2026 19:40:56 +0100

mod_s2s: Update event data to include session if created

Merge 13.0->trunk

Fri, 17 Apr 2026 17:47:01 +0100

Merge 13.0->trunk

mod_s2s: Fire consistent event data across all 'connected' events

Fri, 17 Apr 2026 17:46:31 +0100

mod_s2s: Fire consistent event data across all 'connected' events

This fixes a traceback in the new mod_limits IP limiting code when matching
s2sin connections.

Merge 13.0->trunk

Fri, 17 Apr 2026 14:35:32 +0100

Merge 13.0->trunk

mod_c2s, mod_s2s: Add configurable limit for stanza max child elements

Thu, 16 Apr 2026 18:53:34 +0100

mod_c2s, mod_s2s: Add configurable limit for stanza max child elements

mod_s2s: Add 'conn' to s2s-connected event object

Thu, 16 Apr 2026 16:12:34 +0100

mod_s2s: Add 'conn' to s2s-connected event object

This is for consistency with other event handlers.

mod_c2s,mod_s2s: Introduce separate pre-authentication stanza size limit

Tue, 07 Apr 2026 20:35:41 +0200

mod_c2s,mod_s2s: Introduce separate pre-authentication stanza size limit

This should prevent unauthenticated resource use via the XML parser.

Merge 13.0->trunk

Sun, 22 Mar 2026 11:28:52 +0100

Merge 13.0->trunk

mod_s2s: Fully validate stream addressing

Sat, 14 Mar 2026 01:19:27 +0100

mod_s2s: Fully validate stream addressing

NAMEPREP is not enough to validate an XMPP hostpart, missing IDNA and
the IP literal special cases.

Merge 13.0->trunk

Tue, 06 Jan 2026 17:37:46 +0100

Merge 13.0->trunk

mod_s2s: Explicitly prevent sending recursive error replies when queue is full

Sun, 04 Jan 2026 17:58:26 +0100

mod_s2s: Explicitly prevent sending recursive error replies when queue is full

mod_s2s: Fix traceback when outgoing s2s queue is full (thanks tom)

Sun, 04 Jan 2026 17:54:48 +0100

mod_s2s: Fix traceback when outgoing s2s queue is full (thanks tom)

When session.send() is used, no 'origin' field is included in the event,
leading to an error attempting to index nil.

mod_s2s: Report outgoing connection failures to remote servers

Tue, 30 Dec 2025 17:45:58 +0100

mod_s2s: Report outgoing connection failures to remote servers

When setting up a new server, it can be easy to make mistakes with DNS,
firewall or port forwarding that results in the ability to make outgoing
connections, but not receive incoming, leading to a half-working setup
where messages can be sent but not received. This can be difficult to
diagnose. It is also difficult to inform the other end about the problem
without a working channel in that direction, but when an incoming
connection has been established, it can be closed with a stream error,
which hopefully shows up in logs.

mod_s2s, s2smanager: Experimental s2s_block_immediate_retries option

Thu, 16 Oct 2025 18:29:03 +0100

mod_s2s, s2smanager: Experimental s2s_block_immediate_retries option

Currently, if Prosody fails to connect to a remote domain, any pending stanzas
are bounced back to the sender. If the code processing these stanzas responds
to the error, we will begin a new outgoing connection before we've even
finished processing the last one.

This generally hasn't been a problem, Prosody handles it fine.

However, it is questionable whether this is sensible behaviour (if we *just*
failed to connect, will an immediate retry even work most of the time?). It
can also lead to some awkward traffic patterns, e.g. when combined with MUC.

For example, when a MUC receives an error from a remote user, it may kick that
user from the MUC. This will cause a stanza to be sent to everyone else in the
MUC. If other users from the same domain are present, the notification will be
sent to the remote domain, triggering a new connection attempt for no reason
(the user was likely about to be kicked anyway after the sendq had finished
being bounced).

This new option enables an alternative strategy, where attempts to send to the
remote domain that failed will be rejected until the sendq has finished being
processed.

To enable the new behaviour, set the global option:

s2s_block_immediate_retries = true

mod_s2s: Optimize order of table accesses

Tue, 14 Oct 2025 22:12:51 +0200

mod_s2s: Optimize order of table accesses

No need to fetch hosts[to] multiple times if we just load it into a
local earlier

mod_s2s: Close outgoing pre-auth s2s sessions when their stanza queue is full

Thu, 25 Sep 2025 16:56:09 +0100

mod_s2s: Close outgoing pre-auth s2s sessions when their stanza queue is full

mod_s2s: Fix log to use formatting instead of concatenation (fixes #1461)

Sat, 24 May 2025 15:53:46 +0200

mod_s2s: Fix log to use formatting instead of concatenation (fixes #1461)

Somehow this escaped semgrep, probably because the (x or y)() syntax.

Thanks Ge0rG

mod_s2s: Handle single message from chain validation

Tue, 01 Apr 2025 20:42:53 +0200

mod_s2s: Handle single message from chain validation

Setting ssl.verifyext enables a callback that collects all errors from
every layer of the certificate chain. Otherwise a single string is
returned, which we did not handle before.

mod_s2s: Deal with OpenSSL changing spelling in strings

Tue, 01 Apr 2025 18:15:34 +0200

mod_s2s: Deal with OpenSSL changing spelling in strings

https://github.com/openssl/openssl/commit/ade08735f9d0ac85d611c5abee8a1df651bbca13

core.certmanager: Move LuaSec verification tweaks to mod_s2s

Sat, 15 Feb 2025 00:19:01 +0100

core.certmanager: Move LuaSec verification tweaks to mod_s2s

These two settings are only really needed for XMPP server-to-server
connections.

mod_c2s, mod_s2s: Support for queuing callbacks to run in session thread

Thu, 21 Nov 2024 17:02:07 +0000

mod_c2s, mod_s2s: Support for queuing callbacks to run in session thread

This allows certain session-specific code that needs to run in the async
context, but is itself triggered outside of that context (e.g. timers), to
be queued.

An example of this is the session destruction code of mod_smacks, when the
hibernation timeout is reached.

mod_s2s: Really fix logging of outgoing stanza queue counts

Mon, 11 Nov 2024 08:49:57 +0100

mod_s2s: Really fix logging of outgoing stanza queue counts

Some confusion happened in 42b98ee73ca8, possibly because .count()
returns the items?

mod_s2s: Clone queued outgoing stanzas to prevent changes

Sun, 10 Nov 2024 15:10:26 +0100

mod_s2s: Clone queued outgoing stanzas to prevent changes

This clone call was lost in 902d25cd0557

Affects e.g. presence broadcasts, where the same stanza is sent many
times while mutating the 'to' attribute.

mod_s2s: Fix counting items in outgoing stanza queue (in logs)

Sun, 10 Nov 2024 15:06:00 +0100

mod_s2s: Fix counting items in outgoing stanza queue (in logs)

mod_s2s: Limit size of outgoing stanza queue

Sat, 09 Nov 2024 16:47:14 +0100

mod_s2s: Limit size of outgoing stanza queue

This queue is used to buffer stanzas while waiting for an outgoing s2s
connection to be established.

Limit it to prevent excessive memory usage.

Default chosen to approximate how many average stanzas fits in the
server_epoll default max_send_buffer_size of 32 MiB

Returns a custom error instead of the default core.stanza_router
"Communication with remote domains is not enabled" from is sent back,
which does not describe what is happening here.

Closes #1106

util.error: Use is_error() instead of is_err() everywhere

Tue, 29 Oct 2024 14:10:02 +0100

util.error: Use is_error() instead of is_err() everywhere

Continuation of 4b39691a274e

mod_s2s: Fix traceback due to type confusion (Thanks Menel)

Mon, 26 Aug 2024 19:21:03 +0200

mod_s2s: Fix traceback due to type confusion (Thanks Menel)

The code assumed a 2-d sparse array but it could also be a string.

mod_c2s,mod_s2s: Advertise idle-seconds per XEP-0478

Sat, 03 Aug 2024 16:28:59 +0200

mod_c2s,mod_s2s: Advertise idle-seconds per XEP-0478

This is the time after liveness checks are performed via the respective
read-timeout event, which by default involves sending a space character
but could be overridden e.g. as is done by mod_smacks.

Only advertised, unsure what we would do with it.

mod_s2s: Comment on why we avoid hostnames in stanza bounce messages

Sat, 24 Feb 2024 17:45:50 +0100

mod_s2s: Comment on why we avoid hostnames in stanza bounce messages

mod_s2s: Close connection on smacks timeout

Sat, 02 Dec 2023 20:20:05 +0100

mod_s2s: Close connection on smacks timeout

This merges the mod_s2s_smacks_timeout behavior from prosody-modules

This event is fired by mod_smacks when the connection has not responded
to an ack-request for a period of time defaulting to 30 seconds,
indicating that the connection has become stuck or non-responsive.
Closing it prevents routing further messages via this connection and
frees resources. A stuck connection may otherwise remain until for a
time determined by the OS TCP subsystem, which can be quite long.

mod_s2s: Automagically enable DANE for s2sin if 'use_dane' is enabled

Thu, 02 Nov 2023 09:39:03 +0100

mod_s2s: Automagically enable DANE for s2sin if 'use_dane' is enabled

Simplifies configuration, only one already existing boolean to flip.

mod_s2s: Fix reporting of DANE mismatch

Sat, 05 Aug 2023 20:41:24 +0200

mod_s2s: Fix reporting of DANE mismatch

Thought it was a case mismatch at first, fixed that, but it changed
nothing because the error was in the leaf part of the errors, not the
chain part.

plugins: Use integer config API with interval specification where sensible

Mon, 17 Jul 2023 01:38:54 +0200

plugins: Use integer config API with interval specification where sensible

Many of these fall into a few categories:
- util.cache size, must be >= 1
- byte or item counts that logically can't be negative
- port numbers that should be in 1..0xffff

plugins: Switch to :get_option_period() for time range options

Sun, 16 Jul 2023 20:49:33 +0200

plugins: Switch to :get_option_period() for time range options

Improves readability ("1 day" vs 86400) and centralizes validation.

Merge 0.12->trunk

Wed, 24 May 2023 15:35:28 +0200

Merge 0.12->trunk

mod_s2s: Add event where resolver for s2sout can be tweaked

Thu, 18 Aug 2022 03:26:32 +0200

mod_s2s: Add event where resolver for s2sout can be tweaked

Could be used to implement custom connection methods (c.f. mod_onions)
without needing to duplicate the rest of route_to_new_session().

Adds a feature to enable detection since it can be difficult to detect
support for an event otherwise.

mod_c2s,mod_s2s: Fix tag name for SLA (thanks mjk)

Wed, 03 May 2023 18:02:11 +0200

mod_c2s,mod_s2s: Fix tag name for SLA (thanks mjk)

The (still not published) XEP-xxxx: Stream Limits Advertisement uses the
element to advertise the maximum octet size of top level
stream elements. "size" was probably a leftover of an even earlier
version of the (Proto)XEP.

plugins: Prefix module imports with prosody namespace

Fri, 24 Mar 2023 13:15:28 +0100

plugins: Prefix module imports with prosody namespace

mod_s2s: Retrieve stanza size limit from peer for bidi connections

Wed, 09 Nov 2022 19:10:16 +0100

mod_s2s: Retrieve stanza size limit from peer for bidi connections

Having mod_s2s know about the bidi namespace is perhaps a bit awkward
but putting this in mod_s2s_bidi would be more awkward as it has nothing
to do with limits. Some indirection event could be added in the future.

mod_s2s: Advertise stream features on bidi connections

Thu, 20 Oct 2022 14:22:36 +0200

mod_s2s: Advertise stream features on bidi connections

mod_c2s,mod_s2s: Adapt to XEP-xxxx: Stream Limits Advertisement

Thu, 20 Oct 2022 14:04:56 +0200

mod_c2s,mod_s2s: Adapt to XEP-xxxx: Stream Limits Advertisement

Thanks MattJ

mod_s2s: Avoid sending too large stanzas

Tue, 16 Mar 2021 18:30:54 +0100

mod_s2s: Avoid sending too large stanzas

Just dropping them isn't great but hopefully something more sensible can
be done in the future.

Will need work to ensure that this signal is handled correctly in
sending modules etc.

mod_s2s: Record stanza size limit advertised by other servers

Tue, 16 Mar 2021 18:30:34 +0100

mod_s2s: Record stanza size limit advertised by other servers

For future use, i.e. canceling sending of stanzas that exceed the limit

mod_s2s: Advertise stanza size limit to other servers

Tue, 16 Mar 2021 18:25:05 +0100

mod_s2s: Advertise stanza size limit to other servers

So they can, like, not send big stanzas.

mod_s2s: Simplify conditionals since all sessions should have .host now

Fri, 26 Aug 2022 19:10:15 +0200

mod_s2s: Simplify conditionals since all sessions should have .host now

Merge 0.12->trunk

Fri, 26 Aug 2022 19:03:23 +0200

Merge 0.12->trunk

mod_s2s: Fix firing buffer drain events

Fri, 26 Aug 2022 18:53:00 +0200

mod_s2s: Fix firing buffer drain events

Fixes the same kind of issue as in 65563530375b but once and for all,
while improving similarity between incoming and outgoing connections.

mod_tls: Record STARTTLS state so it can be shown in Shell

Tue, 02 Aug 2022 19:26:26 +0200

mod_tls: Record STARTTLS state so it can be shown in Shell

This field can be viewed using s2s:show(nil, "... starttls") even
without any special support in mod_admin_shell, which can be added later
to make it nicer. One can then assume that a TLS connection with an
empty / nil starttls field means Direct TLS.

mod_s2s: Log queued stanzas for which no error reply is produced

Sat, 07 May 2022 13:10:27 +0200

mod_s2s: Log queued stanzas for which no error reply is produced

This would mainly be error stanzas.

Good to have some trace of when handling of them are finished.

mod_s2s: Don't bounce queued error stanzas (thanks Martin)

Sat, 07 May 2022 13:01:49 +0200

mod_s2s: Don't bounce queued error stanzas (thanks Martin)

The check for the type attr was lost in 11765f0605ec leading to attempts
to create error replies for error stanzas, which util.stanza rejects.

Tested by sending

which produced a traceback previously.

net: isolate LuaSec-specifics

Wed, 27 Apr 2022 17:44:14 +0200

net: isolate LuaSec-specifics

For this, various accessor functions are now provided directly on the
sockets, which reach down into the LuaSec implementation to obtain the
information.

While this may seem of little gain at first, it hides the implementation
detail of the LuaSec+LuaSocket combination that the actual socket and
the TLS layer are separate objects.

The net gain here is that an alternative implementation does not have to
emulate that specific implementation detail and "only" has to expose
LuaSec-compatible data structures on the new functions.

Merge 0.12->trunk

Mon, 25 Apr 2022 15:09:53 +0100

Merge 0.12->trunk

mod_s2s: Improve robustness of outgoing s2s certificate verification

Mon, 25 Apr 2022 15:07:49 +0100

mod_s2s: Improve robustness of outgoing s2s certificate verification

This change ensures we have positively verified the certificates of the server
we are connecting to before marking the session as authenticated. It protects
against situations where the verify-or-close stage of the connection was
interrupted (e.g. due to an uncaught error).

Thanks to Zash for discovery and testing.

mod_s2s: Distinguish DANE TLSA errors from generic cert chain errors

Mon, 25 Apr 2022 14:41:54 +0200

mod_s2s: Distinguish DANE TLSA errors from generic cert chain errors

Otherwise it would just report "is not trusted" unless you inspect the
logs. This message is sent to to the remote server, and will hopefully
show up in their logs, allowing the admin to fix their DANE setup.

mod_s2s: Recognise and report errors with CA or intermediate certs

Mon, 25 Apr 2022 14:36:56 +0200

mod_s2s: Recognise and report errors with CA or intermediate certs

Should be invoked for cases such as when the Let's Encrypt intermediate
certificate expired not too long ago.