mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain (fixes #511)

Browse source
This commit is contained in:
Kim Alvefur 2015-09-15 17:51:56 +02:00
parent d90975c195
commit 7b18c25101
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/mod_tls.lua
View file

@ -7,6 +7,7 @@
--
local create_context = require "core.certmanager".create_context;
local rawgetopt = require"core.configmanager".rawget;
local st = require "util.stanza";
local c2s_require_encryption = module:get_option("c2s_require_encryption", module:get_option("require_encryption"));
@ -36,19 +37,20 @@ local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin;
local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin;
do
local NULL, err = {};
local global = module:context("*");
local parent = module:context(module.host:match("%.(.*)$"));
local modhost = module.host;
local parent = modhost:match("%.(.*)$");
local parent_ssl = parent:get_option("ssl");
local host_ssl = module:get_option("ssl", parent_ssl);
local global_ssl = rawgetopt("*", "ssl") or NULL;
local parent_ssl = rawgetopt(parent, "ssl") or NULL;
local host_ssl = rawgetopt(modhost, "ssl") or parent_ssl;
local global_c2s = global:get_option("c2s_ssl", NULL);
local parent_c2s = parent:get_option("c2s_ssl", NULL);
local host_c2s = module:get_option("c2s_ssl", parent_c2s);
local global_c2s = rawgetopt("*", "c2s_ssl") or NULL;
local parent_c2s = rawgetopt(parent, "c2s_ssl") or NULL;
local host_c2s = rawgetopt(modhost, "c2s_ssl") or parent_ssl;
local global_s2s = global:get_option("s2s_ssl", NULL);
local parent_s2s = parent:get_option("s2s_ssl", NULL);
local host_s2s = module:get_option("s2s_ssl", parent_s2s);
local global_s2s = rawgetopt("*", "s2s_ssl") or NULL;
local parent_s2s = rawgetopt(parent, "s2s_ssl") or NULL;
local host_s2s = rawgetopt(modhost, "s2s_ssl") or parent_ssl;
ssl_ctx_c2s, err, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err); end