CERBERUS/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-07-10 18:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Switching from pickle to json for serialization

Browse source
This commit is contained in:
Miroslav Štampar 2026-07-08 12:13:49 +02:00
parent e2c55c1ddc
commit 4504edaeb1
12 changed files with 933 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/utils/hashdb.py
View file

@ -165,8 +165,9 @@ class HashDB(object):
self._write_cache = {}
self._last_flush_time = time.time()
began = False
try:
self.beginTransaction()
began = self.beginTransaction()
for hash_, value in flush_cache.items():
retries = 0
while True:
@ -197,23 +198,30 @@ class HashDB(object):
else:
break
finally:
self.endTransaction()
# Only close a transaction we actually opened; when flush() runs nested inside an
# outer batch (e.g. lib/utils/hash.py wrapping cracked-password writes) beginTransaction()
# returns False and the outer owner keeps ownership - ending it here would commit it early
if began:
self.endTransaction()
def beginTransaction(self):
threadData = getCurrentThreadData()
if not threadData.inTransaction:
if threadData.inTransaction:
return False # already inside an (outer) transaction; do not nest
try:
self.cursor.execute("BEGIN TRANSACTION")
except Exception: # Note: deliberately not bare - a KeyboardInterrupt here must propagate
try:
self.cursor.execute("BEGIN TRANSACTION")
except:
try:
# Reference: http://stackoverflow.com/a/25245731
self.cursor.close()
except sqlite3.ProgrammingError:
pass
threadData.hashDBCursor = None
self.cursor.execute("BEGIN TRANSACTION")
finally:
threadData.inTransaction = True
# Reference: http://stackoverflow.com/a/25245731
self.cursor.close()
except sqlite3.ProgrammingError:
pass
threadData.hashDBCursor = None
self.cursor.execute("BEGIN TRANSACTION")
threadData.inTransaction = True # set only on a genuine BEGIN (not if the retry above raised)
return True
def endTransaction(self):
threadData = getCurrentThreadData()