Fixes CI/CD issue

Author: stamparm

data/txt/sha256sums.txt

@@ -189,7 +189,7 @@ ccc4a717e887652b1fcce073d9409d9c59a3b28548c703a9e453d15845f90cd7  lib/core/patch
 9bf174058f15d14e24e94f9aaf42df045119d3617c6c54bd2f3af79b462f331d  lib/core/replication.py
 0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6  lib/core/revision.py
 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c  lib/core/session.py
-61354a9fbf94b67744b3a850475ff8ec7408979f23e2709d1f15b4642021d673  lib/core/settings.py
+c041ad865180b79c4b3e798530638d00ca1f9fa14e4c9e1506a2bf7c8c811b9f  lib/core/settings.py
 c7804223319e18eb0b8e2cbf0a8b6896d1cefb7b0b1a2e9f1cf826a8a3b56750  lib/core/shell.py
 a2e98a94b231432736d6b304fc75525c8b5fdb4768c418387c5b4c1a610dad64  lib/core/subprocessng.py
 19f1e3c5e3ba703d28d510cd7a9ab8284d5fbe9df5ce7e77c86e5931571364b7  lib/core/target.py
@@ -587,7 +587,7 @@ a48c411fea864e6bcd6a1c7e1a35094b8cda8d15088fd9e7b0270542ae20daa9  tests/test_com
 9c0a0cd0b2d52a53f75c98c60f87a022354b7c3dc4baaf3fe1e272a0af5b7f0a  tests/test_dialectdbms.py
 e40a49cfa73c45b3c3c6d1d1d00738861e270cb7a07b28f5a5356f9c7c800cf2  tests/test_dialect.py
 993a2d4d87c4fbaf261663b069629acc95ee4405aa0c42cf5a8f39649fdb0fff  tests/test_dicts.py
-a38f3257aa218fa706ddb903c181715b2286619c46aea0097b7d365d18c410c5  tests/test_dns_engine.py
+7f12466974394312dad3d98651ef8a50d1585bee0f8cd25da0b77b08c2047e46  tests/test_dns_engine.py
 703faac01f38224ba85bd0fc398d939ea034f1d7fd641cdc15da4f77ec049443  tests/test_dns_server.py
 9cd5841349bc4db818658d12184929a96f7f279eff1f53ad18a54dbefbd6b276  tests/test_dump_jsonl.py
 2bbe4b01f79992cfa8884651fc0a28dbd0e3abb0cbea9eb7eadf1f98ca3c3420  tests/test_encoding.py

lib/core/settings.py

@@ -20,7 +20,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.6.144"
+VERSION = "1.10.6.145"
 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)

tests/test_dns_engine.py

@@ -52,8 +52,6 @@
 import lib.techniques.dns.use as dnsmod
 import lib.techniques.dns.test as dnstestmod
 
-DNS_PORT = 5355
-
 def _build_query(name, tid=b"\x12\x34"):
     pkt = tid + b"\x01\x00" + b"\x00\x01" + b"\x00\x00" + b"\x00\x00" + b"\x00\x00"
     for label in name.split("."):
@@ -63,15 +61,23 @@ def _build_query(name, tid=b"\x12\x34"):
 
 class _HighPortDNSServer(DNSServer):
     # same logic as the real server (parse/pop/run), just bound high so no root is needed
-    def __init__(self, port):
+    def __init__(self, port=0):
         self._requests = []
         self._lock = threading.Lock()
         self._socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self._socket.bind(("127.0.0.1", port))
+        self.port = self._socket.getsockname()[1]
         self._running = False
         self._initialized = False
 
+    def close(self):
+        self._running = False
+        try:
+            self._socket.close()
+        except socket.error:
+            pass
+
 _CONF = {"dnsDomain": "exfil.test", "hexConvert": False, "api": False, "verbose": 0, "forceDns": False}
 _KB = {"dnsTest": True, "dnsMode": False, "bruteMode": False, "safeCharEncode": False}
 
@@ -81,11 +87,18 @@ class _DnsCase(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.server = _HighPortDNSServer(DNS_PORT)
+        cls.server = _HighPortDNSServer()
         cls.server.run()
         while not cls.server._initialized:
             time.sleep(0.02)
 
+    @classmethod
+    def tearDownClass(cls):
+        server = getattr(cls, "server", None)
+        if server is not None:
+            server.close()
+            cls.server = None
+
     def setUp(self):
         self._saved_conf = {k: conf.get(k) for k in _CONF}
         self._saved_kb = {k: kb.get(k) for k in _KB}
@@ -156,7 +169,7 @@ def oracle(payload=None, *args, **kwargs):
                 host = "%s.%s.%s.%s" % (prefix, binascii.hexlify(chunk).decode(), suffix, conf.dnsDomain)
                 c = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
                 c.settimeout(3)
-                c.sendto(_build_query(host), ("127.0.0.1", DNS_PORT))
+                c.sendto(_build_query(host), ("127.0.0.1", self.server.port))
                 try:
                     c.recvfrom(512)
                 finally: