diff options
| author | Kim Alvefur <zash@zash.se> | 2019-03-10 19:58:28 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-03-10 19:58:28 +0100 |
| commit | a08b6d8226ab4f2fe5358f664990e245db01b9a6 (patch) | |
| tree | aa9153069270fcd77844f666379d2bba6a38d02f | |
| parent | b47d67c80fe77a3414c8f0ef1fa92cec96696e54 (diff) | |
| download | prosody-a08b6d8226ab4f2fe5358f664990e245db01b9a6.tar.gz prosody-a08b6d8226ab4f2fe5358f664990e245db01b9a6.zip | |
core.certmanager: Do not ask for client certificates by default
Since it's mostly only mod_s2s that needs to request client
certificates it makes some sense to have mod_s2s ask for this, instead
of having eg mod_http ask to disable it.
| -rw-r--r-- | core/certmanager.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_http.lua | 3 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 5282a6f5..63f314f8 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -106,7 +106,7 @@ local core_defaults = { capath = "/etc/ssl/certs"; depth = 9; protocol = "tlsv1+"; - verify = (ssl_x509 and { "peer", "client_once", }) or "none"; + verify = "none"; options = { cipher_server_preference = luasec_has.options.cipher_server_preference; no_ticket = luasec_has.options.no_ticket; diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 829c2d02..17ea27e1 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -228,9 +228,6 @@ module:provides("net", { listener = server.listener; default_port = 5281; encryption = "ssl"; - ssl_config = { - verify = "none"; - }; multiplex = { pattern = "^[A-Z]"; }; diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 79308847..b0d551fe 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -738,6 +738,9 @@ module:provides("net", { listener = listener; default_port = 5269; encryption = "starttls"; + ssl_config = { + verify = { "peer", "client_once", }; + }; multiplex = { pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:server%1.*>"; }; |