From 5845cf526b1c8952bf6311e458b836655c12ed7c Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 1 Mar 2024 15:07:04 +0100 Subject: [PATCH] Minor update of code digest logic --- sha256sums.txt => data/txt/sha256sums.txt | 6 +++--- extra/shutils/precommit-hook.sh | 2 +- lib/core/common.py | 5 ++--- lib/core/settings.py | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) rename sha256sums.txt => data/txt/sha256sums.txt (99%) diff --git a/sha256sums.txt b/data/txt/sha256sums.txt similarity index 99% rename from sha256sums.txt rename to data/txt/sha256sums.txt index 2d8ec9b9f..d0f0cd55e 100644 --- a/sha256sums.txt +++ b/data/txt/sha256sums.txt @@ -148,7 +148,7 @@ cb43de49a549ae5524f3066b99d6bc3b0b684c6e68c2e75602e87b2ac5718716 extra/shellcod 4d0a244b7c618e1539c72180f909792083c02cec31e27b44eec98b0055163536 extra/shutils/modernize.sh 74fe683e94702bef6b8ea8eebb7fc47040e3ef5a03dec756e3cf4504a00c7839 extra/shutils/newlines.py fed05c468af662ba6ca6885baf8bf85fec1e58f438b3208f3819ad730a75a803 extra/shutils/postcommit-hook.sh -c7b87d2db16e5159fc83bef0d03b3867af6913049ba6d207781008be4838dfe2 extra/shutils/precommit-hook.sh +dc35b51f5c9347eda8130106ee46bb051474fc0c5ed101f84abf3e546f729ceb extra/shutils/precommit-hook.sh 9a82c097f16a3062bd0e818bff12b4ec21b6f8f38b778604573a416589dfc450 extra/shutils/pycodestyle.sh fa1a42d189188770e82d536821d694626ca854438dadb9e08e143d3ece8c7e27 extra/shutils/pydiatra.sh 5da7d1c86ca93313477d1deb0d6d4490798a2b63a2dd8729094184625b971e11 extra/shutils/pyflakes.sh @@ -165,7 +165,7 @@ f9c96cd3fe99578bed9d49a8bdf8d76836d320a7c48c56eb0469f48b36775c35 lib/controller 99d0e94dd5fe60137abf48bfa051129fb251f5c40f0f7a270c89fbcb07323730 lib/controller/__init__.py 826c33f1105be4c0985e1bbe1d75bdb009c17815ad6552fc8d9bf39090d3c40f lib/core/agent.py b2d69c99632da5c2acd0c0934e70d55862f1380a3f602cbe7456d617fb9c1fc9 lib/core/bigarray.py -67bad8157e09773db35c104bd847aa72c3a93dd2f03804c9738f0dd560a20bd8 lib/core/common.py +66e09a503381482d9807a14c3bfb18a2f22c2b176127a8e5fce2a131c21bdfac lib/core/common.py 5c26b0f308266bc3a9679ef837439e38d1dc7a69eac6bd3422280f49aaf114d2 lib/core/compat.py b60c96780cad4a257f91a0611b08cfcc52f242908c5d5ab2bf9034ef07869602 lib/core/convert.py 5e381515873e71c395c77df00bf1dd8c4592afc6210a2f75cbc20daf384e539f lib/core/data.py @@ -187,7 +187,7 @@ bf77f9fc4296f239687297aee1fd6113b34f855965a6f690b52e26bd348cb353 lib/core/profi 4eff81c639a72b261c8ba1c876a01246e718e6626e8e77ae9cc6298b20a39355 lib/core/replication.py bbd1dcda835934728efc6d68686e9b0da72b09b3ee38f3c0ab78e8c18b0ba726 lib/core/revision.py eed6b0a21b3e69c5583133346b0639dc89937bd588887968ee85f8389d7c3c96 lib/core/session.py -08c3e0414a5ed268faf6e4f939b035b85130cac36b28881fd6324b9c51812252 lib/core/settings.py +b42288a6ebdf71f86fcc38399fdf9a2bbad9ffe71e94657b73ae5eba27a5f060 lib/core/settings.py 2bec97d8a950f7b884e31dfe9410467f00d24f21b35672b95f8d68ed59685fd4 lib/core/shell.py e90a359b37a55c446c60e70ccd533f87276714d0b09e34f69b0740fd729ddbf8 lib/core/subprocessng.py 54f7c70b4c7a9931f7ff3c1c12030180bde38e35a306d5e343ad6052919974cd lib/core/target.py diff --git a/extra/shutils/precommit-hook.sh b/extra/shutils/precommit-hook.sh index 36f02e2ad..f030bea0d 100755 --- a/extra/shutils/precommit-hook.sh +++ b/extra/shutils/precommit-hook.sh @@ -12,7 +12,7 @@ chmod +x .git/hooks/pre-commit PROJECT="../../" SETTINGS="../../lib/core/settings.py" -DIGEST="../../sha256sums.txt" +DIGEST="../../data/txt/sha256sums.txt" declare -x SCRIPTPATH="${0}" diff --git a/lib/core/common.py b/lib/core/common.py index 09f8dbc35..eb59f7939 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1508,6 +1508,7 @@ def setPaths(rootPath): paths.COMMON_FILES = os.path.join(paths.SQLMAP_TXT_PATH, "common-files.txt") paths.COMMON_TABLES = os.path.join(paths.SQLMAP_TXT_PATH, "common-tables.txt") paths.COMMON_OUTPUTS = os.path.join(paths.SQLMAP_TXT_PATH, 'common-outputs.txt') + paths.DIGEST_FILE = os.path.join(paths.SQLMAP_TXT_PATH, "sha256sums.txt") paths.SQL_KEYWORDS = os.path.join(paths.SQLMAP_TXT_PATH, "keywords.txt") paths.SMALL_DICT = os.path.join(paths.SQLMAP_TXT_PATH, "smalldict.txt") paths.USER_AGENTS = os.path.join(paths.SQLMAP_TXT_PATH, "user-agents.txt") @@ -1520,7 +1521,6 @@ def setPaths(rootPath): paths.MYSQL_XML = os.path.join(paths.SQLMAP_XML_BANNER_PATH, "mysql.xml") paths.ORACLE_XML = os.path.join(paths.SQLMAP_XML_BANNER_PATH, "oracle.xml") paths.PGSQL_XML = os.path.join(paths.SQLMAP_XML_BANNER_PATH, "postgresql.xml") - paths.DIGEST_FILE = os.path.join(paths.SQLMAP_ROOT_PATH, "sha256sums.txt") for path in paths.values(): if any(path.endswith(_) for _ in (".txt", ".xml", ".tx_")): @@ -5583,8 +5583,7 @@ def checkSums(): filepath = os.path.join(paths.SQLMAP_ROOT_PATH, filename).replace('/', os.path.sep) checkFile(filepath) if not hashlib.sha256(open(filepath, "rb").read()).hexdigest() == expected: - print(filepath, hashlib.sha256(open(filepath, "rb").read()).hexdigest(), expected) retVal &= False - # break + break return retVal diff --git a/lib/core/settings.py b/lib/core/settings.py index b7417b059..43a3cfb63 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.8.3.11" +VERSION = "1.8.3.12" 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)