sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-16 19:40:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added resume functionality to -d and fixed logging with -d

Browse Source
This commit is contained in:
Bernardo Damele 2010-04-12 09:35:20 +00:00
parent e0d0913fc6
commit eecee3b274
10 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/convert.py
View File

@ -27,7 +27,8 @@ try:
except:
import md5
import sha
import pickle
import sys
import struct
import urllib
@ -38,7 +39,13 @@ def base64decode(string):
return string.decode("base64")
def base64encode(string):
return string.encode("base64")[:-1]
return string.encode("base64")[:-1].replace("\n", "")
def base64pickle(string):
return base64encode(pickle.dumps(string))
def base64unpickle(string):
return pickle.loads(base64decode(string))
def hexdecode(string):
string = string.lower()

12
lib/core/target.py
View File

@ -123,14 +123,14 @@ def __setOutputResume():
if not conf.flushSession:
readSessionFP = open(conf.sessionFile, "r")
lines = readSessionFP.readlines()
for line in lines:
if line.count("][") == 4:
line = line.split("][")
if len(line) != 5:
continue
url, _, _, expression, value = line
if not value:
@ -141,10 +141,10 @@ def __setOutputResume():
if value[-1] == "\n":
value = value[:-1]
if url != conf.url:
if url not in ( conf.url, conf.hostname ):
continue
if url not in kb.resumedQueries.keys():
kb.resumedQueries[url] = {}
kb.resumedQueries[url][expression] = value

21
lib/request/direct.py
View File

@ -23,8 +23,12 @@ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
"""
from lib.core.agent import agent
from lib.core.common import dataToSessionFile
from lib.core.convert import base64pickle
from lib.core.convert import base64unpickle
from lib.core.data import conf
from lib.core.data import kb
from lib.core.data import logger
from lib.core.settings import SQL_STATEMENTS
from lib.utils.timeout import timeout
@ -42,14 +46,25 @@ def direct(query, content=True):
select = True
break
if select:
output = timeout(func=conf.dbmsConnector.select, args=(query,), duration=conf.timeout, default=None)
else:
logger.log(9, query)
if not select:
output = timeout(func=conf.dbmsConnector.execute, args=(query,), duration=conf.timeout, default=None)
elif conf.hostname in kb.resumedQueries and query in kb.resumedQueries[conf.hostname]:
output = base64unpickle(kb.resumedQueries[conf.hostname][query][:-1])
infoMsg = "resumed from file '%s': " % conf.sessionFile
infoMsg += "%s..." % str(output)[:20]
logger.info(infoMsg)
elif select:
output = timeout(func=conf.dbmsConnector.select, args=(query,), duration=conf.timeout, default=None)
if output is None or len(output) == 0:
return None
elif content:
if conf.hostname not in kb.resumedQueries or ( conf.hostname in kb.resumedQueries and query not in kb.resumedQueries[conf.hostname] ):
dataToSessionFile("[%s][%s][%s][%s][%s]\n" % (conf.hostname, kb.injPlace, conf.parameters[kb.injPlace], query, base64pickle(output)))
if len(output) == 1:
if len(output[0]) == 1:
return str(list(output)[0][0])

2
plugins/dbms/access/connector.py
View File

@ -67,8 +67,6 @@ class Connector(GenericConnector):
return None
def execute(self, query):
logger.debug(query)
try:
self.cursor.execute(query)
except (pyodbc.OperationalError, pyodbc.ProgrammingError), msg:

2
plugins/dbms/firebird/connector.py
View File

@ -66,8 +66,6 @@ class Connector(GenericConnector):
return None
def execute(self, query):
logger.debug(query)
try:
self.cursor.execute(query)
except kinterbasdb.OperationalError, msg:

2
plugins/dbms/mssqlserver/connector.py
View File

@ -70,8 +70,6 @@ class Connector(GenericConnector):
return None
def execute(self, query):
logger.debug(query)
try:
self.cursor.execute(query)
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:

2
plugins/dbms/mysql/connector.py
View File

@ -66,8 +66,6 @@ class Connector(GenericConnector):
return None
def execute(self, query):
logger.debug(query)
try:
self.cursor.execute(query)
except (MySQLdb.OperationalError, MySQLdb.ProgrammingError), msg:

2
plugins/dbms/oracle/connector.py
View File

@ -67,8 +67,6 @@ class Connector(GenericConnector):
return None
def execute(self, query):
logger.debug(query)
try:
self.cursor.execute(query)
except (cx_Oracle.DatabaseError), msg:

2
plugins/dbms/postgresql/connector.py
View File

@ -65,8 +65,6 @@ class Connector(GenericConnector):
return None
def execute(self, query):
logger.debug(query)
try:
self.cursor.execute(query)
except (psycopg2.OperationalError, psycopg2.ProgrammingError), msg:

2
plugins/dbms/sqlite/connector.py
View File

@ -67,8 +67,6 @@ class Connector(GenericConnector):
return None
def execute(self, query):
logger.debug(query)
try:
self.cursor.execute(query)
except sqlite3.OperationalError, msg: