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

net.tls_luasec: Expose method for loading a certificate

Browse source 
Further isolates LuaSec from Prosody core, with the ultimate goal of
allowing LuaSec to be replaced more easily.
This commit is contained in:
Kim Alvefur 2023-05-27 15:40:49 +02:00
parent 296710c701
commit e6f0e0b9d0
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/certmanager.lua
View file

@ -6,7 +6,6 @@
-- COPYING file in the source package for more information. -- COPYING file in the source package for more information.
-- --
local ssl = require "ssl";
local configmanager = require "prosody.core.configmanager"; local configmanager = require "prosody.core.configmanager";
local log = require "prosody.util.logger".init("certmanager"); local log = require "prosody.util.logger".init("certmanager");
local new_config = require"prosody.net.server".tls_builder; local new_config = require"prosody.net.server".tls_builder;
@ -98,7 +97,7 @@ local function index_certs(dir, files_by_name, depth_limit)
local firstline = f:read(); local firstline = f:read();
if firstline == "-----BEGIN CERTIFICATE-----" and lfs.attributes(find_matching_key(full), "mode") == "file" then if firstline == "-----BEGIN CERTIFICATE-----" and lfs.attributes(find_matching_key(full), "mode") == "file" then
f:seek("set") f:seek("set")
local cert = ssl.loadcertificate(f:read("*a")) local cert = tls.load_certificate(f:read("*a"))
-- TODO if more than one cert is found for a name, the most recently -- TODO if more than one cert is found for a name, the most recently
-- issued one should be used. -- issued one should be used.
-- for now, just filter out expired certs -- for now, just filter out expired certs

1
net/tls_luasec.lua
View file

@ -110,4 +110,5 @@ local luasec_has = ssl.config or {
return { return {
features = luasec_has; features = luasec_has;
new_context = new_context, new_context = new_context,
load_certificate = ssl.loadcertificate;
}; };