Diff

core/portmanager.lua @ 11590:5aafb832c91b

core.portmanager: Fix race condition in initialization of SNI cert map Under some circumstances when hosts and modules are loaded in some certain order, entries end up missing from the SNI map. This manifests in e.g. `curl https://localhost:5281/` giving an error about "unrecognized name". The `service` argument is `nil` when invoked from the "host-activated" event, leading it to iterating over every service. And then it would not be fetching e.g. `http_host` from the config, which explains why https would sometimes not work due to the missing name entry. Because when `service` is included, this limits the iteration to matching entries, while also returning the same value as the `name` loop variable. Because `name == service when service != nil` we can use name instead in the body of the loop.
author Kim Alvefur <zash@zash.se>
date Fri, 28 May 2021 17:09:22 +0200
parent 11536:fb9bd9fa4356
child 11596:f6f1b50cbedf
line wrap: on
line diff
--- a/core/portmanager.lua	Fri May 28 00:17:44 2021 +0200
+++ b/core/portmanager.lua	Fri May 28 17:09:22 2021 +0200
@@ -237,8 +237,8 @@
 			local config_prefix = (active_service.config_prefix or name).."_";
 			if config_prefix == "_" then config_prefix = ""; end
 			local prefix_ssl_config = config.get(host, config_prefix.."ssl");
-			local alternate_host = service and config.get(host, service.."_host");
-			if not alternate_host and service == "https" then
+			local alternate_host = name and config.get(host, name.."_host");
+			if not alternate_host and name == "https" then
 				-- TODO should this be some generic thing? e.g. in the service definition
 				alternate_host = config.get(host, "http_host");
 			end