From 30f8c30d6aa5a9420d3900bb1ccfb5bbbfb0eaf6 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 31 Jan 2018 10:36:13 +0100 Subject: [PATCH] Minor update --- lib/core/bigarray.py | 8 ++++---- lib/core/settings.py | 4 ++-- lib/utils/versioncheck.py | 4 ++-- txt/checksum.md5 | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/core/bigarray.py b/lib/core/bigarray.py index 51f93404a..f733b81cb 100644 --- a/lib/core/bigarray.py +++ b/lib/core/bigarray.py @@ -10,11 +10,11 @@ try: except: import pickle +import bz2 import itertools import os import sys import tempfile -import zlib from lib.core.enums import MKSTEMP_PREFIX from lib.core.exception import SqlmapSystemException @@ -86,7 +86,7 @@ class BigArray(list): self.chunks.pop() try: with open(self.chunks[-1], "rb") as f: - self.chunks[-1] = pickle.loads(zlib.decompress(f.read())) + self.chunks[-1] = pickle.loads(bz2.decompress(f.read())) except IOError, ex: errMsg = "exception occurred while retrieving data " errMsg += "from a temporary file ('%s')" % ex.message @@ -107,7 +107,7 @@ class BigArray(list): self.filenames.add(filename) os.close(handle) with open(filename, "w+b") as f: - f.write(zlib.compress(pickle.dumps(chunk, pickle.HIGHEST_PROTOCOL), BIGARRAY_COMPRESS_LEVEL)) + f.write(bz2.compress(pickle.dumps(chunk, pickle.HIGHEST_PROTOCOL), BIGARRAY_COMPRESS_LEVEL)) return filename except (OSError, IOError), ex: errMsg = "exception occurred while storing data " @@ -125,7 +125,7 @@ class BigArray(list): if not (self.cache and self.cache.index == index): try: with open(self.chunks[index], "rb") as f: - self.cache = Cache(index, pickle.loads(zlib.decompress(f.read())), False) + self.cache = Cache(index, pickle.loads(bz2.decompress(f.read())), False) except IOError, ex: errMsg = "exception occurred while retrieving data " errMsg += "from a temporary file ('%s')" % ex.message diff --git a/lib/core/settings.py b/lib/core/settings.py index af9455b43..98fd3f55f 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.2.1.19" +VERSION = "1.2.1.20" 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) @@ -531,7 +531,7 @@ ROTATING_CHARS = ('\\', '|', '|', '/', '-') # Approximate chunk length (in bytes) used by BigArray objects (only last chunk and cached one are held in memory) BIGARRAY_CHUNK_SIZE = 1024 * 1024 -# Compress (zlib) level used for storing BigArray chunks to disk (0-9) +# Compress level used for storing BigArray chunks to disk (0-9) BIGARRAY_COMPRESS_LEVEL = 9 # Maximum number of socket pre-connects diff --git a/lib/utils/versioncheck.py b/lib/utils/versioncheck.py index ae2a15e11..21249997b 100644 --- a/lib/utils/versioncheck.py +++ b/lib/utils/versioncheck.py @@ -10,9 +10,9 @@ import sys PYVERSION = sys.version.split()[0] if PYVERSION >= "3" or PYVERSION < "2.6": - exit("[CRITICAL] incompatible Python version detected ('%s'). For successfully running sqlmap you'll have to use version 2.6.x or 2.7.x (visit 'https://www.python.org/downloads/')" % PYVERSION) + exit("[CRITICAL] incompatible Python version detected ('%s'). To successfully run sqlmap you'll have to use version 2.6.x or 2.7.x (visit 'https://www.python.org/downloads/')" % PYVERSION) -extensions = ("gzip", "ssl", "sqlite3", "zlib") +extensions = ("bz2", "gzip", "ssl", "sqlite3", "zlib") try: for _ in extensions: __import__(_) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index bf3edc072..1365a2102 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -26,7 +26,7 @@ ccd66880fc677a3c83db2a3a70d196d7 lib/controller/controller.py a7b0c8e5a18a3abe8803999dcfc4664f lib/controller/handler.py 1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py e3a3f5218b2e52dd0afafdfc9fed2002 lib/core/agent.py -62fade52c1524364e6e0653c31143a9c lib/core/bigarray.py +86a4703d5474badd8462146510b2c460 lib/core/bigarray.py 27d1b0a4609eece643141408d1f18716 lib/core/common.py 2a40d5b5997265daa890545d4a4a59b9 lib/core/convert.py 9f87391b6a3395f7f50830b391264f27 lib/core/data.py @@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a lib/core/readlineng.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -0fe2ab6fe688d723c96b1f0326d4bdb5 lib/core/settings.py +2ef6392db210a10901554ea061ee7256 lib/core/settings.py d0adc28a38e43a787df4471f7f027413 lib/core/shell.py 63491be462c515a1a3880c27c2acc4a2 lib/core/subprocessng.py 505aaa61e1bba3c3d4567c3e667699e3 lib/core/target.py @@ -114,7 +114,7 @@ a6d6888e14a7c11f0884c8cc18489caa lib/utils/getch.py 4a6886d3a0c7bf768df97738fa257de9 lib/utils/search.py 4b17311256f0081904a67831252e3fb9 lib/utils/sqlalchemy.py dcc25183c6bd85b172c87cfcbc305ab6 lib/utils/timeout.py -e426eae9ddf6a42bcb6b7355e2c2936f lib/utils/versioncheck.py +ce5ec6300bc0a185827a21d8a8f09de3 lib/utils/versioncheck.py 1e9cf437451ff8147a372a002641b963 lib/utils/xrange.py b9d2761f47fec3d98b88311a263fd5db plugins/dbms/access/connector.py 3f1c50a1507d1c2f69c20c706230e2e2 plugins/dbms/access/enumeration.py