From 3924fcad685939b518db206ddfcf258c68cae52a Mon Sep 17 00:00:00 2001
From: Kostas Kyrimis <kostas@dragonflydb.io>
Date: Mon, 3 Jun 2024 17:13:47 +0300
Subject: [PATCH] chore: pull helio add test for tls deadlock (#3111)

* pull helio
* add test that covers tls deadlock
---
 helio                              |  2 +-
 src/core/segment_allocator.h       |  2 +-
 tests/dragonfly/connection_test.py | 48 ++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/helio b/helio
index ab82d99f58b7..b72f506a5b1f 160000
--- a/helio
+++ b/helio
@@ -1 +1 @@
-Subproject commit ab82d99f58b7b1ad8d0808061d9082972085576f
+Subproject commit b72f506a5b1f6628325b2522f703157237f3c041
diff --git a/src/core/segment_allocator.h b/src/core/segment_allocator.h
index 5fe03a011a4e..5c98c77199b9 100644
--- a/src/core/segment_allocator.h
+++ b/src/core/segment_allocator.h
@@ -17,7 +17,7 @@ namespace dfly {
 
 /**
  * @brief Tightly coupled with mi_malloc 2.x implementation.
- *        Fetches 4MB segment pointers from the allocated pointers.
+ *        Fetches 4MiB segment pointers from the allocated pointers.
  *        Provides own indexing of small pointers to real address space using the segment ptrs/
  */
 
diff --git a/tests/dragonfly/connection_test.py b/tests/dragonfly/connection_test.py
index cc04f91a9e92..1ff117260e92 100755
--- a/tests/dragonfly/connection_test.py
+++ b/tests/dragonfly/connection_test.py
@@ -3,6 +3,9 @@
 import pytest
 import asyncio
 import time
+import socket
+import random
+import ssl
 from redis import asyncio as aioredis
 from redis.exceptions import ConnectionError as redis_conn_error, ResponseError
 import async_timeout
@@ -756,3 +759,48 @@ async def client_pause():
 
     assert not all.done()
     await all
+
+
+async def test_tls_when_read_write_is_interleaved(
+    with_ca_tls_server_args, with_ca_tls_client_args, df_local_factory
+):
+    """
+    This test covers a deadlock bug in helio and TlsSocket when a client connection renegotiated a
+    handshake without reading its pending data from the socket.
+    This is a weak test case and from our local experiments it deadlocked 30% of the test runs
+    """
+    server: DflyInstance = df_local_factory.create(
+        port=1211, **with_ca_tls_server_args, proactor_threads=1
+    )
+    server.start()
+
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
+    ssl_key = with_ca_tls_client_args["ssl_keyfile"]
+    ssl_cert = with_ca_tls_client_args["ssl_certfile"]
+    ssl_ca_cert = with_ca_tls_client_args["ssl_ca_certs"]
+    ssl_sock = ssl.wrap_socket(
+        s,
+        keyfile=ssl_key,
+        certfile=ssl_cert,
+        ca_certs=ssl_ca_cert,
+        ssl_version=ssl.PROTOCOL_TLSv1_2,
+    )
+    ssl_sock.connect(("127.0.0.1", server.port))
+
+    tmp = "f" * 1000
+    message = f"SET foo {tmp}\r\n".encode()
+    ssl_sock.send(message)
+
+    for i in range(0, 100000):
+        res = random.randint(1, 4)
+        message = b""
+        for j in range(0, res):
+            message = message + b"GET foo\r\n"
+        ssl_sock.send(message)
+        ssl_sock.do_handshake()
+
+    # This deadlocks
+    client = aioredis.Redis(port=server.port, **with_ca_tls_client_args)
+    await client.execute_command("GET foo")
+    await client.close()