sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-06-20 21:13:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Issue #47

Browse Source
This commit is contained in:
Miroslav Stampar 2012-07-01 11:05:04 +02:00
parent 21d9ae0a2c
commit d7cd55fb28
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/common.py
View File

@ -833,17 +833,6 @@ def checkFile(filename):
if not os.path.exists(filename): if not os.path.exists(filename):
raise sqlmapFilePathException, "unable to read file '%s'" % filename raise sqlmapFilePathException, "unable to read file '%s'" % filename
def restoreDumpMarkedChars(value, onlyNewlineTab=False):
retVal = value
if isinstance(retVal, basestring):
retVal = retVal.replace(DUMP_NEWLINE_MARKER, "\n").replace(DUMP_CR_MARKER, "\r").replace(DUMP_TAB_MARKER, "\t")
if not onlyNewlineTab:
retVal = retVal.replace(DUMP_DEL_MARKER, ", ")
return retVal
def banner(): def banner():
""" """
This function prints sqlmap banner with its version This function prints sqlmap banner with its version

6
lib/core/dump.py
View File

@ -19,7 +19,6 @@ from lib.core.common import isListLike
from lib.core.common import normalizeUnicode from lib.core.common import normalizeUnicode
from lib.core.common import openFile from lib.core.common import openFile
from lib.core.common import prioritySortColumns from lib.core.common import prioritySortColumns
from lib.core.common import restoreDumpMarkedChars
from lib.core.common import safeCSValue from lib.core.common import safeCSValue
from lib.core.common import unsafeSQLIdentificatorNaming from lib.core.common import unsafeSQLIdentificatorNaming
from lib.core.data import conf from lib.core.data import conf
@ -60,9 +59,6 @@ class Dump:
kb.dataOutputFlag = True kb.dataOutputFlag = True
def _formatString(self, inpStr):
return restoreDumpMarkedChars(getUnicode(inpStr))
def setOutputFile(self): def setOutputFile(self):
self._outputFile = "%s%slog" % (conf.outputPath, os.sep) self._outputFile = "%s%slog" % (conf.outputPath, os.sep)
self._outputFP = codecs.open(self._outputFile, "ab", UNICODE_ENCODING) self._outputFP = codecs.open(self._outputFile, "ab", UNICODE_ENCODING)
@ -74,7 +70,7 @@ class Dump:
if isListLike(data): if isListLike(data):
self.lister(header, data, sort) self.lister(header, data, sort)
elif data: elif data:
data = self._formatString(getUnicode(data)) data = getUnicode(data)
if data[-1] == '\n': if data[-1] == '\n':
data = data[:-1] data = data[:-1]

6
lib/core/xmldump.py
View File

@ -12,7 +12,6 @@ from xml.parsers.expat import ExpatError
from extra.prettyprint import prettyprint from extra.prettyprint import prettyprint
from lib.core.common import getUnicode from lib.core.common import getUnicode
from lib.core.common import restoreDumpMarkedChars
from lib.core.data import conf from lib.core.data import conf
from lib.core.data import kb from lib.core.data import kb
from lib.core.data import logger from lib.core.data import logger
@ -125,7 +124,7 @@ class XMLDump:
if data is None : if data is None :
return self.__doc.createTextNode(u'') return self.__doc.createTextNode(u'')
else : else :
escaped_data = saxutils.escape(self.__formatString(data), ENTITIES) escaped_data = saxutils.escape(data, ENTITIES)
return self.__doc.createTextNode(escaped_data) return self.__doc.createTextNode(escaped_data)
def __createAttribute(self,attrName,attrValue): def __createAttribute(self,attrName,attrValue):
@ -140,9 +139,6 @@ class XMLDump:
attr.nodeValue = getUnicode(attrValue) attr.nodeValue = getUnicode(attrValue)
return attr return attr
def __formatString(self, inpStr):
return restoreDumpMarkedChars(getUnicode(inpStr))
def string(self, header, data, sort=True): def string(self, header, data, sort=True):
''' '''
Adds string element to the xml. Adds string element to the xml.