From 4af319504121370f5395c19b092ccf63b34e819c Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 2 Feb 2026 12:19:20 +0100 Subject: [PATCH] Fixing CI/CD issues with keep-alive --- data/txt/sha256sums.txt | 4 ++-- lib/core/settings.py | 2 +- thirdparty/keepalive/keepalive.py | 30 +++++++++++++++++++++--------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/data/txt/sha256sums.txt b/data/txt/sha256sums.txt index 2e974cad8a..0c5d34f498 100644 --- a/data/txt/sha256sums.txt +++ b/data/txt/sha256sums.txt @@ -188,7 +188,7 @@ c1cb56f2a43e9f2f6b25d5f3d504e856ea21df6fc14af5e37b1000feef2bdb5a lib/core/optio 48797d6c34dd9bb8a53f7f3794c85f4288d82a9a1d6be7fcf317d388cb20d4b3 lib/core/replication.py 0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6 lib/core/revision.py 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c lib/core/session.py -8508162b2a95e54102ee8aec95888d7e2061d73b7d0e9ecd47d4f5e22ca94820 lib/core/settings.py +87350eb153acd7d278f60b5e2cabc43b7b98cdaf1642433ac3f7a55d54198b56 lib/core/settings.py cd5a66deee8963ba8e7e9af3dd36eb5e8127d4d68698811c29e789655f507f82 lib/core/shell.py bcb5d8090d5e3e0ef2a586ba09ba80eef0c6d51feb0f611ed25299fbb254f725 lib/core/subprocessng.py d35650179816193164a5f177102f18379dfbe6bb6d40fbb67b78d907b41c8038 lib/core/target.py @@ -618,7 +618,7 @@ edf23e7105539d700a1ae1bc52436e57e019b345a7d0227e4d85b6353ef535fa thirdparty/ide d846fdc47a11a58da9e463a948200f69265181f3dbc38148bfe4141fade10347 thirdparty/identywaf/LICENSE e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 thirdparty/__init__.py 879d96f2460bc6c79c0db46b5813080841c7403399292ce76fe1dc0a6ed353d8 thirdparty/keepalive/__init__.py -c7ac7253fa450030f9c42f11bb19689055bb8c39621bcfbeca856ba3c9342760 thirdparty/keepalive/keepalive.py +ae394bfae5204dfeffeccc15c356d9bf21708f9e48016681cfb8040ff8857998 thirdparty/keepalive/keepalive.py e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 thirdparty/magic/__init__.py 4d89a52f809c28ce1dc17bb0c00c775475b8ce01c2165942877596a6180a2fd8 thirdparty/magic/magic.py e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 thirdparty/multipart/__init__.py diff --git a/lib/core/settings.py b/lib/core/settings.py index d72d7051b5..10060ad66f 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six # sqlmap version (...) -VERSION = "1.10.2.3" +VERSION = "1.10.2.4" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/thirdparty/keepalive/keepalive.py b/thirdparty/keepalive/keepalive.py index 2a5662e4e5..f0d592b186 100644 --- a/thirdparty/keepalive/keepalive.py +++ b/thirdparty/keepalive/keepalive.py @@ -164,8 +164,10 @@ def remove(self, connection): def set_ready(self, connection, ready): self._lock.acquire() - if connection in self._readymap: self._readymap[connection] = ready - self._lock.release() + try: + if connection in self._readymap: self._readymap[connection] = ready + finally: + self._lock.release() def get_ready_conn(self, host): conn = None @@ -258,6 +260,16 @@ def do_open(self, req): if DEBUG: DEBUG.info("STATUS: %s, %s", r.status, r.reason) + if not r.will_close: + try: + headers = getattr(r, 'msg', None) + if headers: + c_head = headers.get("connection") + if c_head and "close" in c_head.lower(): + r.will_close = True + except Exception: + pass + # if not a persistent connection, don't try to reuse it if r.will_close: if DEBUG: DEBUG.info('server will close connection, discarding') @@ -322,16 +334,16 @@ def _reuse_connection(self, h, req, host): def _start_transaction(self, h, req): try: - if req.data is not None: + if req.data: data = req.data if hasattr(req, 'selector'): h.putrequest(req.get_method() or 'POST', req.selector, skip_host=req.has_header("Host"), skip_accept_encoding=req.has_header("Accept-encoding")) else: h.putrequest(req.get_method() or 'POST', req.get_selector(), skip_host=req.has_header("Host"), skip_accept_encoding=req.has_header("Accept-encoding")) - if not req.has_header('Content-type'): + if 'Content-type' not in req.headers: h.putheader('Content-type', 'application/x-www-form-urlencoded') - if not req.has_header('Content-length'): + if 'Content-length' not in req.headers: h.putheader('Content-length', '%d' % len(data)) else: if hasattr(req, 'selector'): @@ -341,17 +353,17 @@ def _start_transaction(self, h, req): except (socket.error, _http_client.HTTPException) as err: raise _urllib.error.URLError(err) - if not req.has_header('Connection'): + if 'Connection' not in req.headers: h.putheader('Connection', 'keep-alive') for args in self.parent.addheaders: - if not req.has_header(args[0]): + if args[0] not in req.headers: h.putheader(*args) for k, v in req.headers.items(): h.putheader(k, v) h.endheaders() - if req.data is not None: - h.send(data) + if req.data: + h.send(req.data) def _get_connection(self, host): raise NotImplementedError()