Minor update

Author: stamparm

data/txt/sha256sums.txt

@@ -189,7 +189,7 @@ c2db614a3ce7dda889152bea8bd6d709e5d8c2b556741fdbfe44469f27ce266b  lib/core/enums
 9bf174058f15d14e24e94f9aaf42df045119d3617c6c54bd2f3af79b462f331d  lib/core/replication.py
 0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6  lib/core/revision.py
 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c  lib/core/session.py
-d9b2dc6104456fa679f827d16baeb1ed7ca377a961d163d12cd2b7eba09f24c6  lib/core/settings.py
+415708a1c10d98f964bc34ddd8dd597ec0ebb216a6e3f3aad391d9283d499f89  lib/core/settings.py
 c7804223319e18eb0b8e2cbf0a8b6896d1cefb7b0b1a2e9f1cf826a8a3b56750  lib/core/shell.py
 a2e98a94b231432736d6b304fc75525c8b5fdb4768c418387c5b4c1a610dad64  lib/core/subprocessng.py
 15d36cdac9389d0a54a6c33fbb89f32bb65e303f50de573773dcb6d4618bca64  lib/core/target.py
@@ -215,7 +215,7 @@ bc61bc944b81a7670884f82231033a6ac703324b34b071c9834886a92e249d0e  lib/request/ch
 4fd1957e31b14e7670b09d85a634fa6772a1cd90babe149f39a1c945fe306f0a  lib/request/comparison.py
 4a3b997a83b1724e8bd025be95ec5d84c6bf41d533ba097fcab1eab763352111  lib/request/connect.py
 8e06682280fce062eef6174351bfebcb6040e19976acff9dc7b3699779783498  lib/request/direct.py
-b1f07e0571f249eedf294b7827c530b0de8c0524d445b33fdb2d0a639c0f123a  lib/request/dns.py
+c968a04d3de9256d56c423d46556441223607e4573627f2af4e772e084aef5fc  lib/request/dns.py
 7344978ac1c52060716b7837c88a62768c6a445eafe189ea3232b8a498fdd038  lib/request/http2.py
 92c81cc31ff4a396723242058fb2152c9e9745f8412d01ea74480b048a53af6c  lib/request/httpshandler.py
 1966ca704961fb987ab757f0a4afddbf841d1a880631b701487c75cef63d60c3  lib/request/__init__.py
@@ -613,7 +613,7 @@ fa85881aa8d082a65aeacb2b03fcb5d2abb1daa9a02ee24ff048d54fbc904b90  tests/test_dia
 41bb0981cb7372753dbaa328c8be3678d328b736e6b97f7bd2573b465753af01  tests/test_dialect.py
 993a2d4d87c4fbaf261663b069629acc95ee4405aa0c42cf5a8f39649fdb0fff  tests/test_dicts.py
 62a4386524d0ef269cba3bd6dcadc5a2a11c0d2bdd198773b79bcd8589324328  tests/test_dns_engine.py
-a9db98cbb4d16c42118fb6f612edd5bfedc77298e38d06d50e7ecc2faaa7fdc1  tests/test_dns_server.py
+6047483d7fb41e0dbf4b067394d8a9e2b39b99faf473db963de6f2f67c052b03  tests/test_dns_server.py
 3dc788fd3adba8b6f766281e0a50025b1ee9150d80ab9a738c6c43f2eaf805b3  tests/test_dump_format.py
 118d1987861ed0df978474329adce8c23009b3964210c13fbaf667e0019bbd15  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.7.26"
+VERSION = "1.10.7.27"
 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)

lib/request/dns.py

@@ -235,6 +235,9 @@ class InteractshDNSServer(object):
     is a drop-in for conf.dnsServer.
     """
 
+    _POLL_TRIES = 6      # a triggered lookup surfaces at interactsh within a couple of seconds;
+    _POLL_DELAY = 1.0    # poll up to ~6s per retrieval before treating the channel as silent
+
     def __init__(self, server=None):
         from lib.request.interactsh import Interactsh, hasCrypto
 
@@ -259,25 +262,30 @@ def pop(self, prefix=None, suffix=None):
         """
         Returns a captured DNS lookup name matching the given prefix/suffix
         (prefix.<query result>.suffix.<correlation domain>), mirroring DNSServer.pop().
+
+        Unlike the synchronous local DNSServer (which reads a query captured during the
+        very request), interactsh is remote and eventually-consistent: a just-triggered
+        lookup takes a moment to reach the collector and surface via its poll API. So we
+        poll a few times before giving up, instead of reading once.
         """
 
-        retVal = None
+        for attempt in range(self._POLL_TRIES):
+            for name in self._client.dnsNames():
+                if name in self._seen:
+                    continue
 
-        for name in self._client.dnsNames():
-            if name in self._seen:
-                continue
+                if prefix is None and suffix is None:
+                    self._seen.add(name)
+                    return name
 
-            if prefix is None and suffix is None:
-                self._seen.add(name)
-                retVal = name
-                break
+                if prefix and suffix and re.search(r"%s\..+\.%s" % (re.escape(prefix), re.escape(suffix)), name, re.I):
+                    self._seen.add(name)
+                    return name
 
-            if prefix and suffix and re.search(r"%s\..+\.%s" % (re.escape(prefix), re.escape(suffix)), name, re.I):
-                self._seen.add(name)
-                retVal = name
-                break
+            if attempt < self._POLL_TRIES - 1:
+                time.sleep(self._POLL_DELAY)
 
-        return retVal
+        return None
 
 if __name__ == "__main__":
     server = None

tests/test_dns_server.py

@@ -342,6 +342,7 @@ def dnsNames(self): return list(names)
         srv._seen = set()
         srv._running = True
         srv._initialized = True
+        srv._POLL_TRIES = 1   # no real sleeps in unit tests
         return srv
 
     def test_pop_matches_prefix_suffix_and_dedups(self):