aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 13.0->trunkKim Alvefur3 days2-10/+17
|\
| * mod_tls: Collect full certificate chain validation informationKim Alvefur3 days1-1/+2
| | | | | | | | | | | | Enabling at least one of the ssl.verifyext modes enables a callback that collects all the errors, which are used by mod_s2s to report better problem descriptions.
| * mod_s2s: Handle single message from chain validationKim Alvefur3 days1-9/+15
| | | | | | | | | | | | Setting ssl.verifyext enables a callback that collects all errors from every layer of the certificate chain. Otherwise a single string is returned, which we did not handle before.
* | Merge 13.0->trunkKim Alvefur3 days3-2/+6
|\|
| * mod_s2s: Deal with OpenSSL changing spelling in stringsKim Alvefur3 days1-1/+1
| | | | | | | | https://github.com/openssl/openssl/commit/ade08735f9d0ac85d611c5abee8a1df651bbca13
| * mod_tls: Enable Prosody's certificate checking for incoming s2s connections ↵Matthew Wild3 days1-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixes #1916) (thanks Damian, Zash) Various options in Prosody allow control over the behaviour of the certificate verification process For example, some deployments choose to allow falling back to traditional "dialback" authentication (XEP-0220), while others verify via DANE, hard-coded fingerprints, or other custom plugins. Implementing this flexibility requires us to override OpenSSL's default certificate verification, to allow Prosody to verify the certificate itself, apply custom policies and make decisions based on the outcome. To enable our custom logic, we have to suppress OpenSSL's default behaviour of aborting the connection with a TLS alert message. With LuaSec, this can be achieved by using the verifyext "lsec_continue" flag. We also need to use the lsec_ignore_purpose flag, because XMPP s2s uses server certificates as "client" certificates (for mutual TLS verification in outgoing s2s connections). Commit 99d2100d2918 moved these settings out of the defaults and into mod_s2s, because we only really need these changes for s2s, and they should be opt-in, rather than automatically applied to all TLS services we offer. That commit was incomplete, because it only added the flags for incoming direct TLS connections. StartTLS connections are handled by mod_tls, which was not applying the lsec_* flags. It previously worked because they were already in the defaults. This resulted in incoming s2s connections with "invalid" certificates being aborted early by OpenSSL, even if settings such as `s2s_secure_auth = false` or DANE were present in the config. Outgoing s2s connections inherit verify "none" from the defaults, which means OpenSSL will receive the cert but will not terminate the connection when it is deemed invalid. This means we don't need lsec_continue there, and we also don't need lsec_ignore_purpose (because the remote peer is a "server"). Wondering why we can't just use verify "none" for incoming s2s? It's because in that mode, OpenSSL won't request a certificate from the peer for incoming connections. Setting verify "peer" is how you ask OpenSSL to request a certificate from the client, but also what triggers its built-in verification.
| * prosodyctl: Fix spacing in warning messageMatthew Wild3 days1-0/+1
| |
* | Merge 13.0->trunkKim Alvefur4 days1-1/+1
|\|
| * mod_roster: Fix shell commands when a component is involved (fixes #1908)Kim Alvefur4 days1-1/+1
| | | | | | | | | | Prevent attempt to load rosters on Components since they do not have users or rosters.
* | Merge 13.0->trunkMatthew Wild4 days2-2/+12
|\|
| * mod_admin_shell, prosodyctl shell: Report command failure when no password ↵Matthew Wild4 days2-2/+12
| | | | | | | | entered (fixes #1907)
* | Merge 13.0->trunkMatthew Wild4 days1-2/+2
|\|
| * util.adminstream: Fix traceback on double-close (fixes #1913)Matthew Wild4 days1-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | In some circumstances, particularly with 'opportunistic_writes' and 'fatal_errors' enabled in the epoll backend, the connection may be closed halfway through the session close process (because it contains debug logging, which in the case of the watch:log() command, will trigger a write to the socket). The chosen fix is to cache session.conn in a local variable (we already did this later on, but this pulls it up to the top of the function, which is generally more correct anyway).
* | Merge 13.0->trunkMatthew Wild4 days1-10/+14
|\|
| * core.portmanager: Restore use of per-host 'ssl' for SNI hosts. Fixes #1915.Kim Alvefur6 days1-10/+14
| | | | | | | | | | | | | | | | | | | | | | This was an unintentional regression, as per-host 'ssl' options became valid in 0.12 when SNI support was added for direct TLS ports. While we encourage most people to use the simpler automatic certificate selection (and it seems most do, given the overlooking of this bug), there are likely always going to be use cases for manually-configured certificates. The issue was introduced in commit 7e9ebdc75ce4 which inadvertently removed the per-host option checking for SNI.
* | Merge 13.0->trunkKim Alvefur12 days3-4/+27
|\|
| * doap: Add XEP-0333Kim Alvefur12 days3-2/+9
| |
| * doap: Add XEP-0334Kim Alvefur12 days3-2/+9
| |
| * doap: Add XEP-0156 and mod_http_altconnectKim Alvefur12 days1-0/+9
| |
* | Merge 13.0->trunkKim Alvefur12 days2-12/+12
|\|
| * mod_http_file_share: Explicitly reject all unsupported rangesKim Alvefur12 days1-0/+3
| | | | | | | | Fail fast. Otherwise it sends the whole file.
| * mod_http_file_share: Fix off by one in Range responseKim Alvefur12 days1-2/+3
| | | | | | | | See #1914
| * mod_storage_sql: Drop legacy index without confirmation to ease upgradesKim Alvefur12 days1-10/+6
| | | | | | | | | | Deleting one index should be safe enough to do without requiring a explicitly upgrading during downtime. People had trouble with this.
* | Merge 13.0->trunkKim Alvefur13 days3-30/+31
|\|
| * core.usermanager: Fix COMPAT layer for legacy is_admin() functionKim Alvefur13 days1-1/+2
| | | | | | | | | | | | Thanks ctrlaltca Fixes #1912
| * core.storagemanager: Fix tests by removing an assert that upset luarocksKim Alvefur2025-03-191-1/+1
| | | | | | | | Not sure why but this assert() caused a stack overflow in luarocks
| * mod_storage_sql: Fix indentationKim Alvefur2025-03-191-28/+28
| | | | | | | | Off-by-one in autoindent after `if not success then` since 3ec48555b773
* | Merge 13.0->trunkMatthew Wild2025-03-171-4/+32
|\|
| * prosodyctl check: Be more robust against invalid disco_items, and show warningMatthew Wild2025-03-171-4/+32
| |
* | Merge 13.0->trunkKim Alvefur2025-03-171-9/+30
|\|
| * mod_http_file_share: Improve error reporting by using util.error moreKim Alvefur2025-03-161-9/+30
| | | | | | | | | | This should pass back the error message as well as the status code to the client.
* | Merge 13.0->trunkMatthew Wild2025-03-131-1/+3
|\|
| * Added tag 13.0.0 for changeset a8ad0741632dMatthew Wild2025-03-130-0/+0
| |
| * CHANGES: 13.0.0 release date13.0.0Matthew Wild2025-03-131-0/+2
| |
| * CHANGES: Fix 13.0.0 version numberMatthew Wild2025-03-131-1/+1
| |
* | Merge 13.0->trunkMatthew Wild2025-03-133-20/+45
|\|
| * prosodyctl shell: More reliable detection of REPL/interactive mode (fixes #1895)Matthew Wild2025-03-132-7/+5
| |
| * mod_admin_shell: Remove outdated help text (fixes #1898)Matthew Wild2025-03-131-7/+2
| | | | | | | | | | | | | | | | The ! commands have been broken for some time, and we're not going to implement them right now. If we want fancier editing, we can now do that on the client side (with readline and stuff). Also removes mention of telnet!
| * prosodyctl check features: Report size limit for HTTP uploadMatthew Wild2025-03-131-3/+21
| | | | | | | | This also adds a generic "meta" mechanism where checks can return annotations.
| * prosodyctl check features: Add descriptions to featuresMatthew Wild2025-03-131-3/+17
| | | | | | | | | | Also shuffles mod_pep check to multi-device sync, as I think that's a better fit.
* | Merge 13.0->trunkMatthew Wild2025-03-117-18/+56
|\|
| * mod_websocket: Merge session close handling changes from mod_c2s (bug fixes)Matthew Wild2025-03-111-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should bring some fixes and general robustness that mod_websocket had missed out on. The duplicated code here is not at all ideal. To prevent this happening again, we should figure out how to have the common logic in a single place, while still being able to do the websocket-specific parts that we need. The main known bug that this fixes is that it's possible for a session to get into a non-destroyable state. For example, if we try to session:close() a hibernating session, then session.conn is nil and the function will simply return without doing anything. In the mod_c2s code we already handle this, and just destroy the session. But if a hibernating websocket session is never resumed or becomes non-resumable, it will become immortal! By merging the fix from mod_c2s, the session should now be correctly destroyed.
| * mod_c2s: Code formatting changeMatthew Wild2025-03-111-2/+6
| | | | | | | | | | | | Although we do sometimes use single-line if blocks, I'm expanding this one to make it easier to compare with the duplicated (but modified) code in mod_websocket that we plan to de-duplicate one day.
| * CHANGES: Add list of new modulesMatthew Wild2025-03-111-0/+9
| |
| * util.argparse: Fix bug (regression?) in argument parsing with --foo=barMatthew Wild2025-03-112-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After recent changes, '--foo bar' was working, but '--foo=bar' was not. The test had a typo (?) (bar != baz) and because util.argparse is not strict by default, the typo was not caught. The typo caused the code to take a different path, and bypassed the buggy handling of --foo=bar options. I've preserved the existing test (typo and all!) because it's still an interesting test, and ensures no unintended behaviour changes compared to the old code. However I've added a new variant of the test, with strict mode enabled and the typo fixed. This test failed due to the bug, and this commit introduces a fix.
| * mod_storage_internal: Use UUIDv7 for message idsMatthew Wild2025-03-101-2/+2
| | | | | | | | | | | | This matches what we use for SQL already, so provides some consistency. Client developers prefer sortable ids.
| * usermanager: Add info logging for all usermanager account changesMatthew Wild2025-03-101-1/+10
| |
* | Merge 13.0->trunkMatthew Wild2025-03-061-3/+8
|\|
| * util.sasl: Preserve 'userdata' field between clonesMatthew Wild2025-03-061-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The :clean_clone() method is designed to provide a new cloned SASL handler, to be used when starting a fresh SASL negotiation on an existing connection. The userdata field is currently populated by mod_saslauth with the "read-only" information that the channel binding methods need to do their stuff. When :clean_clone() does not preserve this, it causes tracebacks in the cb profile handlers due to the property being nil. This does mean that SASL handlers should now not be reused (even when cloned) across different connections, if they ever could.
* | Merge 13.0->trunkMatthew Wild2025-03-011-0/+1
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 11:24:33 +0000