Minor update

data/txt/sha256sums.txt

@@ -189,7 +189,7 @@ b14628a6c9327d110afe50b01f3171f64f61823343b8de89596e854b00b74928  lib/core/dump.
 9bf174058f15d14e24e94f9aaf42df045119d3617c6c54bd2f3af79b462f331d  lib/core/replication.py
 0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6  lib/core/revision.py
 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c  lib/core/session.py
-1d609263088c5767b4f92ead270f84cd218d9602007b75b3fd45c1169f183265  lib/core/settings.py
+2c37b4a614c1d64facc5cf9d22b423316722a41768f57d9c2913dc23d30a7b21  lib/core/settings.py
 c7804223319e18eb0b8e2cbf0a8b6896d1cefb7b0b1a2e9f1cf826a8a3b56750  lib/core/shell.py
 a2e98a94b231432736d6b304fc75525c8b5fdb4768c418387c5b4c1a610dad64  lib/core/subprocessng.py
 15d36cdac9389d0a54a6c33fbb89f32bb65e303f50de573773dcb6d4618bca64  lib/core/target.py
@@ -254,7 +254,7 @@ f6678ac1342f8d234ed32ae69be5ac5d7837393e9348929ec029c9764c030e82  lib/techniques
 c68f8259e0a89a556d049f227041849df584313bd1b5349b02f74a47778c901c  lib/techniques/union/use.py
 1966ca704961fb987ab757f0a4afddbf841d1a880631b701487c75cef63d60c3  lib/techniques/xpath/__init__.py
 c61816c9dba9f6cc2223aed1a923f95130979e5f0a88ec254ee667d955ed2734  lib/techniques/xpath/inject.py
-aeefb42ea0c68f72744bc1bfd7194ec1bc06480d8a7e23f4b8d3d23fbba2b014  lib/utils/api.py
+c5850075861bd5f172e191a0e48dd1d636d7c6af53bb471a44d56e7cef4e79c5  lib/utils/api.py
 442555ab85277aff7c9e0cf465ea5b0d28395c326f68363449b2d3941f4b6de2  lib/utils/brute.py
 da5bcbcda3f667582adf5db8c1b5d511b469ac61b55d387cec66de35720ed718  lib/utils/crawler.py
 51deedec3d3e869b067824caa51406d2ef396c188f82013ca60777006a821e27  lib/utils/deps.py
@@ -627,7 +627,7 @@ b23bf934dafe54c241761517a7b8c139159aa4b941db10832a626a51fea81e35  tests/test_htt
 d539d0ae758b5bb91e314ab82ab4fe03d6fb2f8b377d16aefa6d7d1d77a7d5a9  tests/test_identifiers_output.py
 5372270b7ed82b62f273c2e9bd1f7ecd8605371e66cd0ad70663762cb08d42f1  tests/test_inference_engine.py
 0fc7bd9bae4fbd09f51027780b7a8e72eab73810dccdfdf87ed9e489e6e671c9  tests/test_ldap.py
-7780bbd53f4ef48b01b689f3989c62822ee7f326dfc3b4110522c9af93a61482  tests/test_library.py
+4952caf2cc825b5ed96a032e0a88e6919b7556e736bd8e30a558f6c4f82c014a  tests/test_library.py
 caa06fed7323b2bb6d0f2443ce343de94f75bf8ad012c055d5e07741d908ebad  tests/test_misc.py
 790b78c600b61eb0bdd6e07e14b1db3eb2ddd5fc5d4edb9e975f85ced38558c7  tests/test_nosql.py
 88a8c7ce0ba0ca721dffbcf9351cd07f7e471ad2fe667a10608c18952b09868d  tests/test_openapi_drift.py

lib/core/settings.py

@@ -20,7 +20,7 @@ from lib.core.enums import OS
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.7.13"
+VERSION = "1.10.7.14"
 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/utils/api.py

@@ -253,6 +253,12 @@ def setupReportCollector():
     collector = Database(":memory:")
     collector.connect("report")
     collector.init()
+
+    # record error/critical log messages into the collector so that a CLI --report-json report carries
+    # the same 'error' content the REST API exposes via /scan/<id>/data - letting consumers tell a
+    # failed/unreachable run apart from a clean "nothing found" one (both otherwise have empty 'data')
+    logger.addHandler(ReportErrorRecorder(collector))
+
     return collector
 
 def writeReportJson(collector, filepath):
@@ -449,6 +455,22 @@ class LogRecorder(logging.StreamHandler):
         """
         conf.databaseCursor.execute("INSERT INTO logs VALUES(NULL, ?, ?, ?, ?)", (conf.taskid, time.strftime("%X"), record.levelname, str(record.msg % record.args if record.args else record.msg)))
 
+class ReportErrorRecorder(logging.Handler):
+    def __init__(self, collector):
+        """
+        Records error/critical log messages into a report collector's 'errors' table (the counterpart
+        of StdDbOut's stderr branch for CLI --report-json runs)
+        """
+        logging.Handler.__init__(self)
+        self.setLevel(logging.ERROR)
+        self.collector = collector
+
+    def emit(self, record):
+        try:
+            self.collector.execute("INSERT INTO errors VALUES(NULL, ?, ?)", (REPORT_TASKID, str(record.msg % record.args if record.args else record.msg)))
+        except Exception:
+            pass
+
 def setRestAPILog():
     if conf.api:
         try:

tests/test_library.py

@@ -107,5 +107,27 @@ class TestLibraryFacade(unittest.TestCase):
         self.assertRaises(sqlmap.SqlmapError, sqlmap.scan, "http://target/?id=1")
 
 
+class TestReportErrorCapture(unittest.TestCase):
+    """
+    The library tells failure modes apart (unreachable vs nothing-found) because a CLI --report-json
+    run now records error/critical log messages into the report 'error' array, like the REST API.
+    """
+
+    def test_errors_reach_the_report(self):
+        from lib.core.data import logger
+        from lib.utils.api import setupReportCollector, _assembleData, ReportErrorRecorder, REPORT_TASKID
+
+        collector = setupReportCollector()
+        try:
+            logger.error("boom %s", "here")
+            result = _assembleData(collector, REPORT_TASKID)
+            self.assertTrue(any("boom here" in _ for _ in result["error"]))
+        finally:
+            for handler in list(logger.handlers):
+                if isinstance(handler, ReportErrorRecorder):
+                    logger.removeHandler(handler)
+            collector.disconnect()
+
+
 if __name__ == "__main__":
     unittest.main(verbosity=2)