aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* ejabberd2prosody: Don't import disabled or empty passwordsMatthew Wild2021-10-131-1/+3
|
* mod_mimicking: Correctly hook the *global* user-deleted eventKim Alvefur2021-10-121-1/+2
|
* util.startup: Only ask if 'prosodyctl' was meant instead of 'prosody' (fix ↵Kim Alvefur2021-10-121-1/+3
| | | | #1692)
* Merge 0.11->trunkKim Alvefur2021-10-121-1/+1
|\
| * util.startup: Correctly point out unknown short param (fixes #1691)Kim Alvefur2021-10-121-1/+1
| |
* | util.argparse: Add test for #1691Kim Alvefur2021-10-121-0/+7
| |
* | util.argparse: TestsKim Alvefur2021-10-121-0/+46
| |
* | prosody2ejabberd: Check for iteration count at position 6Matthew Wild2021-10-071-1/+7
| | | | | | | | | | In some data dumps, presumably from newer ejabberd versions, position 5 is the string "sha", and the iteration count follows it.
* | ejabberd2prosody: Convert SCRAM iteration count to number (thanks arcseconds)Matthew Wild2021-10-071-1/+1
| |
* | mod_storage_xep0227: Add scram-credentials to user element rather than serverMatthew Wild2021-09-221-1/+1
| |
* | net.server_epoll: Prevent starttls on direct TLS connectionsKim Alvefur2021-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | This is not a pretty way to signal this... but it is the current API interface:inittls() is a new code path which did not go past the point in interface:starttls() where it set starttls to false, leading mod_tls to offer starttls on direct TLS connections Thanks Martin for discovering.
* | CHANGES: Add mod_auth_ldapKim Alvefur2021-10-051-0/+1
| |
* | mod_auth_ldap: Import from prosody-modules rev f52452911187Kim Alvefur2021-10-051-0/+154
| |
* | mod_carbons: Advertise following of recommended rules (closes #1486)Kim Alvefur2021-10-051-0/+2
| | | | | | | | We're doing our best!
* | mod_s2s_auth_certs: Collect stats on validation results (for #975)Kim Alvefur2021-10-051-0/+4
| |
* | mod_csi_simple: Provide custom set of timing bucketsKim Alvefur2021-10-051-1/+2
| | | | | | | | | | | | The default of 0.001..100.0 did not feel suitable here. This might be better. Longer is better and hold times less than a few seconds is generally undesirable.
* | util.prosodyctl.check: Add two known globals from mod_httpKim Alvefur2021-10-031-0/+2
| |
* | Merge 0.11->trunkKim Alvefur2021-10-010-0/+0
|\|
| * Merge wayward 0.11.10 tag commitKim Alvefur2021-10-010-0/+0
| |\
| | * Tag 0.11.10Kim Alvefur2021-08-030-0/+0
| | |
* | | mod_admin_shell: Allow passing an exit code to server:shutdown()Kim Alvefur2021-09-301-2/+2
| | | | | | | | | | | | Mirroring the internal API
* | | mod_posix: Exit with non-zero status code on problemsKim Alvefur2021-09-301-4/+4
| | | | | | | | | | | | | | | Previously it would default to exit with 0 as status code, meaning success, which is weird.
* | | util.startup: Allow separate command line argument settings for prosody and ↵Kim Alvefur2021-09-301-6/+11
| | | | | | | | | | | | | | | | | | | | | prosodyctl Makes it clearer that prosody does not take -v atm, as well as how prosodyctl does not take the demonization flags.
* | | prosodyctl: Add support for -v/--verbose to enable debug loggingKim Alvefur2021-09-301-2/+4
| | | | | | | | | | | | More convenient than the environment variable.
* | | prosodyctl: Add alternate XMPP Blackbox Exporter connectivity checkKim Alvefur2021-09-301-3/+71
| | | | | | | | | | | | | | | Reduces the reliance on observe.jabber.network and enables alternatives for those who wish to have that.
* | | prosodyctl: Use HTTP client in promise mode for connectivity checkKim Alvefur2021-09-301-26/+14
| | | | | | | | | | | | | | | Feels a bit cleaner to hide away the async.waiter() and return value handling. Also line count reduction!
* | | core.moduleapi: Ensure module:send_iq() handler priority over mod_iqKim Alvefur2021-09-241-2/+2
| | | | | | | | | | | | | | | | | | To prevent a situation where you for whatever reason use a full JID that is currently online and the response ends up routed there instead of the module:send_iq() handlers.
* | | core.moduleapi: Enable full JID origin queries with module:send_iq()Kim Alvefur2021-09-241-2/+11
| | | | | | | | | | | | | | | Since we don't currently have hooks that includes type and id here, we need to check those attributes in the handlers.
* | | core.moduleapi: Filter out unrelated direct replies to module:send_iqKim Alvefur2021-09-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is primarily something that happens with an internal query to mod_mam, which calls origin.send() several times with results, leading to the first such result being treated as the final response and resolving the promise. Now, these responses pass trough to the underlying origin.send(), where they can be caught. Tricky but not impossible. For remote queries, it's even trickier, you would likely need to bind a resource or similar.
* | | mod_http_errors: Make it easier to override 'http-message' handlerKim Alvefur2021-09-241-1/+1
| | | | | | | | | | | | | | | | | | Per the unspoken internal standard of -1 as priority for most built-in event handlers, since this makes it easy for 3rd party plugins to override behavior by hooking at the default priority of 0.
* | | mod_mam: Merge main and RSM-specific log message here tooKim Alvefur2021-09-231-10/+10
| | |
* | | mod_muc_mam: Fix reference to "user" in debug message copied from mod_mamKim Alvefur2021-09-231-1/+1
| | |
* | | mod_muc_mam: Merge main and RSM-specific log message into a single oneKim Alvefur2021-09-231-9/+7
| | |
* | | mod_muc_mam: Fix copypaste mistake in debug loggingKim Alvefur2021-09-231-1/+1
| | | | | | | | | | | | | | | This line was copied from mod_mam, where `origin.username` made sense, less so here.
* | | mod_message: Fire event for groupchat messages sent to bare JIDMatthew Wild2021-09-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This is becoming more common in XMPP as people experiment with a MIX-like model where the bare JID joins a group chat instead of a full JID. Specifically right now this is being added to help with processing notifications from mod_muc_offline_delivery.
* | | net.server_epoll: Separate handling of "closed" from other errorsKim Alvefur2021-09-221-7/+7
| | | | | | | | | | | | | | | | | | The intent is to ensure 'ondisconnect' only gets called once, while giving buffered outgoing data a last chance to be delivered via the :close() path in case the connection was only shutdown in one direction.
* | | net.server_epoll: Skip attempt to flush write buffer when not connectedKim Alvefur2021-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Before 22825cb5dcd8 connection attempts that failed (e.g. connection refused) would be immediately destroyed. After, it would schedule another write cycle and then report 'ondisconnect' again when failing. Thanks Martin for reporting
* | | Merge 0.11->trunkKim Alvefur2021-09-202-1/+19
|\| |
| * | net.server_epoll: Add a hard deadline on shutdown to extra-fix #1670Kim Alvefur2021-09-201-0/+12
| | | | | | | | | | | | Should ensure shutdown even if sockets somehow take a very long to get closed.
| * | net.server_epoll: Close sockets added after shutdown signal (fixes #1670)Kim Alvefur2021-09-201-0/+6
| | | | | | | | | | | | | | | This should ensure that sockets get closed even if they are added after the quit signal. Otherwise they may keep the server alive.
| * | prosodyctl: Fix later import of LuaFileSystemKim Alvefur2021-09-111-1/+1
| | | | | | | | | | | | | | | | | | lfs or WHAT How did this even happen?
* | | mod_bosh: Fix typo in commentKim Alvefur2021-09-191-1/+1
| | |
* | | mod_register_limits: Reword some optionsKim Alvefur2021-09-192-19/+25
| | | | | | | | | | | | Remember to remove the compatibility things in some future version
* | | MUC: Reject full JID in affiliation queriesKim Alvefur2021-09-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XEP-0045 states: > Affiliations are granted, revoked, and maintained based on the user's > bare JID, not the nick as with roles. Therefore inclusion of a full JID in affiliation queries is invalid. Thanks to Ge0rG and Poezio for discovering this issue.
* | | net.server_epoll: Fix indentation messed up in last mergeKim Alvefur2021-09-171-27/+27
| | | | | | | | | | | | Seems to have happened in 6427e2642976, probably because of Meld
* | | net.server_epoll: Don't immediately destroy upon getting closed on readKim Alvefur2021-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead try to write any remaining buffered data. If the write attempt also fails with "closed" then there's nothing we can do and the socket is gone. This reverts what appears to be a mistakenly included part of c8aa66595072 Thanks jonas’ for noticing
* | | mod_pubsub: Advertise support for 'max' as value for max_itemsKim Alvefur2021-09-151-0/+4
| | | | | | | | | | | | Ref #1643
* | | mod_http_file_share: Fix measuring how long periodic task takeKim Alvefur2021-09-141-2/+6
| | |
* | | util.prosodyctl.check: Suggest replacing 'use_libevent' with 'network_backend'Kim Alvefur2021-09-141-1/+1
| | | | | | | | | | | | It's basically deprecated
* | | util.prosodyctl.check: Nudge towards plural port optionsKim Alvefur2021-09-141-1/+3
| | | | | | | | | | | | The singulars are supposed to be deprecated