fixes, updates, patches

This commit is contained in:
Miroslav Stampar 2012-02-09 10:16:58 +00:00
parent 948cf25de4
commit 7bca926a0b
10 changed files with 20 additions and 20 deletions

View File

@ -53,14 +53,14 @@ class Connector(GenericConnector):
try:
return self.cursor.fetchall()
except pyodbc.ProgrammingError, msg:
logger.warn(msg[1])
logger.warn("(remote) %s" % msg[1])
return None
def execute(self, query):
try:
self.cursor.execute(query)
except (pyodbc.OperationalError, pyodbc.ProgrammingError), msg:
logger.warn(msg[1])
logger.warn("(remote) %s" % msg[1])
except pyodbc.Error, msg:
raise sqlmapConnectionException, msg[1]

View File

@ -45,14 +45,14 @@ class Connector(GenericConnector):
try:
return self.cursor.fetchall()
except ibm_db_dbi.ProgrammingError, msg:
logger.warn(msg[1])
logger.warn("(remote) %s" % msg[1])
return None
def execute(self, query):
try:
self.cursor.execute(query)
except (ibm_db_dbi.OperationalError, ibm_db_dbi.ProgrammingError), msg:
logger.warn(msg[1])
logger.warn("(remote) %s" % msg[1])
except ibm_db_dbi.InternalError, msg:
raise sqlmapConnectionException, msg[1]

View File

@ -50,14 +50,14 @@ class Connector(GenericConnector):
try:
return self.cursor.fetchall()
except kinterbasdb.OperationalError, msg:
logger.warn(msg[1])
logger.warn("(remote) %s" % msg[1])
return None
def execute(self, query):
try:
self.cursor.execute(query)
except kinterbasdb.OperationalError, msg:
logger.warn(msg[1])
logger.warn("(remote) %s" % msg[1])
except kinterbasdb.Error, msg:
raise sqlmapConnectionException, msg[1]

View File

@ -52,7 +52,7 @@ class Connector(GenericConnector):
try:
return self.cursor.fetchall()
except (pymssql.ProgrammingError, pymssql.OperationalError, _mssql.MssqlDatabaseException), msg:
logger.warn(msg)
logger.warn("(remote) %s" % msg)
return None
def execute(self, query):
@ -62,7 +62,7 @@ class Connector(GenericConnector):
self.cursor.execute(utf8encode(query))
retVal = True
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:
logger.warn(msg)
logger.warn("(remote) %s" % msg)
except pymssql.InternalError, msg:
raise sqlmapConnectionException, msg

View File

@ -57,7 +57,7 @@ class Connector(GenericConnector):
self.cursor.execute(query)
retVal = True
except (pymysql.OperationalError, pymysql.ProgrammingError), msg:
logger.warn(msg[1])
logger.warn("(remote) %s" % msg[1])
except pymysql.InternalError, msg:
raise sqlmapConnectionException, msg[1]

View File

@ -56,7 +56,7 @@ class Connector(GenericConnector):
try:
return self.cursor.fetchall()
except cx_Oracle.InterfaceError, msg:
logger.warn(msg)
logger.warn("(remote) %s" % msg)
return None
def execute(self, query):
@ -66,7 +66,7 @@ class Connector(GenericConnector):
self.cursor.execute(utf8encode(query))
retVal = True
except (cx_Oracle.DatabaseError), msg:
logger.warn(msg)
logger.warn("(remote) %s" % msg)
except cx_Oracle.InternalError, msg:
raise sqlmapConnectionException, msg

View File

@ -61,7 +61,7 @@ class Connector(GenericConnector):
self.cursor.execute(query)
retVal = True
except (psycopg2.OperationalError, psycopg2.ProgrammingError), msg:
logger.warn(msg)
logger.warn(("(remote) %s" % msg).strip())
except psycopg2.InternalError, msg:
raise sqlmapConnectionException, msg

View File

@ -71,14 +71,14 @@ class Connector(GenericConnector):
try:
return self.cursor.fetchall()
except self.__sqlite.OperationalError, msg:
logger.warn(msg[0])
logger.warn("(remote) %s" % msg[0])
return None
def execute(self, query):
try:
self.cursor.execute(utf8encode(query))
except self.__sqlite.OperationalError, msg:
logger.warn(msg[0])
logger.warn("(remote) %s" % msg[0])
except self.__sqlite.DatabaseError, msg:
raise sqlmapConnectionException, msg[0]

View File

@ -52,14 +52,14 @@ class Connector(GenericConnector):
try:
return self.cursor.fetchall()
except (pymssql.ProgrammingError, pymssql.OperationalError, _mssql.MssqlDatabaseException), msg:
logger.warn(msg)
logger.warn("(remote) %s" % msg)
return None
def execute(self, query):
try:
self.cursor.execute(utf8encode(query))
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:
logger.warn(msg)
logger.warn("(remote) %s" % msg)
except pymssql.InternalError, msg:
raise sqlmapConnectionException, msg

View File

@ -97,9 +97,9 @@
<substring query="SUBSTR((%s)::text,%d,%d)"/>
<case query="SELECT (CASE WHEN (%s) THEN '1' ELSE '0' END)"/>
<inference query="ASCII(SUBSTR((%s)::text,%d,1)) > %d"/>
<banner query="SELECT VERSION()"/>
<current_user query="SELECT CURRENT_USER"/>
<current_db query="SELECT CURRENT_DATABASE()"/>
<banner query="VERSION()"/>
<current_user query="CURRENT_USER"/>
<current_db query="CURRENT_DATABASE()"/>
<is_dba query="(SELECT usesuper=true FROM pg_user WHERE usename=CURRENT_USER OFFSET 0 LIMIT 1)"/>
<check_udf query="(SELECT proname='%s' FROM pg_proc WHERE proname='%s' OFFSET 0 LIMIT 1)"/>
<users>