mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 01:26:42 +03:00
One more update related to the #5381
This commit is contained in:
parent
c2bac51c4f
commit
4efb3ea840
|
@ -9,7 +9,6 @@ from __future__ import division
|
||||||
|
|
||||||
import binascii
|
import binascii
|
||||||
import functools
|
import functools
|
||||||
import inspect
|
|
||||||
import math
|
import math
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
|
@ -313,22 +312,3 @@ def LooseVersion(version):
|
||||||
result = float("NaN")
|
result = float("NaN")
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
# Reference: https://github.com/bottlepy/bottle/blob/df67999584a0e51ec5b691146c7fa4f3c87f5aac/bottle.py
|
|
||||||
if not hasattr(inspect, "getargspec") and hasattr(inspect, "getfullargspec"):
|
|
||||||
from inspect import getfullargspec
|
|
||||||
|
|
||||||
def makelist(data):
|
|
||||||
if isinstance(data, (tuple, list, set, dict)):
|
|
||||||
return list(data)
|
|
||||||
elif data:
|
|
||||||
return [data]
|
|
||||||
else:
|
|
||||||
return []
|
|
||||||
|
|
||||||
def getargspec(func):
|
|
||||||
spec = getfullargspec(func)
|
|
||||||
kwargs = makelist(spec[0]) + makelist(spec.kwonlyargs)
|
|
||||||
return kwargs, spec[1], spec[2], spec[3]
|
|
||||||
|
|
||||||
inspect.getargspec = getargspec
|
|
||||||
|
|
|
@ -6,6 +6,7 @@ See the file 'LICENSE' for copying permission
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import codecs
|
import codecs
|
||||||
|
import inspect
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
|
@ -93,6 +94,25 @@ def dirtyPatches():
|
||||||
else:
|
else:
|
||||||
os.urandom = lambda size: "".join(chr(random.randint(0, 255)) for _ in xrange(size))
|
os.urandom = lambda size: "".join(chr(random.randint(0, 255)) for _ in xrange(size))
|
||||||
|
|
||||||
|
# Reference: https://github.com/bottlepy/bottle/blob/df67999584a0e51ec5b691146c7fa4f3c87f5aac/bottle.py
|
||||||
|
if not hasattr(inspect, "getargspec") and hasattr(inspect, "getfullargspec"):
|
||||||
|
from inspect import getfullargspec
|
||||||
|
|
||||||
|
def makelist(data):
|
||||||
|
if isinstance(data, (tuple, list, set, dict)):
|
||||||
|
return list(data)
|
||||||
|
elif data:
|
||||||
|
return [data]
|
||||||
|
else:
|
||||||
|
return []
|
||||||
|
|
||||||
|
def getargspec(func):
|
||||||
|
spec = getfullargspec(func)
|
||||||
|
kwargs = makelist(spec[0]) + makelist(spec.kwonlyargs)
|
||||||
|
return kwargs, spec[1], spec[2], spec[3]
|
||||||
|
|
||||||
|
inspect.getargspec = getargspec
|
||||||
|
|
||||||
def resolveCrossReferences():
|
def resolveCrossReferences():
|
||||||
"""
|
"""
|
||||||
Place for cross-reference resolution
|
Place for cross-reference resolution
|
||||||
|
|
|
@ -20,7 +20,7 @@ from thirdparty import six
|
||||||
from thirdparty.six import unichr as _unichr
|
from thirdparty.six import unichr as _unichr
|
||||||
|
|
||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||||
VERSION = "1.7.4.1"
|
VERSION = "1.7.4.2"
|
||||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
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)
|
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||||
|
|
|
@ -548,7 +548,7 @@ def main():
|
||||||
finally:
|
finally:
|
||||||
kb.threadContinue = False
|
kb.threadContinue = False
|
||||||
|
|
||||||
if getDaysFromLastUpdate() > LAST_UPDATE_NAGGING_DAYS:
|
if (getDaysFromLastUpdate() or 0) > LAST_UPDATE_NAGGING_DAYS:
|
||||||
warnMsg = "your sqlmap version is outdated"
|
warnMsg = "your sqlmap version is outdated"
|
||||||
logger.warning(warnMsg)
|
logger.warning(warnMsg)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user