Software / code / prosody
Comparison
core/certmanager.lua @ 12508:e6cfd0a6f0da
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 16 May 2022 11:42:31 +0200 |
| parent | 12481:2ee27587fec7 |
| parent | 12507:e242a6e74424 |
| child | 12972:ead41e25ebc0 |
comparison
equal
deleted
inserted
replaced
| 12506:d04f6f014636 | 12508:e6cfd0a6f0da |
|---|---|
| 156 local wildcard_host = host:gsub("^[^.]+%.", "*."); | 156 local wildcard_host = host:gsub("^[^.]+%.", "*."); |
| 157 local certs = index[host] or index[wildcard_host]; | 157 local certs = index[host] or index[wildcard_host]; |
| 158 if certs then | 158 if certs then |
| 159 local cert_filename, services = next(certs); | 159 local cert_filename, services = next(certs); |
| 160 if services["*"] then | 160 if services["*"] then |
| 161 log("debug", "Using cert %q from index", cert_filename); | 161 log("debug", "Using cert %q from index for host %q", cert_filename, host); |
| 162 return { | 162 return { |
| 163 certificate = cert_filename, | 163 certificate = cert_filename, |
| 164 key = find_matching_key(cert_filename), | 164 key = find_matching_key(cert_filename), |
| 165 } | 165 } |
| 166 end | 166 end |
| 182 cert_index = index_certs(resolve_path(config_path, global_certificates)); | 182 cert_index = index_certs(resolve_path(config_path, global_certificates)); |
| 183 end | 183 end |
| 184 for _, certs in pairs(cert_index) do | 184 for _, certs in pairs(cert_index) do |
| 185 for cert_filename, services in pairs(certs) do | 185 for cert_filename, services in pairs(certs) do |
| 186 if services[service] or services["*"] then | 186 if services[service] or services["*"] then |
| 187 log("debug", "Using cert %q from index", cert_filename); | 187 log("debug", "Using cert %q from index for service %s port %d", cert_filename, service, port); |
| 188 return { | 188 return { |
| 189 certificate = cert_filename, | 189 certificate = cert_filename, |
| 190 key = find_matching_key(cert_filename), | 190 key = find_matching_key(cert_filename), |
| 191 } | 191 } |
| 192 end | 192 end |