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

9859 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Wild
0666d291f6 doc/coding_style.{txt,md}: Update coding style guide 2019-03-14 16:13:14 +00:00
Matthew Wild
80e119abd6 Merge 0.11->trunk 2019-03-14 08:10:01 +00:00
Matthew Wild
fffb4ee43d prosodyctl about: Report network backend in use 2019-03-14 08:09:49 +00:00
Kim Alvefur
50f89a9f96 net.server_epoll: Optimize timer handling 2019-03-12 23:13:51 +01: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
5d2608e150 net.server: Only add alternate SNI contexts if at least one is provided 
Fixes use of <starttls/> when a client sends SNI, which would send no certificate otherwise.
 2019-03-11 13:00:51 +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
5fb7d2d35a net.server_select: SNI support (#409) 2019-03-10 19:32:33 +01:00
Kim Alvefur
af5e6fcb64 net.server_event: Add SNI support (#409) 
Snippet adapted from server_epoll
 2019-03-10 19:32:54 +01:00
Kim Alvefur
09a662026a mod_muc_mam: Add comment about the tricks done with the 'with' field 2019-03-04 12:58:20 +01:00
Kim Alvefur
2c8eecf7c2 mod_muc_mam: Move a comment to the line it describes 2019-03-04 12:57:42 +01:00
Kim Alvefur
dad8bb5fee mod_muc_mam: Strip the stanza 'to' attribute (fixes #1259) 2019-03-04 12:56:31 +01:00
Kim Alvefur
5d4504e51b util.pubsub: Validate node configuration on node creation (fixes #1328) 2019-03-03 19:31:56 +01:00
Kim Alvefur
7241f86668 mod_storage_memory: Generate ID using standard util (fixes #1326) 
The previous method relied on tostring(table) returning the pointer address,
which might not be portable.
 2019-03-02 22:26:01 +01:00
Kim Alvefur
3b8e8f6a45 spec: Add test case for #1322 2019-02-27 10:27:17 +01:00
Kim Alvefur
07541082dc mod_storage_memory: Replace query function with one based on storage_internal (fixes #1322) 
The :find method in storage_internal works and is easier to read and
understand. Future changes should be simpler to apply to both modules.
 2019-02-27 10:20:38 +01:00
Kim Alvefur
4673e4897b mod_pubsub: Simplify configuration for node data (see #1302) 2019-02-22 07:33:23 +01:00
Kim Alvefur
e289d31177 mod_pep: Simplify configuration for node data (fixes #1320) 2019-02-22 07:35:44 +01:00
Kim Alvefur
66d2e6adc3 net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1319) 
This is to match server_event, see 430797a8fc81
 2019-02-09 19:28:24 +01:00
Kim Alvefur
8732027944 net.server_epoll: Use send_timeout for write timout like other implementations (fixes #1316) 2019-02-07 14:02:15 +01:00
Matthew Wild
da3f688d79 MUC: Add error message to error bounces when not joined to room 2019-02-04 09:27:43 +00:00
Kim Alvefur
6d84bd44ba mod_pubsub: Support requests for multiple items (fixes #1305) 2019-01-28 01:41:42 +01:00
Kim Alvefur
da56744645 util.pubsub: Add support for requesting multiple specific items (needed for #1305) 2019-01-28 01:41:01 +01:00
Kim Alvefur
d0d8bf9237 mod_vcard_legacy: Handle partial migration 
Eg in case the user already published an avatar, migrate only the vcard,
and vice versa.
 2019-01-26 13:32:26 +01:00
Kim Alvefur
1fe3e2754a mod_vcard_legacy: Allow disabling vcard conversion 
Once everyone has been migrated it might be nice to skip these checks
 2019-01-25 23:31:02 +01:00
Kim Alvefur
22bdd21fc1 mod_vcard_legacy: Don't overwrite existing PEP data 2019-01-25 23:27:23 +01:00
Kim Alvefur
55490159fd mod_vcard_legacy: Add some missing semicolons 2019-01-25 23:21:13 +01:00
Kim Alvefur
f7c48ad3bc mod_vcard_legacy: Upgrade vcard-temp on login (fixes #1289) 2019-01-10 15:39:02 +01:00
Kim Alvefur
cc4a160cdb mod_vcard_legacy: Adapt node defaults to number of avatars 2019-01-11 09:20:48 +01:00
Kim Alvefur
47887761c6 mod_vcard_legacy: Factor out conversion from vcard-temp to 4 2019-01-11 09:20:45 +01:00
Kim Alvefur
f8d61d21e5 mod_websocket: Log an error if cross_domain_websocket = true is set in a VirtualHost section 2019-01-22 10:41:00 +01:00
Kim Alvefur
757051d913 mod_websocket: Include the value of cross_domain_websocket in debug message 2019-01-18 18:37:04 +01:00
Kim Alvefur
ad15946ae3 mod_motd: Remove unused variable [luacheck] 2019-01-17 01:15:29 +01:00
Kim Alvefur
30ab1bca86 mod_motd: Remove redundant conditions 
The stanza should always be like this in the presence/initial event
 2019-01-17 01:05:47 +01:00
Kim Alvefur
b2d3ebb76d mod_presence: Revert empty 'to' attribute of presence before presence/initial event (fixes #1296) 2019-01-17 01:04:39 +01:00
Kim Alvefur
5cd064035a mod_bosh: Handle missing wait attribute (fixes #1288) 
250855633092 did not fix this completely.
 2019-01-10 13:07:22 +01:00
Matthew Wild
9fbf2fad48 Added tag 0.11.2 for changeset 4f8b6c09e5f3 2019-01-08 13:12:58 +00:00
Matthew Wild
01b30084a9 Merge 0.10->0.11 2019-01-07 15:34:23 +00:00
Kim Alvefur
24c44a4566 mod_csi_simple: Consider messages encrypted payload as important (fixes part of #1250) 2019-01-06 21:09:32 +01:00
Kim Alvefur
e03098631f mod_csi_simple: Consider messages with subject (eg MUC joins) (fixes part of #1250) 2019-01-06 21:09:00 +01:00
Kim Alvefur
05b481ec89 mod_csi_simple: Unpack Carbons-forwarded messages (fixes part of #1250) 2019-01-06 21:09:50 +01:00
Kim Alvefur
9251fa5500 mod_csi_simple: Consider messages forwarded from another of the users clients as important (fixes part of #1250) 2019-01-06 21:08:11 +01:00
Kim Alvefur
38c98346b1 mod_csi_simple: Tweak check for <body> 
There were code that checked the body for mentions but isn't included.
 2019-01-06 21:03:09 +01:00
Kim Alvefur
1e9a016034 mod_posix: Don't reload logging twice 
See 18eca6afb367
 2019-01-06 12:17:00 +01:00
Kim Alvefur
ce17a974fc util.startup: Always reload logging after config (fixes #1284) 
This chancged in 6e24a69b03af likely because of confusion about the
`reopen-log-files` event which was fired but never hooked.
 2019-01-06 12:14:42 +01:00
Kim Alvefur
9f19a48ee2 util.pubsub: Restore subscription index from stored data (fixes #1281) 2018-12-29 21:47:51 +01:00
Kim Alvefur
67a3bf56f3 mod_mam: Add test for JID normalization in prefs (see #1275) 2018-12-23 15:22:49 +01:00
Emmanuel Gil Peyrot
6282f9029c mod_mam: Only accept valid JIDs in <always/> and <never/> prefs. (fixes #1275) 2018-12-23 15:25:01 +01:00
Kim Alvefur
85a028c727 MUC: Allow changing data attached to an only owner (fixes #1273) 
This previously prevented a single owner from setting their own nickname
via admin query.

The form method uses `true` as actor so it bypasses this check.
 2018-12-20 14:45:22 +01:00
Matthew Wild
f281528c39 MUC: Adjust priorities of muc-get-default-role handlers (fixes #1272) 2018-12-19 23:14:13 +00:00