Software / code / prosody
Annotate
spec/util_iterators_spec.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 | 12744:e894677359e5 |
| rev | line source |
|---|---|
|
8802
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
1 local iter = require "util.iterators"; |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
2 |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 describe("util.iterators", function () |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 describe("join", function () |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 it("should produce a joined iterator", function () |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 local expect = { "a", "b", "c", 1, 2, 3 }; |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 local output = {}; |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
8 for x in iter.join(iter.values({"a", "b", "c"})):append(iter.values({1, 2, 3})) do |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 table.insert(output, x); |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
10 end |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
11 assert.same(output, expect); |
|
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
12 end); |
|
12744
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
13 it("should work with only a single iterator", function () |
|
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
14 local expect = { "a", "b", "c" }; |
|
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
15 local output = {}; |
|
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
16 for x in iter.join(iter.values({"a", "b", "c"})) do |
|
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
17 table.insert(output, x); |
|
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
18 end |
|
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
19 assert.same(output, expect); |
|
e894677359e5
util.iterators: join: Work even with only a single iterator in the chain
Matthew Wild <mwild1@gmail.com>
parents:
9328
diff
changeset
|
20 end); |
|
8802
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
21 end); |
|
9327
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
22 |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
23 describe("sorted_pairs", function () |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
24 it("should produce sorted pairs", function () |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
25 local orig = { b = 1, c = 2, a = "foo", d = false }; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
26 local n, last_key = 0, nil; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
27 for k, v in iter.sorted_pairs(orig) do |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
28 n = n + 1; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
29 if last_key then |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
30 assert(k > last_key, "Expected "..k.." > "..last_key) |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
31 end |
|
9328
a9592107021b
util.iterators tests: Check value matches expected [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
9327
diff
changeset
|
32 assert.equal(orig[k], v); |
|
9327
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
33 last_key = k; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
34 end |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
35 assert.equal("d", last_key); |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
36 assert.equal(4, n); |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
37 end); |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
38 |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
39 it("should allow a custom sort function", function () |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
40 local orig = { b = 1, c = 2, a = "foo", d = false }; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
41 local n, last_key = 0, nil; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
42 for k, v in iter.sorted_pairs(orig, function (a, b) return a > b end) do |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
43 n = n + 1; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
44 if last_key then |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
45 assert(k < last_key, "Expected "..k.." > "..last_key) |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
46 end |
|
9328
a9592107021b
util.iterators tests: Check value matches expected [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
9327
diff
changeset
|
47 assert.equal(orig[k], v); |
|
9327
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
48 last_key = k; |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
49 end |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
50 assert.equal("a", last_key); |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
51 assert.equal(4, n); |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
52 end); |
|
f6f1dec164b5
util.iterators: Add sorted_pairs() method
Matthew Wild <mwild1@gmail.com>
parents:
8805
diff
changeset
|
53 end); |
|
8802
befffddf1b25
Fix wrong tests committed with 7b621a4a2e8d
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
54 end); |