PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-02-10 23:46:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:sqlmapproject/sqlmap

Browse Source
This commit is contained in:
Bernardo Damele
2013-01-15 14:59:22 +00:00
parent 1cafe605af 04aa39f0c6
commit 3f84cefc77
6 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/request/connect.py
View File

@@ -736,7 +736,9 @@ class Connect(object):
else:
get += "%s%s=%s" % (delimiter, name, value)
get = urlencode(get, limit=True)
if not skipUrlEncode:
get = urlencode(get, limit=True)
if post is not None:
if place not in (PLACE.POST, PLACE.CUSTOM_POST) and hasattr(post, UNENCODED_ORIGINAL_VALUE):
post = getattr(post, UNENCODED_ORIGINAL_VALUE)

3
lib/techniques/error/use.py
View File

@@ -119,7 +119,8 @@ def _oneShotErrorUse(expression, field=None):
threadData.lastRequestUID else None, re.DOTALL | re.IGNORECASE)
if trimmed:
warnMsg = "possible server trimmed output detected (due to its length): "
warnMsg = "possible server trimmed output detected "
warnMsg += "(due to its length and/or content): "
warnMsg += safecharencode(trimmed)
logger.warn(warnMsg)

3
lib/techniques/union/use.py
View File

@@ -102,7 +102,8 @@ def _oneShotUnionUse(expression, unpack=True, limited=False):
trimmed = _("%s(?P<result>.*?)<" % (kb.chars.start))
if trimmed:
warnMsg = "possible server trimmed output detected (probably due to its length): "
warnMsg = "possible server trimmed output detected "
warnMsg += "(probably due to its length and/or content): "
warnMsg += safecharencode(trimmed)
logger.warn(warnMsg)

8
lib/utils/xrange.py
View File

@@ -7,20 +7,18 @@ See the file 'doc/COPYING' for copying permission
class xrange(object):
"""
Advanced implementation of xrange (supports slice/copy/etc.)
Advanced (re)implementation of xrange (supports slice/copy/etc.)
Reference: http://code.activestate.com/recipes/521885-a-pythonic-implementation-of-xrange/
"""
__slots__ = ['_slice']
def __init__(self, *args):
if args and isinstance(args[0], xrange):
if args and isinstance(args[0], type(self)):
self._slice = slice(args[0].start, args[0].stop, args[0].step)
else:
self._slice = slice(*args)
if self._slice.stop is None:
# slice(*args) will never put None in stop unless it was
# given as None explicitly.
raise TypeError("xrange stop must not be None")
@property
@@ -47,7 +45,7 @@ class xrange(object):
cmp(self._slice, other._slice))
def __repr__(self):
return '%s(%r, %r, %r)' % (self.__class__.__name__,
return '%s(%r, %r, %r)' % (type(self).__name__,
self.start, self.stop, self.step)
def __len__(self):