mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2026-01-19 14:54:15 +03:00
Minor update
This commit is contained in:
parent
568e9f0d37
commit
57047ba8cf
|
|
@ -189,7 +189,7 @@ e18c0c2c5a57924a623792a48bfd36e98d9bc085f6db61a95fc0dc8a3bcedc0c lib/core/decor
|
|||
48797d6c34dd9bb8a53f7f3794c85f4288d82a9a1d6be7fcf317d388cb20d4b3 lib/core/replication.py
|
||||
3574639db4942d16a2dc0a2f04bb7c0913c40c3862b54d34c44075a760e0c194 lib/core/revision.py
|
||||
888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c lib/core/session.py
|
||||
6fd593ad0a21aed2aa76f29d4803d1ab365d097cb2b2ba45763ba93e446d9c77 lib/core/settings.py
|
||||
0e42cf73431ee75dd647815b5161b8422044f912f4533e04385e1a8aa5a1fa9a lib/core/settings.py
|
||||
cd5a66deee8963ba8e7e9af3dd36eb5e8127d4d68698811c29e789655f507f82 lib/core/shell.py
|
||||
bcb5d8090d5e3e0ef2a586ba09ba80eef0c6d51feb0f611ed25299fbb254f725 lib/core/subprocessng.py
|
||||
d35650179816193164a5f177102f18379dfbe6bb6d40fbb67b78d907b41c8038 lib/core/target.py
|
||||
|
|
@ -197,7 +197,7 @@ ddf8c5a3dbebd6cdf8b8ba4417e36652d1e040f025175cb6487f1aebc0208836 lib/core/testi
|
|||
cf4dca323645d623109a82277a8e8a63eb9abb3fff6c8a57095eb171c1ef91b3 lib/core/threads.py
|
||||
b9aacb840310173202f79c2ba125b0243003ee6b44c92eca50424f2bdfc83c02 lib/core/unescaper.py
|
||||
10719f5ca450610ad28242017b2d8a77354ca357ffa26948c5f62d20cac29a8b lib/core/update.py
|
||||
9ed5a0aef84f55d42894a006ff3616e8ee388a55790b04d968c80d1470c6d3bc lib/core/wordlist.py
|
||||
ec11fd5a3f4efd10a1cae288157ac6eb6fb75da4666d76d19f6adf74ac338b5a lib/core/wordlist.py
|
||||
1966ca704961fb987ab757f0a4afddbf841d1a880631b701487c75cef63d60c3 lib/__init__.py
|
||||
54bfd31ebded3ffa5848df1c644f196eb704116517c7a3d860b5d081e984d821 lib/parse/banner.py
|
||||
a9f10a558684778bdb00d446cb88967fc1bfd413ae6a5f4bd582b3ea442baa87 lib/parse/cmdline.py
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ from lib.core.enums import OS
|
|||
from thirdparty import six
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.10.1.49"
|
||||
VERSION = "1.10.1.50"
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ class Wordlist(six.Iterator):
|
|||
def __init__(self, filenames, proc_id=None, proc_count=None, custom=None):
|
||||
self.filenames = [filenames] if isinstance(filenames, six.string_types) else filenames
|
||||
self.fp = None
|
||||
self.zip_file = None
|
||||
self.index = 0
|
||||
self.counter = -1
|
||||
self.current = None
|
||||
|
|
@ -49,16 +50,16 @@ class Wordlist(six.Iterator):
|
|||
self.current = self.filenames[self.index]
|
||||
if isZipFile(self.current):
|
||||
try:
|
||||
_ = zipfile.ZipFile(self.current, 'r')
|
||||
self.zip_file = zipfile.ZipFile(self.current, 'r')
|
||||
except zipfile.error as ex:
|
||||
errMsg = "something appears to be wrong with "
|
||||
errMsg += "the file '%s' ('%s'). Please make " % (self.current, getSafeExString(ex))
|
||||
errMsg += "sure that you haven't made any changes to it"
|
||||
raise SqlmapInstallationException(errMsg)
|
||||
if len(_.namelist()) == 0:
|
||||
if len(self.zip_file.namelist()) == 0:
|
||||
errMsg = "no file(s) inside '%s'" % self.current
|
||||
raise SqlmapDataException(errMsg)
|
||||
self.fp = _.open(_.namelist()[0])
|
||||
self.fp = self.zip_file.open(self.zip_file.namelist()[0])
|
||||
else:
|
||||
self.fp = open(self.current, "rb")
|
||||
self.iter = iter(self.fp)
|
||||
|
|
@ -70,6 +71,10 @@ class Wordlist(six.Iterator):
|
|||
self.fp.close()
|
||||
self.fp = None
|
||||
|
||||
if self.zip_file:
|
||||
self.zip_file.close()
|
||||
self.zip_file = None
|
||||
|
||||
def __next__(self):
|
||||
retVal = None
|
||||
while True:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user