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.server_epoll: Use only fatal "write" timeout during TLS negotiation

Browse source 
Only real difference between the read and write timeouts is that the
former has a callback that allows the higher levels to keep the
connection alive, while hitting the later is immediately fatal. We want
the later behavior for TLS negotiation.
This commit is contained in:
Kim Alvefur 2021-07-16 17:10:09 +02:00
parent 50bd7b79ea
commit d2678dfdee
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/server_epoll.lua
View file

@ -600,7 +600,7 @@ function interface:starttls(tls_ctx)
self.onwritable = interface.inittls; self.onwritable = interface.inittls;
self.onreadable = interface.inittls; self.onreadable = interface.inittls;
self:set(true, true); self:set(true, true);
self:setreadtimeout(cfg.ssl_handshake_timeout); self:setreadtimeout(false);
self:setwritetimeout(cfg.ssl_handshake_timeout); self:setwritetimeout(cfg.ssl_handshake_timeout);
self:debug("Prepared to start TLS"); self:debug("Prepared to start TLS");
end end
@ -651,7 +651,7 @@ function interface:inittls(tls_ctx, now)
if now then if now then
return self:tlshandshake() return self:tlshandshake()
end end
self:setreadtimeout(cfg.ssl_handshake_timeout); self:setreadtimeout(false);
self:setwritetimeout(cfg.ssl_handshake_timeout); self:setwritetimeout(cfg.ssl_handshake_timeout);
self:set(true, true); self:set(true, true);
end end
@ -677,7 +677,7 @@ function interface:tlshandshake()
elseif err == "wantread" then elseif err == "wantread" then
self:noise("TLS handshake to wait until readable"); self:noise("TLS handshake to wait until readable");
self:set(true, false); self:set(true, false);
self:setreadtimeout(cfg.ssl_handshake_timeout); self:setwritetimeout(cfg.ssl_handshake_timeout);
elseif err == "wantwrite" then elseif err == "wantwrite" then
self:noise("TLS handshake to wait until writable"); self:noise("TLS handshake to wait until writable");
self:set(false, true); self:set(false, true);