Software / code / prosody
Annotate
plugins/mod_version.lua @ 13801:a5d5fefb8b68 13.0
mod_tls: Enable Prosody's certificate checking for incoming s2s connections (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.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 01 Apr 2025 17:26:56 +0100 |
| parent | 13476:b9267ce1b183 |
| rev | line source |
|---|---|
|
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1312
diff
changeset
|
1 -- Prosody IM |
|
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
1646
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
|
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
1646
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
|
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
4793
diff
changeset
|
4 -- |
| 758 | 5 -- This project is MIT/X11 licensed. Please see the |
| 6 -- COPYING file in the source package for more information. | |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
517
diff
changeset
|
7 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
517
diff
changeset
|
8 |
|
12977
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
9436
diff
changeset
|
9 local st = require "prosody.util.stanza"; |
| 188 | 10 |
|
1646
21bcc7b8b4d8
mod_version: Rewritten to use new API. Added reply caching, and fixed some issues.
Waqas Hussain <waqas20@gmail.com>
parents:
1645
diff
changeset
|
11 module:add_feature("jabber:iq:version"); |
|
421
63be85693710
Modules now sending disco replies
Waqas Hussain <waqas20@gmail.com>
parents:
314
diff
changeset
|
12 |
|
3421
d3852a4d37e2
mod_version: Leave out the os element if hide_os_type is set
Kim Alvefur <zash@zash.se>
parents:
3420
diff
changeset
|
13 local query = st.stanza("query", {xmlns = "jabber:iq:version"}) |
| 9433 | 14 :text_tag("name", "Prosody") |
| 15 :text_tag("version", prosody.version); | |
|
3421
d3852a4d37e2
mod_version: Leave out the os element if hide_os_type is set
Kim Alvefur <zash@zash.se>
parents:
3420
diff
changeset
|
16 |
|
7977
01d6298de991
plugins/various: Use type-specific config API
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
17 if not module:get_option_boolean("hide_os_type") then |
|
9436
a950f9fa9137
mod_version: Reduce scope of variable
Kim Alvefur <zash@zash.se>
parents:
9435
diff
changeset
|
18 local platform; |
|
803
5a64649f4b94
mod_version: Operating system detection. Disable with hide_os_type = true in config
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
19 if os.getenv("WINDIR") then |
|
9435
33301038d3e4
mod_version: Rename confusingly named variable
Kim Alvefur <zash@zash.se>
parents:
9434
diff
changeset
|
20 platform = "Windows"; |
|
803
5a64649f4b94
mod_version: Operating system detection. Disable with hide_os_type = true in config
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
21 else |
|
7977
01d6298de991
plugins/various: Use type-specific config API
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
22 local os_version_command = module:get_option_string("os_version_command"); |
|
12977
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
9436
diff
changeset
|
23 local ok, pposix = pcall(require, "prosody.util.pposix"); |
|
3483
443139c396c5
mod_version: Use pposix.uname() if available and os_version_command not set
Matthew Wild <mwild1@gmail.com>
parents:
3421
diff
changeset
|
24 if not os_version_command and (ok and pposix and pposix.uname) then |
|
13476
b9267ce1b183
mod_version: Fix uname result style (thanks riau)
Kim Alvefur <zash@zash.se>
parents:
13474
diff
changeset
|
25 local uname, err = pposix.uname(); |
|
b9267ce1b183
mod_version: Fix uname result style (thanks riau)
Kim Alvefur <zash@zash.se>
parents:
13474
diff
changeset
|
26 if not uname then |
|
b9267ce1b183
mod_version: Fix uname result style (thanks riau)
Kim Alvefur <zash@zash.se>
parents:
13474
diff
changeset
|
27 module:log("debug", "Could not retrieve OS name: %s", err); |
|
13474
05c1098084cd
mod_version: Handle access denied from uname()
Kim Alvefur <zash@zash.se>
parents:
12977
diff
changeset
|
28 else |
|
05c1098084cd
mod_version: Handle access denied from uname()
Kim Alvefur <zash@zash.se>
parents:
12977
diff
changeset
|
29 platform = uname.sysname; |
|
05c1098084cd
mod_version: Handle access denied from uname()
Kim Alvefur <zash@zash.se>
parents:
12977
diff
changeset
|
30 end |
|
3483
443139c396c5
mod_version: Use pposix.uname() if available and os_version_command not set
Matthew Wild <mwild1@gmail.com>
parents:
3421
diff
changeset
|
31 end |
|
9435
33301038d3e4
mod_version: Rename confusingly named variable
Kim Alvefur <zash@zash.se>
parents:
9434
diff
changeset
|
32 if not platform then |
|
3483
443139c396c5
mod_version: Use pposix.uname() if available and os_version_command not set
Matthew Wild <mwild1@gmail.com>
parents:
3421
diff
changeset
|
33 local uname = io.popen(os_version_command or "uname"); |
|
443139c396c5
mod_version: Use pposix.uname() if available and os_version_command not set
Matthew Wild <mwild1@gmail.com>
parents:
3421
diff
changeset
|
34 if uname then |
|
9435
33301038d3e4
mod_version: Rename confusingly named variable
Kim Alvefur <zash@zash.se>
parents:
9434
diff
changeset
|
35 platform = uname:read("*a"); |
|
3483
443139c396c5
mod_version: Use pposix.uname() if available and os_version_command not set
Matthew Wild <mwild1@gmail.com>
parents:
3421
diff
changeset
|
36 end |
|
443139c396c5
mod_version: Use pposix.uname() if available and os_version_command not set
Matthew Wild <mwild1@gmail.com>
parents:
3421
diff
changeset
|
37 uname:close(); |
|
803
5a64649f4b94
mod_version: Operating system detection. Disable with hide_os_type = true in config
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
38 end |
|
5a64649f4b94
mod_version: Operating system detection. Disable with hide_os_type = true in config
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
39 end |
|
9435
33301038d3e4
mod_version: Rename confusingly named variable
Kim Alvefur <zash@zash.se>
parents:
9434
diff
changeset
|
40 if platform then |
|
33301038d3e4
mod_version: Rename confusingly named variable
Kim Alvefur <zash@zash.se>
parents:
9434
diff
changeset
|
41 platform = platform:match("^%s*(.-)%s*$") or platform; |
|
33301038d3e4
mod_version: Rename confusingly named variable
Kim Alvefur <zash@zash.se>
parents:
9434
diff
changeset
|
42 query:text_tag("os", platform); |
|
3483
443139c396c5
mod_version: Use pposix.uname() if available and os_version_command not set
Matthew Wild <mwild1@gmail.com>
parents:
3421
diff
changeset
|
43 end |
|
803
5a64649f4b94
mod_version: Operating system detection. Disable with hide_os_type = true in config
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
44 end |
|
5a64649f4b94
mod_version: Operating system detection. Disable with hide_os_type = true in config
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
45 |
|
9227
c0e058633d9a
mod_version: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
7977
diff
changeset
|
46 module:hook("iq-get/host/jabber:iq:version:query", function(event) |
|
9434
b502766a10d7
mod_version: Make 'origin' variable local for consistency
Kim Alvefur <zash@zash.se>
parents:
9433
diff
changeset
|
47 local origin, stanza = event.origin, event.stanza; |
|
b502766a10d7
mod_version: Make 'origin' variable local for consistency
Kim Alvefur <zash@zash.se>
parents:
9433
diff
changeset
|
48 origin.send(st.reply(stanza):add_child(query)); |
| 9229 | 49 return true; |
|
704
ef8d0d339172
mod_version: Removed and rearranged some code
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
50 end); |