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

mod_admin_telnet: Handle unavailable cipher info (fixes #1510)

Browse source 
The LuaSec :info() method gathers info using the OpenSSL function
SSL_get_current_cipher(). Documentation for this function states that it
may return NULL if no session has been established (yet). If so, the
LuaSec functions wrapping this return nil, triggering a nil-indexing
error in mod_admin_telnet.
This commit is contained in:
Kim Alvefur 2020-03-22 17:35:26 +01:00
parent ffe0b57c6c
commit 4a257f3ce6
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/mod_admin_telnet.lua
View file

@ -528,11 +528,14 @@ local function tls_info(session, line)
common_info(session, line); common_info(session, line);
if session.secure then if session.secure then
local sock = session.conn and session.conn.socket and session.conn:socket(); local sock = session.conn and session.conn.socket and session.conn:socket();
if sock and sock.info then if sock then
local info = sock:info(); local info = sock.info and sock:info();
line[#line+1] = ("(%s with %s)"):format(info.protocol, info.cipher); if info then
else line[#line+1] = ("(%s with %s)"):format(info.protocol, info.cipher);
line[#line+1] = "(cipher info unavailable)"; else
-- TLS session might not be ready yet
line[#line+1] = "(cipher info unavailable)";
end
end end
else else
line[#line+1] = "(insecure)"; line[#line+1] = "(insecure)";