mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
10426 commits 12 branches 101 tags 40 MiB
Commit graph

156 commits

Author SHA1 Message Date
Kim Alvefur
3aee8e24a6 s2s: Allow passing a custom error for bouncing queued stanzas (#770) 
Since stream errors and stanza errors are different
 2019-11-23 01:29:03 +01:00
Kim Alvefur
4216970602 mod_s2s: Wait for remote to close any connection allowing incoming stanzas 
Ie both s2sin and bidi-enabled s2sout.
 2019-11-18 20:37:40 +01:00
Kim Alvefur
6666a4c814 mod_s2s: Allow passing bounce reason as an util.error object (see #770) 
This argument is currently unused in s2smanager.
 2019-11-08 23:03:47 +01:00
Kim Alvefur
b24814cbe4 mod_s2s: Only nameprep stream to/from addresses if they are present 
Prevents traceback from nameprep(nil)
 2019-11-02 15:43:17 +01:00
Kim Alvefur
5460dfed75 mod_s2s: Close with a stream error in case neither SASL or Dialback are available 
This both tells the remote server and users who sent any queued stanzas
why it failed.
 2019-10-06 21:14:53 +02:00
Kim Alvefur
55efbf445b mod_s2s: Remove warning about hostname mismatch 
It triggers on bidi-related routing where this to/from is flipped.

Removing since I don't think we have ever seen this potential bug.
 2019-09-07 18:54:59 +02:00
Kim Alvefur
4eda545430 mod_s2s: Insert s2sin into outgoing routing table when bidirectional 2019-09-07 18:33:16 +02:00
Kim Alvefur
f6ba50139a mod_s2s: Add function to send replies on s2sout connections that support incoming traffic 2019-09-07 18:32:29 +02:00
Kim Alvefur
5c27fe4b79 mod_s2s: Handle authentication of s2sin and s2sout the same way 2019-09-07 17:44:57 +02:00
Kim Alvefur
42861396cd mod_s2s: Remove obsolete cleanup code 
These were added by s2sout.lib
 2019-09-07 19:00:37 +02:00
Kim Alvefur
b16782257d Remove COMPAT with temporary luasec fork 
The changes in the temporary fork were merged into mainline luasec ca
2013 and included in the 0.5 release in 2014.
 2019-08-25 23:12:55 +02:00
Kim Alvefur
c788104e04 mod_s2s: Use net.connect instead of s2sout.lib for outgoing s2s connections 2018-11-10 13:37:32 +01:00
Kim Alvefur
45a8e8ea7f mod_s2s: Distinguish between high and low level errors in bounces 
`remote-server-not-found` is reported for problems occurring without a
reply `<stream>` having been opened, e.g. DNS records were not found or
no TCP stream could be established to a functioning XMPP entity.

`remote-server-timeout` is reported for problems that occurring after a
stream has been opened, such as configuration problems, inability to
perform TLS or unsuccessful certificate validation.

Related: #770
 2019-08-01 05:25:34 +02:00
Kim Alvefur
40b1e3e0ed plugins: Remove tostring call from logging 
Taken care of by loggingmanager now

Mass-rewrite using lua pattern like `tostring%b()`
 2019-07-30 02:29:36 +02:00
Kim Alvefur
b246b00f85 mod_tls: Restore querying for certificates on s2s 
The 'ssl_config' setting in the mod_s2s network service is not used.
Only direct TLS ports use this currently.
 2019-03-11 13:07:59 +01:00
Kim Alvefur
9f65ce7189 core.certmanager: Do not ask for client certificates by default 
Since it's mostly only mod_s2s that needs to request client
certificates it makes some sense to have mod_s2s ask for this, instead
of having eg mod_http ask to disable it.
 2019-03-10 19:58:28 +01:00
Kim Alvefur
cf984835d1 mod_c2s, mod_s2s, mod_component: Log invalid XML escaped (fixes #734) 
See 6ed0d6224d64
 2019-01-15 20:08:30 +01:00
Kim Alvefur
ab950b3e79 mod_s2s: Indicate origin of s2s error 2018-10-08 15:03:26 +02:00
Kim Alvefur
4f7af62406 mod_s2s: Silence all warnings instead of ignoring the entire module 2018-09-30 17:49:56 +02:00
Kim Alvefur
15de51f8c5 sessionmanager, mod_s2s: Bring debug line for outgoing stanzas in line with that for incoming 2018-07-24 19:07:26 +02:00
Kim Alvefur
f86af44208 mod_s2s: Reduce logging (#776) 2018-07-22 19:45:58 +02:00
Kim Alvefur
ba4bd1e687 Merge 0.10->trunk 2018-06-22 14:18:36 +02:00
Kim Alvefur
899924566e mod_s2s: Close sockets held by resolver (#1170) 2018-06-17 20:02:40 +02:00
Emmanuel Gil Peyrot
f7adf08e5a mod_s2s: Add a counter for IPv6. 2017-09-09 14:45:23 +01:00
Kim Alvefur
fc00ed8289 mod_s2s: Don't use string concatenation when passing values to logging 2018-02-25 11:20:56 +01:00
Kim Alvefur
d3bdcaeda0 mod_s2s: Remove tostring() in logging since this is handled by util.format now 2017-12-21 07:00:56 +01:00
Kim Alvefur
5389a3a5cf mod_s2s: Restructure some code 2017-12-05 13:24:28 +01:00
Kim Alvefur
e803ffc6fe mod_s2s: Remove unused argument [luacheck] 2017-12-05 12:35:01 +01:00
Kim Alvefur
eac8dbee7b mod_s2s: Remove unused local [luacheck] 2017-12-05 12:34:50 +01:00
Matthew Wild
d6833915bc Merge 0.10->trunk 2017-09-26 17:24:25 +01:00
Matthew Wild
86ee041be8 mod_s2s: Use a separate resolver object for each outgoing session 
Cleaner approach hopefully fixes problems with some peoples' DNS
hanging after a while, failed DNS when a large number of queries
are made at once, and source port re-use.

Related issues: #487, 761, #991, #992, #1001
 2017-09-25 23:12:47 +01:00
Kim Alvefur
4c6c255113 Merge 0.10->trunk 2017-09-14 02:48:34 +02:00
Kim Alvefur
989c0783cb Merge 0.9->0.10 2017-09-14 02:47:40 +02:00
Kim Alvefur
5dee36d838 mod_component, mod_s2s: Iterate over child tags instead of child nodes (can include text) in stream error (same as 176b7f4e4ac9) 2017-09-14 01:27:36 +02:00
Kim Alvefur
4c6a84a00e Merge 0.10->trunk 2017-01-26 19:47:33 +01:00
Kim Alvefur
befdc64576 mod_c2s, mod_s2s: Remove comment that no longer applies since 946871f6e3c8 2017-01-25 11:18:00 +01:00
Kim Alvefur
ac7a1daba8 mod_s2s: Clarify that it is stream features that can't be offered (here too) 2017-01-25 11:13:40 +01:00
Kim Alvefur
67c41ef89e Merge 0.10->trunk 2016-10-07 16:52:18 +02:00
Kim Alvefur
70ba6bf40f Merge 0.9->0.10 2016-09-28 14:45:02 +02:00
Matthew Wild
4c0ea8780e mod_s2s: Lower log message to 'warn' level, standard for remotely-triggered protocol issues 2016-09-27 22:01:46 +01:00
Matthew Wild
f4690a6063 Merge 0.10->trunk 2016-09-12 22:31:25 +01:00
Kim Alvefur
522f448b35 mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate once per statistics interval 2016-09-12 15:01:16 +02:00
Matthew Wild
37913e5ce8 Merge 0.10->trunk 2016-08-31 16:25:21 +01:00
Matthew Wild
9ab7221521 Backed out changeset a23b5cb8c22b 
It was a nice idea, but our s2s connection logic is too complicated. The
session may have been destroyed inside attempt_connection().
 2016-08-31 11:42:03 +01:00
Kim Alvefur
2ec447915f Merge 0.10->trunk 2016-08-28 05:15:13 +02:00
Matthew Wild
f6fd68b0dd mod_s2s: Fire event when s2s connection fails 2016-08-27 13:40:10 +01:00
Kim Alvefur
68f3c9dede Merge 0.10->trunk 2016-08-08 16:41:09 +02:00
Kim Alvefur
6cff8fa474 mod_s2s: Index session after checking if it exists (fixes traceback in case of a connection without a session having a read timeout) 2016-08-07 20:48:37 +02:00
Kim Alvefur
8c0ca748b5 Merge 0.10->trunk 2016-07-08 15:12:44 +02:00
Kim Alvefur
ddccdcd00d mod_c2s, mod_s2s: Bootstrap connection count statistic on module load 2016-07-07 18:48:58 +02:00