Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7bca926

Browse files
stamparmstamparm
committed
fixes, updates, patches
1 parent 948cf25 commit 7bca926

10 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎plugins/dbms/access/connector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ def fetchall(self):
5353
try:
5454
return self.cursor.fetchall()
5555
except pyodbc.ProgrammingError, msg:
56-
logger.warn(msg[1])
56+
logger.warn("(remote) %s" % msg[1])
5757
return None
5858

5959
def execute(self, query):
6060
try:
6161
self.cursor.execute(query)
6262
except (pyodbc.OperationalError, pyodbc.ProgrammingError), msg:
63-
logger.warn(msg[1])
63+
logger.warn("(remote) %s" % msg[1])
6464
except pyodbc.Error, msg:
6565
raise sqlmapConnectionException, msg[1]
6666

‎plugins/dbms/db2/connector.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22

33
"""
4-
$Id$
4+
$Id$
55
66
Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
77
See the file 'doc/COPYING' for copying permission
@@ -45,14 +45,14 @@ def fetchall(self):
4545
try:
4646
return self.cursor.fetchall()
4747
except ibm_db_dbi.ProgrammingError, msg:
48-
logger.warn(msg[1])
48+
logger.warn("(remote) %s" % msg[1])
4949
return None
5050

5151
def execute(self, query):
5252
try:
5353
self.cursor.execute(query)
5454
except (ibm_db_dbi.OperationalError, ibm_db_dbi.ProgrammingError), msg:
55-
logger.warn(msg[1])
55+
logger.warn("(remote) %s" % msg[1])
5656
except ibm_db_dbi.InternalError, msg:
5757
raise sqlmapConnectionException, msg[1]
5858

‎plugins/dbms/firebird/connector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ def fetchall(self):
5050
try:
5151
return self.cursor.fetchall()
5252
except kinterbasdb.OperationalError, msg:
53-
logger.warn(msg[1])
53+
logger.warn("(remote) %s" % msg[1])
5454
return None
5555

5656
def execute(self, query):
5757
try:
5858
self.cursor.execute(query)
5959
except kinterbasdb.OperationalError, msg:
60-
logger.warn(msg[1])
60+
logger.warn("(remote) %s" % msg[1])
6161
except kinterbasdb.Error, msg:
6262
raise sqlmapConnectionException, msg[1]
6363

‎plugins/dbms/mssqlserver/connector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def fetchall(self):
5252
try:
5353
return self.cursor.fetchall()
5454
except (pymssql.ProgrammingError, pymssql.OperationalError, _mssql.MssqlDatabaseException), msg:
55-
logger.warn(msg)
55+
logger.warn("(remote) %s" % msg)
5656
return None
5757

5858
def execute(self, query):
@@ -62,7 +62,7 @@ def execute(self, query):
6262
self.cursor.execute(utf8encode(query))
6363
retVal = True
6464
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:
65-
logger.warn(msg)
65+
logger.warn("(remote) %s" % msg)
6666
except pymssql.InternalError, msg:
6767
raise sqlmapConnectionException, msg
6868

‎plugins/dbms/mysql/connector.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def execute(self, query):
5757
self.cursor.execute(query)
5858
retVal = True
5959
except (pymysql.OperationalError, pymysql.ProgrammingError), msg:
60-
logger.warn(msg[1])
60+
logger.warn("(remote) %s" % msg[1])
6161
except pymysql.InternalError, msg:
6262
raise sqlmapConnectionException, msg[1]
6363

‎plugins/dbms/oracle/connector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def fetchall(self):
5656
try:
5757
return self.cursor.fetchall()
5858
except cx_Oracle.InterfaceError, msg:
59-
logger.warn(msg)
59+
logger.warn("(remote) %s" % msg)
6060
return None
6161

6262
def execute(self, query):
@@ -66,7 +66,7 @@ def execute(self, query):
6666
self.cursor.execute(utf8encode(query))
6767
retVal = True
6868
except (cx_Oracle.DatabaseError), msg:
69-
logger.warn(msg)
69+
logger.warn("(remote) %s" % msg)
7070
except cx_Oracle.InternalError, msg:
7171
raise sqlmapConnectionException, msg
7272

‎plugins/dbms/postgresql/connector.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def execute(self, query):
6161
self.cursor.execute(query)
6262
retVal = True
6363
except (psycopg2.OperationalError, psycopg2.ProgrammingError), msg:
64-
logger.warn(msg)
64+
logger.warn(("(remote) %s" % msg).strip())
6565
except psycopg2.InternalError, msg:
6666
raise sqlmapConnectionException, msg
6767

‎plugins/dbms/sqlite/connector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ def fetchall(self):
7171
try:
7272
return self.cursor.fetchall()
7373
except self.__sqlite.OperationalError, msg:
74-
logger.warn(msg[0])
74+
logger.warn("(remote) %s" % msg[0])
7575
return None
7676

7777
def execute(self, query):
7878
try:
7979
self.cursor.execute(utf8encode(query))
8080
except self.__sqlite.OperationalError, msg:
81-
logger.warn(msg[0])
81+
logger.warn("(remote) %s" % msg[0])
8282
except self.__sqlite.DatabaseError, msg:
8383
raise sqlmapConnectionException, msg[0]
8484

‎plugins/dbms/sybase/connector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ def fetchall(self):
5252
try:
5353
return self.cursor.fetchall()
5454
except (pymssql.ProgrammingError, pymssql.OperationalError, _mssql.MssqlDatabaseException), msg:
55-
logger.warn(msg)
55+
logger.warn("(remote) %s" % msg)
5656
return None
5757

5858
def execute(self, query):
5959
try:
6060
self.cursor.execute(utf8encode(query))
6161
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:
62-
logger.warn(msg)
62+
logger.warn("(remote) %s" % msg)
6363
except pymssql.InternalError, msg:
6464
raise sqlmapConnectionException, msg
6565

‎xml/queries.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@
9797
<substring query="SUBSTR((%s)::text,%d,%d)"/>
9898
<case query="SELECT (CASE WHEN (%s) THEN '1' ELSE '0' END)"/>
9999
<inference query="ASCII(SUBSTR((%s)::text,%d,1)) > %d"/>
100-
<banner query="SELECT VERSION()"/>
101-
<current_user query="SELECT CURRENT_USER"/>
102-
<current_db query="SELECT CURRENT_DATABASE()"/>
100+
<banner query="VERSION()"/>
101+
<current_user query="CURRENT_USER"/>
102+
<current_db query="CURRENT_DATABASE()"/>
103103
<is_dba query="(SELECT usesuper=true FROM pg_user WHERE usename=CURRENT_USER OFFSET 0 LIMIT 1)"/>
104104
<check_udf query="(SELECT proname='%s' FROM pg_proc WHERE proname='%s' OFFSET 0 LIMIT 1)"/>
105105
<users>

0 commit comments

Comments
 (0)