Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Close transport after sending close_notify in TLSv1.2 #507

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Close transport after sending close_notify in TLSv1.2 #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions uvloop/includes/consts.pxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5
# The default timeout matches that of Nginx.
DEF SSL_HANDSHAKE_TIMEOUT = 60.0
# Number of seconds to wait for SSL shutdown to complete
# The default timeout mimics lingering_time
DEF SSL_SHUTDOWN_TIMEOUT = 30.0
DEF SSL_SHUTDOWN_TIMEOUT = 10.0
DEF SSL_READ_MAX_SIZE = 256 * 1024
2 changes: 2 additions & 0 deletions uvloop/sslproto.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ cdef class SSLProtocol:
object _handshake_timeout_handle
object _shutdown_timeout_handle

str _ssl_version

cdef _set_app_protocol(self, app_protocol)
cdef _wakeup_waiter(self, exc=*)
cdef _get_extra_info(self, name, default=*)
Expand Down
9 changes: 9 additions & 0 deletions uvloop/sslproto.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ cdef class SSLProtocol:
cipher=sslobj.cipher(),
compression=sslobj.compression(),
ssl_object=sslobj)
self._ssl_version = sslobj.version()
if self._app_state == STATE_INIT:
self._app_state = STATE_CON_MADE
self._app_protocol.connection_made(self._get_app_transport())
Expand Down Expand Up @@ -585,6 +586,9 @@ cdef class SSLProtocol:
"""
cdef:
bint close_notify = False
if self._app_state == STATE_EOF:
# close_notify was already received
return
try:
while True:
if not self._sslobj_read(SSL_READ_MAX_SIZE):
Expand Down Expand Up @@ -626,6 +630,11 @@ cdef class SSLProtocol:
self._sslobj.unwrap()
except ssl_SSLAgainErrors as exc:
self._process_outgoing()
if self._ssl_version != "TLSv1.3":
# don't wait for close_notify from the peer in TLSv1.2 or
# lower to conform with widespread implementation practice
if not self._get_write_buffer_size():
self._on_shutdown_complete(None)
else:
self._process_outgoing()
if not self._get_write_buffer_size():
Expand Down