Software / code / prosody
Annotate
util-src/GNUmakefile @ 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 | 12693:7c5afbdcbc77 |
| rev | line source |
|---|---|
|
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
418
diff
changeset
|
1 |
|
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
445
diff
changeset
|
2 include ../config.unix |
|
418
004c278154dc
Add rough Makefile for util-src/
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 |
|
7615
940603e99032
configure: Move -ggdb flag here from util-src/Make
Kim Alvefur <zash@zash.se>
parents:
7613
diff
changeset
|
4 CFLAGS+=-I$(LUA_INCDIR) |
|
418
004c278154dc
Add rough Makefile for util-src/
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 |
|
6877
020ededc84a6
util-src/Makefile: Use variables for install binary and target directory
Kim Alvefur <zash@zash.se>
parents:
6876
diff
changeset
|
6 INSTALL_DATA=install -m644 |
|
020ededc84a6
util-src/Makefile: Use variables for install binary and target directory
Kim Alvefur <zash@zash.se>
parents:
6876
diff
changeset
|
7 TARGET?=../util/ |
|
020ededc84a6
util-src/Makefile: Use variables for install binary and target directory
Kim Alvefur <zash@zash.se>
parents:
6876
diff
changeset
|
8 |
|
9561
cfc7b2f7251e
util.xpcall, util.compat: Add non-hacky multi-argument xpcall() for Lua 5.1
Matthew Wild <mwild1@gmail.com>
parents:
9313
diff
changeset
|
9 ALL=encodings.so hashes.so net.so pposix.so signal.so table.so \ |
|
12354
3ce3633527af
util.struct: Import Roberto 'struct' library v0.3
Matthew Wild <mwild1@gmail.com>
parents:
11166
diff
changeset
|
10 ringbuffer.so time.so poll.so compat.so strbitop.so \ |
|
12693
7c5afbdcbc77
util.crypto: New wrapper for some operations in OpenSSL's libcrypto
Matthew Wild <mwild1@gmail.com>
parents:
12354
diff
changeset
|
11 struct.so crypto.so |
|
6876
d1fc95d22f33
util-src/Makefile: Move list of .so files in a variable
Kim Alvefur <zash@zash.se>
parents:
6610
diff
changeset
|
12 |
|
7187
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
13 ifdef RANDOM |
|
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
14 ALL+=crand.so |
|
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
15 endif |
|
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
16 |
|
4396
03b59a511671
Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
17 .PHONY: all install clean |
|
2319
8dca45e17438
util-src/Makefile: Clean up makefile (re-commit because MattJ shouldn't commit anything at 3AM)
Brian Cully <bjc@junctionnetworks.com>
parents:
2022
diff
changeset
|
18 .SUFFIXES: .c .o .so |
|
8dca45e17438
util-src/Makefile: Clean up makefile (re-commit because MattJ shouldn't commit anything at 3AM)
Brian Cully <bjc@junctionnetworks.com>
parents:
2022
diff
changeset
|
19 |
|
6876
d1fc95d22f33
util-src/Makefile: Move list of .so files in a variable
Kim Alvefur <zash@zash.se>
parents:
6610
diff
changeset
|
20 all: $(ALL) |
|
4396
03b59a511671
Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
21 |
|
6876
d1fc95d22f33
util-src/Makefile: Move list of .so files in a variable
Kim Alvefur <zash@zash.se>
parents:
6610
diff
changeset
|
22 install: $(ALL) |
|
8592
bd4f8a2b72c7
Rename Makefile -> GNUmakefile to reflect dependency on GNU Make
Kim Alvefur <zash@zash.se>
parents:
7615
diff
changeset
|
23 $(INSTALL_DATA) $? $(TARGET) |
|
4396
03b59a511671
Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
24 |
|
03b59a511671
Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
25 clean: |
|
7187
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
26 rm -f $(ALL) $(patsubst %.so,%.o,$(ALL)) |
|
4396
03b59a511671
Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile
Matthew Wild <mwild1@gmail.com>
parents:
3964
diff
changeset
|
27 |
|
11009
74ef9f2334f3
configure: Pass compiler flag to enable ICU only when building util.encodings
Kim Alvefur <zash@zash.se>
parents:
9561
diff
changeset
|
28 encodings.o: CFLAGS+=$(IDNA_FLAGS) |
|
6881
5886efd95c11
util-src/Makefile: Don't make exceptions for how to build .so for util.hashes and util.encodings
Kim Alvefur <zash@zash.se>
parents:
6880
diff
changeset
|
29 encodings.so: LDLIBS+=$(IDNA_LIBS) |
|
3963
18b82491dc88
util-src/Makefile: Clean up and remove unnecessary all linking
Matthew Wild <mwild1@gmail.com>
parents:
3769
diff
changeset
|
30 |
|
12693
7c5afbdcbc77
util.crypto: New wrapper for some operations in OpenSSL's libcrypto
Matthew Wild <mwild1@gmail.com>
parents:
12354
diff
changeset
|
31 crypto.so hashes.so: LDLIBS+=$(OPENSSL_LIBS) |
|
3762
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3334
diff
changeset
|
32 |
|
7187
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
33 crand.o: CFLAGS+=-DWITH_$(RANDOM) |
|
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
34 crand.so: LDLIBS+=$(RANDOM_LIBS) |
|
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
7117
diff
changeset
|
35 |
|
6880
8678def0e53b
util-src/Makefile: Tell Make how to build .so from .o in a modern way (Let built-in rules handle .o)
Kim Alvefur <zash@zash.se>
parents:
6879
diff
changeset
|
36 %.so: %.o |
|
8678def0e53b
util-src/Makefile: Tell Make how to build .so from .o in a modern way (Let built-in rules handle .o)
Kim Alvefur <zash@zash.se>
parents:
6879
diff
changeset
|
37 $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) |