aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 13.0->trunkHEADorigin/mastermasterMatthew Wild45 hours0-0/+0
|\
| * Added tag 13.0.1 for changeset e78e79f1b5f5origin/13.013.0Matthew Wild45 hours0-0/+0
| |
* | Merge 13.0->trunkMatthew Wild45 hours3-3/+14
|\|
| * mod_admin_shell: Visual tweaks to the output of debug:cert_index()13.0.1Matthew Wild45 hours1-2/+9
| |
| * .luacheckrc: Ignore config files in spec/tlsMatthew Wild45 hours1-0/+5
| |
| * certmanager: Remove obsolete index log (replaced by shell command)Matthew Wild45 hours1-1/+0
| | | | | | | | | | This information can now be retrieved on-demand using the debug:cert_index() command, so we don't need to log it after every scan (it is rather verbose).
* | Merge 13.0->trunkMatthew Wild2 days2-1/+55
|\|
| * mod_admin_shell: Add debug:cert_index() commandMatthew Wild2 days1-0/+50
| |
| * certmanager: Improve logging for all cases where certs are skippedMatthew Wild2 days1-1/+5
| |
* | Merge 13.0->trunkMatthew Wild2 days13-0/+237
|\|
| * spec/tls: Add TLS/certificate integration testsMatthew Wild2 days13-0/+237
| | | | | | | | | | | | These tests help to verify that various configurations translate into the expected running TLS setups. Specifically right now we are checking the correct certificate is served.
* | Merge 13.0->trunkMatthew Wild2 days1-1/+3
|\|
| * portmanager: Add debug log message to state which certificate we end up usingMatthew Wild2 days1-0/+1
| |
| * portmanager: Take automatic cert selection into account when setting SNI certMatthew Wild2 days1-1/+2
| | | | | | | | | | This fixes (another) issue with the fix in 4ea7bd7325be, where it no longer checked the automatic cert index for an appropriate certificate.
* | Merge 13.0->trunkMatthew Wild3 days1-1/+1
|\|
| * prosodyctl check certs: Use correct hostname in warning message about HTTPSMatthew Wild3 days1-1/+1
| |
* | Merge 13.0->trunkKim Alvefur3 days1-1/+1
|\|
| * net.server_epoll: Use correct connection timeout when initiating Direct TLSKim Alvefur3 days1-1/+1
| | | | | | | | | | Otherwise it takes a lot longer to time out Direct TLS connections than TCP / STARTTLS connections.
* | Merge 13.0->trunkMatthew Wild3 days1-1/+1
|\|
| * portmanager: Use alternate host (if any) for SNI (many thanks Zaak!)Matthew Wild3 days1-1/+1
| | | | | | | | | | This was an oversight in the fix for #1915 in commit 4ea7bd7325be (though it seems commit 7e9ebdc75ce4 was the first to introduce this bug).
* | Merge 13.0->trunkKim Alvefur4 days2-10/+17
|\|
| * mod_tls: Collect full certificate chain validation informationKim Alvefur4 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 Alvefur4 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 Alvefur4 days3-2/+6
|\|
| * mod_s2s: Deal with OpenSSL changing spelling in stringsKim Alvefur4 days1-1/+1
| | | | | | | | https://github.com/openssl/openssl/commit/ade08735f9d0ac85d611c5abee8a1df651bbca13
| * mod_tls: Enable Prosody's certificate checking for incoming s2s connections ↵Matthew Wild4 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 Wild4 days1-0/+1
| |
* | Merge 13.0->trunkKim Alvefur5 days1-1/+1
|\|
| * mod_roster: Fix shell commands when a component is involved (fixes #1908)Kim Alvefur5 days1-1/+1
| | | | | | | | | | Prevent attempt to load rosters on Components since they do not have users or rosters.
* | Merge 13.0->trunkMatthew Wild5 days2-2/+12
|\|
| * mod_admin_shell, prosodyctl shell: Report command failure when no password ↵Matthew Wild5 days2-2/+12
| | | | | | | | entered (fixes #1907)
* | Merge 13.0->trunkMatthew Wild5 days1-2/+2
|\|
| * util.adminstream: Fix traceback on double-close (fixes #1913)Matthew Wild5 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 Wild5 days1-10/+14
|\|
| * core.portmanager: Restore use of per-host 'ssl' for SNI hosts. Fixes #1915.Kim Alvefur7 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 Alvefur13 days3-4/+27
|\|
| * doap: Add XEP-0333Kim Alvefur13 days3-2/+9
| |
| * doap: Add XEP-0334Kim Alvefur13 days3-2/+9
| |
| * doap: Add XEP-0156 and mod_http_altconnectKim Alvefur13 days1-0/+9
| |
* | Merge 13.0->trunkKim Alvefur13 days2-12/+12
|\|
| * mod_http_file_share: Explicitly reject all unsupported rangesKim Alvefur13 days1-0/+3
| | | | | | | | Fail fast. Otherwise it sends the whole file.
| * mod_http_file_share: Fix off by one in Range responseKim Alvefur13 days1-2/+3
| | | | | | | | See #1914
| * mod_storage_sql: Drop legacy index without confirmation to ease upgradesKim Alvefur13 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 Alvefur2025-03-223-30/+31
|\|
| * core.usermanager: Fix COMPAT layer for legacy is_admin() functionKim Alvefur2025-03-221-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
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 16:15:53 +0000