prosody
873538f0b18c
plugins/mod_tls.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/mod_tls.lua @ 6526:873538f0b18c

certmanager, mod_tls: Return final ssl config as third return value (fix for c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
author Kim Alvefur <zash@zash.se>
date Sat, 22 Nov 2014 11:51:54 +0100
parent 6521:29c7586665f5
child 6709:b6eff3ba13de
comparison
equal deleted inserted replaced
6524:185817ef4a4d 6526:873538f0b18c
32 local host = hosts[module.host]; 32 local host = hosts[module.host];
33 33
34 local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin; 34 local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin;
35 local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin; 35 local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin;
36 do 36 do
37 local NULL = {}; 37 local NULL, err = {};
38 local global = module:context("*"); 38 local global = module:context("*");
39 local parent = module:context(module.host:match("%.(.*)$")); 39 local parent = module:context(module.host:match("%.(.*)$"));
40 40
41 local parent_ssl = parent:get_option("ssl"); 41 local parent_ssl = parent:get_option("ssl");
42 local host_ssl = module:get_option("ssl", parent_ssl); 42 local host_ssl = module:get_option("ssl", parent_ssl);
47 47
48 local global_s2s = global:get_option("s2s_ssl", NULL); 48 local global_s2s = global:get_option("s2s_ssl", NULL);
49 local parent_s2s = parent:get_option("s2s_ssl", NULL); 49 local parent_s2s = parent:get_option("s2s_ssl", NULL);
50 local host_s2s = module:get_option("s2s_ssl", parent_s2s); 50 local host_s2s = module:get_option("s2s_ssl", parent_s2s);
51 51
52 ssl_ctx_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections 52 ssl_ctx_c2s, err, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
53 if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", ssl_cfg_c2s); end 53 if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err); end
54 54
55 ssl_ctx_s2sout, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s); -- for outgoing server connections 55 ssl_ctx_s2sout, err, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s); -- for outgoing server connections
56 if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", ssl_cfg_s2sin); end 56 if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err); end
57 57
58 ssl_ctx_s2sin, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s); -- for incoming server connections 58 ssl_ctx_s2sin, err, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s); -- for incoming server connections
59 if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", ssl_cfg_s2sin); end 59 if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err); end
60 end 60 end
61 61
62 local function can_do_tls(session) 62 local function can_do_tls(session)
63 if not session.conn.starttls then 63 if not session.conn.starttls then
64 return false; 64 return false;