sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-25 11:03:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Another update for #4367

Browse Source
This commit is contained in:
Miroslav Stampar 2020-11-16 11:59:17 +01:00
parent e621d7ec6a
commit 194c911433
2 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/settings.py
View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.4.11.7"
VERSION = "1.4.11.8"
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)

75
lib/utils/hash.py
View File

@ -583,6 +583,41 @@ __functions__ = {
HASH.SHA512_BASE64: sha512_generic_passwd,
}
def _finalize(retVal, results, processes, attack_info=None):
if _multiprocessing:
gc.enable()
# NOTE: https://github.com/sqlmapproject/sqlmap/issues/4367
# NOTE: https://dzone.com/articles/python-101-creating-multiple-processes
for process in processes:
try:
process.terminate()
process.join()
except (OSError, AttributeError):
pass
if retVal:
removals = set()
if conf.hashDB:
conf.hashDB.beginTransaction()
while not retVal.empty():
user, hash_, word = item = retVal.get(block=False)
results.append(item)
removals.add((user, hash_))
hashDBWrite(hash_, word)
for item in attack_info or []:
if (item[0][0], item[0][1]) in removals:
attack_info.remove(item)
if conf.hashDB:
conf.hashDB.endTransaction()
if hasattr(retVal, "close"):
retVal.close()
def storeHashesToFile(attack_dict):
if not attack_dict:
return
@ -1148,30 +1183,7 @@ def dictionaryAttack(attack_dict):
logger.warn(warnMsg)
finally:
if _multiprocessing:
gc.enable()
# NOTE: https://github.com/sqlmapproject/sqlmap/issues/4367
# NOTE: https://dzone.com/articles/python-101-creating-multiple-processes
for process in processes:
try:
process.terminate()
process.join()
except (OSError, AttributeError):
pass
if retVal:
if conf.hashDB:
conf.hashDB.beginTransaction()
while not retVal.empty():
user, hash_, word = item = retVal.get(block=False)
attack_info = [_ for _ in attack_info if _[0][0] != user or _[0][1] != hash_]
hashDBWrite(hash_, word)
results.append(item)
if conf.hashDB:
conf.hashDB.endTransaction()
_finalize(retVal, results, processes, attack_info)
clearConsoleLine()
@ -1253,20 +1265,7 @@ def dictionaryAttack(attack_dict):
pass
finally:
if _multiprocessing:
gc.enable()
if retVal and conf.hashDB:
if conf.hashDB:
conf.hashDB.beginTransaction()
while not retVal.empty():
user, hash_, word = item = retVal.get(block=False)
hashDBWrite(hash_, word)
results.append(item)
if conf.hashDB:
conf.hashDB.endTransaction()
_finalize(retVal, results, processes, attack_info)
clearConsoleLine()