PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-06 20:51:31 +00:00
Code Issues Projects Releases Wiki Activity

Minor adjustments

Browse Source
This commit is contained in:
Bernardo Damele
2010-10-15 10:28:06 +00:00
parent 0a378c1078
commit 9fcab68700
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/common.py
View File

@@ -1437,12 +1437,13 @@ def getUnicode(value, encoding=None):
>>> getUnicode(1)
u'1'
"""
if encoding is None:
encoding = conf.dataEncoding if 'dataEncoding' in conf else "utf-8"
if isinstance(value, basestring):
return value if isinstance(value, unicode) else unicode(value, encoding, errors='replace')
else:
return unicode(value) #encoding ignored for non-basestring instances
return unicode(value) # encoding ignored for non-basestring instances
# http://boredzo.org/blog/archives/2007-01-06/longest-common-prefix-in-python-2
def longestCommonPrefix(*sequences):

4
lib/core/dump.py
View File

@@ -31,9 +31,9 @@ class Dump:
self.__outputFP = None
def __write(self, data, n=True):
text = "%s%s" % (data, "\n" if n else " ")
text = "%s%s" % (data, "\n" if n else " ")
dataToStdout(text)
self.__outputFP.write(text)
self.__outputFP.flush()

17
lib/core/option.py
View File

@@ -599,6 +599,7 @@ def __setHTTPProxy():
__scheme = __proxySplit[0]
__hostname = __hostnamePort[0]
__port = None
__proxyString = ""
if len(__hostnamePort) == 2:
try:
@@ -619,9 +620,9 @@ def __setHTTPProxy():
raise sqlmapSyntaxException, errMsg
# Reference: http://stackoverflow.com/questions/34079/how-to-specify-an-authenticated-proxy-for-a-python-http-connection
__proxyString = "%s@%s:%d" % (conf.pCred, __hostname, __port)
else:
__proxyString = "%s:%d" % (__hostname, __port)
__proxyString = "%s@" % conf.pCred
__proxyString += "%s:%d" % (__hostname, __port)
# Workaround for http://bugs.python.org/issue1424152 (urllib/urllib2:
# HTTPS over (Squid) Proxy fails) as long as HTTP over SSL requests
@@ -1184,19 +1185,17 @@ def __basicOptionValidation():
errMsg = "value for --stop (limitStop) option must be an integer value greater than zero (>0)"
raise sqlmapSyntaxException, errMsg
if conf.limitStart is not None and isinstance(conf.limitStart, int) and conf.limitStart > 0 and\
if conf.limitStart is not None and isinstance(conf.limitStart, int) and conf.limitStart > 0 and \
conf.limitStop is not None and isinstance(conf.limitStop, int) and conf.limitStop > 0 and conf.limitStop <= conf.limitStart:
errMsg = "value for --start (limitStart) option must be smaller than value for --stop (limitStop) option"
raise sqlmapSyntaxException, errMsg
if conf.cpuThrottle is not None and isinstance(conf.cpuThrottle, int) and (conf.cpuThrottle > 100 or\
conf.cpuThrottle < 0):
if conf.cpuThrottle is not None and isinstance(conf.cpuThrottle, int) and (conf.cpuThrottle > 100 or conf.cpuThrottle < 0):
errMsg = "value for --cpu-throttle (cpuThrottle) option must be in range [0,100]"
raise sqlmapSyntaxException, errMsg
if conf.matchRatio is not None and isinstance(conf.matchRatio, float) and (conf.matchRatio > 1 or\
conf.cpuThrottle < 0):
errMsg = "value for --ratio (matchRatio) option must be in range [0,1]"
if conf.thold is not None and isinstance(conf.thold, float) and (conf.thold > 1 or conf.cpuThrottle < 0):
errMsg = "value for --threshold (thold) option must be in range [0,1]"
raise sqlmapSyntaxException, errMsg
if conf.textOnly and conf.useNullConnection: