aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* net.http.server: Fix reporting of missing Host headerKim Alvefur2020-06-231-1/+2
| | | | | The "Missing or invalid 'Host' header" case was dead code previously because `host` was always at least an empty string.
* net.http.server: Strip port from Host header in IPv6 friendly way (fix #1302)Kim Alvefur2020-06-231-1/+1
| | | | | E.g. given `[::1]:5280` it would previously result in only `[` instead of the correct `[::1]`
* util.startup: Remove duplicated initialization of logging (fix #1527)Kim Alvefur2020-06-221-1/+0
|
* mod_muc_mam: Don't strip MUC <x> tags, fix #1567Kim Alvefur2020-06-211-3/+0
|
* mod_auth_internal_*: Apply saslprep to passwordsKim Alvefur2020-05-233-2/+25
| | | | Related to #1560
* util.sasl.plain: Apply saslprep to stored passwordKim Alvefur2020-05-221-1/+1
| | | | | | Fixes something like #1560 here too. The password sent by the user already had saslprep applied.
* util.sasl.scram: Apply saslprep before hashing password, fixes #1560Kim Alvefur2020-05-221-0/+4
|
* mod_storage_internal: Fix error in time limited queries on items without ↵Kim Alvefur2020-05-151-2/+4
| | | | 'when' field, fixes #1557
* mod_muc_mam: Remove spoofed archive IDs before archiving, fix #1552Kim Alvefur2020-05-111-1/+1
| | | | | | | | | The stanza-id added during archiving looks exactly like what should be stripped, so the stripping must happen before archiving. Getting priorities right is hard! Also no test coverage yet.
* mod_csi_simple: Consider XEP-0353: Jingle Message Initiation importantKim Alvefur2020-05-081-0/+3
| | | | | | Improves experience with VoIP calls initiated via JMI Closes #1548
* mod_muc_mam: Fix missing advertising of XEP-0359, fixes #1547Kim Alvefur2020-05-081-0/+1
|
* mod_muc_mam: Fix stanza id filter event name, fixes #1546Kim Alvefur2020-04-291-1/+1
| | | | Nice typo
* mod_tls: Log when certificates are (re)loadedKim Alvefur2020-04-261-1/+7
| | | | Meant to reduce user confusion over what's reloaded and not.
* mod_carbons: Fix handling of incoming MUC PMs #1540Kim Alvefur2020-04-261-1/+1
| | | | | | | 27f5db07bec9 fixed this wrong. The code is supposed to check if the stanza is NOT sent to your bare JID. A MUC PM is always sent to your full JID. Hopefully nobody sends MUC invites to full JIDs, because those would be skipped by this as well.
* mod_http_files: Avoid using inode in etag, fix #1498Kim Alvefur2020-04-251-1/+1
|
* MUC tests: Add missing affiliation attributeMatthew Wild2020-04-231-1/+1
|
* Backed out changeset 18f2c7bc5795 (was testing against wrong branch)Matthew Wild2020-04-231-6/+2
|
* MUC tests: Add <required/> to expected form fieldMatthew Wild2020-04-231-2/+6
|
* MUC: Always include 'affiliation'/'role' attributes, defaulting to 'none' if nilMatthew Wild2020-04-231-1/+1
|
* core.certmanager: Move EECDH ciphers before EDH in default cipherstring ↵Kim Alvefur2019-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | (fixes #1513) Backport of 94e341dee51c The original intent of having kEDH before kEECDH was that if a `dhparam` file was specified, this would be interpreted as a preference by the admin for old and well-tested Diffie-Hellman key agreement over newer elliptic curve ones. Otherwise the faster elliptic curve ciphersuites would be preferred. This didn't really work as intended since this affects the ClientHello on outgoing s2s connections, leading to some servers using poorly configured kEDH. With Debian shipping OpenSSL settings that enforce a higher security level, this caused interoperability problems with servers that use DH params smaller than 2048 bits. E.g. jabber.org at the time of this writing has 1024 bit DH params. MattJ says > Curves have won, and OpenSSL is less weird about them now
* util.prosodyctl: Tell prosody do daemonize via command line flag (fixes #1514)Kim Alvefur2020-01-261-2/+2
| | | | Backport of 88be11e9f9b9
* core.certmanager: Look for privkey.pem to go with fullchain.pem (fix #1526)Kim Alvefur2020-04-101-6/+8
| | | | | | | This makes `prosodyctl cert import example.com /path/to/example.com/fullchain.pem` work. This was never intended to, yet users commonly tried this and got problems.
* mod_vcard4: Report correct error condition (fixes #1521)Kim Alvefur2020-04-031-2/+2
| | | | On error, the second return value is the error condition, not the third.
* mod_register_ibr: Add FORM_TYPE as required by XEP-0077 (fixes #1511)Emmanuel Gil Peyrot2019-09-291-0/+2
| | | | Backport of f90abf142d53 from trunk
* mod_storage_sql: Add index covering sort_id to improve performance (fixes #1505)Kim Alvefur2020-03-221-0/+1
|
* mod_admin_telnet: Handle unavailable cipher info (fixes #1510)Kim Alvefur2020-03-221-5/+8
| | | | | | | | The LuaSec :info() method gathers info using the OpenSSL function SSL_get_current_cipher(). Documentation for this function states that it may return NULL if no session has been established (yet). If so, the LuaSec functions wrapping this return nil, triggering a nil-indexing error in mod_admin_telnet.
* MUC: Persist affiliation_data in new MUC format!Matthew Wild2020-03-121-0/+1
|
* mod_mam,mod_muc_mam: Allow other work to be performed during archive cleanup ↵Kim Alvefur2020-03-112-2/+10
| | | | | | | | | | | (fixes #1504) This lets Prosody handle socket related work between each step in the cleanup in order to prevent the server from being completely blocked during this. An async storage backend would not need this but those are currently rare.
* net.server_epoll: Fix indentationKim Alvefur2020-03-111-3/+3
| | | | | | Some lines seem to have gotten the wrong indentation, possibly caused by Meld which often ignores lines with only whitespace changes and leaves their previous indentation.
* mod_pubsub, mod_pep: Ensure correct number of children of <item/> (fixes #1496)Kim Alvefur2020-02-272-2/+2
|
* mod_muc_mam: Fix traceback saving message from non-occupant (fixes #1497)Kim Alvefur2020-02-271-5/+8
| | | | Caused by a plugin sending a message from the room itself.
* util.datamanager: Fix iterating over "users" (thanks marc0s)Kim Alvefur2020-02-241-1/+1
| | | | | | | | | The 'store' path componend used to be unescaped until 756a2a00e7e7 added escaping to address issues with characters like '/' used in PEP, but with a special case for '_' which was already in common use in 'store' path components. Missed adding this escaping here.
* mod_storage_sql: Move update limit check back one step, fixes tracebackKim Alvefur2020-02-221-6/+6
| | | | | 0c00274528a4 moved it one step too far, so the check was performed before connecting to the database instead of after.
* mod_storage_sql: Fix check for deletion limits (fixes #1494)Kim Alvefur2020-02-211-7/+7
| | | | | The check was only performed if sql_manage_tables was set to true (the default) It should always be performed
* mod_muc: Allow control over the server-admins-are-room-owners feature (see ↵Matthew Wild2020-02-131-1/+2
| | | | #1174)
* mod_admin_telnet: Create a DNS resolver per console session (fixes #1492)Kim Alvefur2020-01-241-6/+19
| | | | This is now the common pattern, eg see mod_s2s.
* mod_websocket: Fire event on session creation (thanks Aaron van Meerten)Matthew Wild2020-01-241-0/+2
|
* prosodyctl: Fix some luacheck warningsMatthew Wild2020-01-231-4/+5
|
* Log warning when using prosodyctl start/stop/restartMatthew Wild2020-01-231-0/+20
|
* MergeKim Alvefur2020-01-200-0/+0
|\
| * Added tag 0.11.4 for changeset 10d6d0d91f4eKim Alvefur2020-01-060-0/+0
| |
| * mod_websocket: Clear mask bit when reflecting ping frames (fixes #1484)Kim Alvefur2020-01-021-0/+1
| |
| * prosodyctl: Print a blank line to improve spacing and readabilityKim Alvefur2019-12-311-0/+1
| |
| * prosodyctl check: Warn about conflict between mod_pep and mod_pep_simpleKim Alvefur2019-12-311-0/+5
| | | | | | | | Related #1483
| * core.rostermanager: Cache rosters of offline users for faster access (fixes ↵Kim Alvefur2018-12-161-0/+22
| | | | | | | | | | | | #1233) (grafted from 42a3e3a2824822cef7640ac56d182c59bdd4224e)
| * mod_mam: Fix rebase mistake [luacheck]Kim Alvefur2019-12-241-1/+1
| | | | | | | | The 'err' was there in trunk
| * mod_muc_mam: Fix rebase mistake [luacheck]Kim Alvefur2019-12-241-1/+1
| | | | | | | | The 'err' was there in trunk
| * mod_muc_mam: Schedule cleanup again on failureKim Alvefur2019-12-241-0/+1
| |
| * mod_muc_mam: Log error when unable to delete old messages (fix #1481) [luacheck]Kim Alvefur2019-12-241-0/+2
| |
| * mod_muc_mam: Log error when unable to store stanza (fix #1480) [luacheck]Kim Alvefur2019-12-231-0/+2
| |