aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.11->trunkKim Alvefur2019-07-281-0/+1
|\
| * mod_websocket: Clone stanza before mutating (fixes #1398)Kim Alvefur2019-07-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | Checking for `stanza.attr.xmlns == nil` to determine if the stanza object is an actual stanza (`<message>`, `<presence>` or `<iq>` in the `jabber:client` or `jabbber:server` namespace) or some other stream element. Since this mutation is not reverted, it may leak to other places and cause them to mistreat stanzas as stream elements. Especially in cases like MUC where a single stanza is broadcast to many recipients.
* | util.poll: Add missing return statements in fallback modeKim Alvefur2019-07-281-0/+2
| | | | | | | | | | | | | | These allowed modifying or deleting select() state for unregistered FDs. During normal usage this should never happen. Modifying one that isn't set might cause weirdness but deleting an already deleted FD isn't a problem.
* | mod_admin_telnet: Use already generated session idKim Alvefur2019-07-281-1/+1
| | | | | | | | Don't need to construct it from components again
* | mod_admin_telnet: Allow specifying a reason when closing sessions (#1400)Kim Alvefur2019-07-281-8/+17
| |
* | util.xmppstream: Inherit xml:lang from stream to stanzas (fixes #1401)Kim Alvefur2019-07-281-0/+6
| |
* | net.server_epoll: Remove unused local [luacheck]Kim Alvefur2019-07-261-1/+0
| |
* | mod_pubsub: Eliminate dead codeKim Alvefur2019-07-251-8/+3
| | | | | | | | `data` is a stanza and always truthy
* | net.server_epoll: Overhaul logging with one log sink per connectionKim Alvefur2019-07-261-23/+41
| |
* | net.server_epoll: Deprecate libevent emulation layerKim Alvefur2019-07-241-0/+1
| |
* | mod_admin_telnet: Add xmpp:ping to helpKim Alvefur2019-07-261-0/+3
| |
* | mod_admin_telnet: Add c2s:count() to helpKim Alvefur2019-07-261-0/+1
| |
* | mod_admin_telnet: Make c2s:count() consistent with c2s:show()Kim Alvefur2019-07-261-3/+2
| | | | | | | | Both now operate on the same complete set of c2s sessions
* | mod_admin_telnet: Factor out function for collecting all c2s sessions for ↵Kim Alvefur2019-07-261-2/+6
| | | | | | | | easier reuse
* | mod_admin_telnet: Include both c2s connections and sessions in c2s:show()Kim Alvefur2019-07-261-1/+3
| | | | | | | | This way both incomplete connections and hibernating c2s sessions are shown.
* | net.server_epoll: Return errors from creating socketsKim Alvefur2019-07-231-0/+1
| | | | | | | | | | | | Prevents error from attempting to index nil conn on such failure. Silences luacheck warning about the 'err' variable being unused
* | net.server_epoll: Add experimental option to close connections in case of ↵Kim Alvefur2019-05-251-0/+8
| | | | | | | | | | | | | | listener error Sometimes such errors leave sessions in an inconsistent state, so it might be better to close them early.
* | net.server_epoll: Return listener error messageKim Alvefur2019-05-251-1/+1
| |
* | mod_mam: Report correct count of results for forward queriesKim Alvefur2019-07-131-1/+1
| | | | | | | | | | #results is only correct for backwards queries, the table is unused for forward queries.
* | mod_mam: Move final log message to end of query procedureKim Alvefur2019-07-111-3/+3
| |
* | mod_mam: Log RSM parametersKim Alvefur2019-07-111-0/+3
| | | | | | | | | | Helps when trying to figure out why some queries fail, ie when paging using an archive id that doesn't exist.
* | mod_mam: Log query failure reasonKim Alvefur2019-07-111-0/+1
| | | | | | | | | | The storage engine will usually make a lot of noise for serious errors, but not always.
* | mod_mam: Log more details in final log messageKim Alvefur2019-07-111-1/+1
| | | | | | | | Saves you from counting messages sent
* | mod_mam: Include query id in final log messageKim Alvefur2019-07-111-1/+1
| | | | | | | | Should make it easier to find related log messages
* | mod_mam: Use stanza id in log message as fallback if no query idKim Alvefur2019-07-111-1/+1
| |
* | mod_mam: Include username that performed queryKim Alvefur2019-07-111-1/+2
| | | | | | | | Not always easy to find from surrounding logs
* | mod_mam: Make log message more compactKim Alvefur2019-07-111-4/+5
| |
* | mod_pubsub: Move a comment to where it makes senseKim Alvefur2019-07-101-1/+1
| | | | | | | | This code has moved but the comment did not follow it.
* | util.error: Fix traceback due to missing text fieldKim Alvefur2019-07-101-1/+1
| |
* | mod_admin_telnet: Move error handling to thread callback (fixes #1391)Kim Alvefur2019-05-101-7/+4
| | | | | | | | Avoids yielding over pcall boundry, fixes xmpp:ping() command on Lua 5.1
* | mod_admin_telnet: Check for simple commands before executing in sandboxKim Alvefur2019-05-101-5/+5
| | | | | | | | | | | | This makes fixing yield over pcall boundry issue easier since it would have jumped to the thread error handler instead of proceeding to checking for simple commands.
* | mod_pep: Only log when creating new pubsub servicesKim Alvefur2019-07-091-1/+1
| | | | | | | | | | | | | | Once upon a time get_pep_service() would get called with random bare JIDs and remote hostnames, which is why it was logged this way. This seems to have been fixed, so it's not as useful anymore. It's still useful to know when it creates a new service object.
* | net.http.files: Fix cache handlingKim Alvefur2019-06-291-1/+1
| | | | | | | | Typo that broke the LRU-ness of the caching
* | prosodyctl: Fix extraction of interpreter from arg when additional arguments ↵Kim Alvefur2019-06-291-1/+9
| | | | | | | | | | | | | | (fixes #1386) Interpreter goes into the lowest negative index. See http://www.lua.org/manual/5.2/manual.html#7
* | MUC: Advertise language field as such via XEP-0122Kim Alvefur2019-07-071-0/+1
| | | | | | | | | | | | | | This lets clients know that the field is a language field and should be in RFC 5646 format. Field validation code in util.dataforms left for future commit.
* | mod_pubsub: Expose pubsub#access_model and pubsub#publish_model (fixes #1387)Kim Alvefur2019-07-061-0/+10
| |
* | Merge 0.11->trunkKim Alvefur2019-07-08108-1337/+3588
|\ \ | |/ |/|
| * Merge 0.11->trunkKim Alvefur2019-06-201-1/+1
| |\
| * \ Merge 0.11->trunkKim Alvefur2019-06-201-10/+2
| |\ \
| * | | mod_blocklist: Add comment to clarify some logicKim Alvefur2019-06-201-0/+1
| | | |
| * | | Merge 0.11->trunkKim Alvefur2019-06-202-0/+176
| |\ \ \
| * | | | util.dependencies: Increase Lua version to warn about to 5.4Kim Alvefur2019-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No significant problems have been encountered with Lua 5.3 itself, so apart from some odd problems in LuaExpat it seems about time to declare it ready.
| * | | | MUC: Reflow event tables to improve readabilityKim Alvefur2019-06-191-4/+20
| | | | | | | | | | | | | | | | | | | | Also makes it easier to read diffs of added fields.
| * | | | mod_pep: Log node name instead of payloadKim Alvefur2019-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | Having the node logged is more useful and less problematic for privacy
| * | | | Merge 0.11->trunkKim Alvefur2019-06-10107-1377/+3592
| |\ \ \ \
| | * | | | mod_admin_telnet: Collect array from Bosh connections when appending to ↵Michel Le Bihan2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection list Fixes #1356
| | * | | | core/sessionmanager: Remove unnecessary fallback in make_authenticatedMaxime “pep” Buquet2019-06-011-1/+1
| | | | | |
| | * | | | prosody: Also log status code passed to exit()Kim Alvefur2019-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes you're just too lazy to `echo $?`
| | * | | | prosody: Log shutdown reason (in past tense) as the very last thingKim Alvefur2019-05-311-1/+1
| | | | | |
| | * | | | prosody: Log shutdown reasonKim Alvefur2019-05-311-0/+1
| | | | | |