comparison plugins/mod_tls.lua @ 10411:db2a06b9ff98

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 16 Nov 2019 16:52:31 +0100
parents ca01c449357f
children 0b0fe73199d2
comparison
equal deleted inserted replaced
10410:659b577f280c 10411:db2a06b9ff98
33 local hosts = prosody.hosts; 33 local hosts = prosody.hosts;
34 local host = hosts[module.host]; 34 local host = hosts[module.host];
35 35
36 local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin; 36 local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin;
37 local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin; 37 local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin;
38 local err_c2s, err_s2sin, err_s2sout;
38 39
39 function module.load() 40 function module.load()
40 local NULL, err = {}; 41 local NULL = {};
41 local modhost = module.host; 42 local modhost = module.host;
42 local parent = modhost:match("%.(.*)$"); 43 local parent = modhost:match("%.(.*)$");
43 44
44 local parent_ssl = rawgetopt(parent, "ssl") or NULL; 45 local parent_ssl = rawgetopt(parent, "ssl") or NULL;
45 local host_ssl = rawgetopt(modhost, "ssl") or parent_ssl; 46 local host_ssl = rawgetopt(modhost, "ssl") or parent_ssl;
51 local global_s2s = rawgetopt("*", "s2s_ssl") or NULL; 52 local global_s2s = rawgetopt("*", "s2s_ssl") or NULL;
52 local parent_s2s = rawgetopt(parent, "s2s_ssl") or NULL; 53 local parent_s2s = rawgetopt(parent, "s2s_ssl") or NULL;
53 local host_s2s = rawgetopt(modhost, "s2s_ssl") or parent_s2s; 54 local host_s2s = rawgetopt(modhost, "s2s_ssl") or parent_s2s;
54 55
55 module:log("debug", "Creating context for c2s"); 56 module:log("debug", "Creating context for c2s");
56 ssl_ctx_c2s, err, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections 57 local request_client_certs = { verify = { "peer", "client_once", }; };
57 if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err); end
58 58
59 module:log("debug", "Creating context for s2sout"); 59 module:log("debug", "Creating context for s2sout");
60 ssl_ctx_s2sout, err, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s); -- for outgoing server connections 60 ssl_ctx_c2s, err_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
61 if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err); end 61 if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err_c2s); end
62 62
63 module:log("debug", "Creating context for s2sin"); 63 module:log("debug", "Creating context for s2sin");
64 ssl_ctx_s2sin, err, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s); -- for incoming server connections 64 -- for outgoing server connections
65 if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err); end 65 ssl_ctx_s2sout, err_s2sout, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s, request_client_certs);
66 if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err_s2sout); end
67
68 -- for incoming server connections
69 ssl_ctx_s2sin, err_s2sin, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s, request_client_certs);
70 if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err_s2sin); end
66 end 71 end
67 72
68 module:hook_global("config-reloaded", module.load); 73 module:hook_global("config-reloaded", module.load);
69 74
70 local function can_do_tls(session) 75 local function can_do_tls(session)
75 return false; 80 return false;
76 elseif session.ssl_ctx ~= nil then 81 elseif session.ssl_ctx ~= nil then
77 return session.ssl_ctx; 82 return session.ssl_ctx;
78 end 83 end
79 if session.type == "c2s_unauthed" then 84 if session.type == "c2s_unauthed" then
85 if not ssl_ctx_c2s and c2s_require_encryption then
86 session.log("error", "No TLS context available for c2s. Earlier error was: %s", err_c2s);
87 end
80 session.ssl_ctx = ssl_ctx_c2s; 88 session.ssl_ctx = ssl_ctx_c2s;
81 session.ssl_cfg = ssl_cfg_c2s; 89 session.ssl_cfg = ssl_cfg_c2s;
82 elseif session.type == "s2sin_unauthed" and allow_s2s_tls then 90 elseif session.type == "s2sin_unauthed" and allow_s2s_tls then
91 if not ssl_ctx_s2sin and s2s_require_encryption then
92 session.log("error", "No TLS context available for s2sin. Earlier error was: %s", err_s2sin);
93 end
83 session.ssl_ctx = ssl_ctx_s2sin; 94 session.ssl_ctx = ssl_ctx_s2sin;
84 session.ssl_cfg = ssl_cfg_s2sin; 95 session.ssl_cfg = ssl_cfg_s2sin;
85 elseif session.direction == "outgoing" and allow_s2s_tls then 96 elseif session.direction == "outgoing" and allow_s2s_tls then
97 if not ssl_ctx_s2sout and s2s_require_encryption then
98 session.log("error", "No TLS context available for s2sout. Earlier error was: %s", err_s2sout);
99 end
86 session.ssl_ctx = ssl_ctx_s2sout; 100 session.ssl_ctx = ssl_ctx_s2sout;
87 session.ssl_cfg = ssl_cfg_s2sout; 101 session.ssl_cfg = ssl_cfg_s2sout;
88 else 102 else
89 session.log("debug", "Unknown session type, don't know which TLS context to use"); 103 session.log("debug", "Unknown session type, don't know which TLS context to use");
90 return false; 104 return false;