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

Skip to content

Commit 6e2fce6

Browse files
committed
Patch for an Issue #212
1 parent eb6f17b commit 6e2fce6

8 files changed

Lines changed: 34 additions & 16 deletions

File tree

plugins/dbms/access/connector.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
except ImportError, _:
1111
pass
1212

13+
import logging
14+
15+
from lib.core.data import conf
1316
from lib.core.data import logger
1417
from lib.core.exception import sqlmapConnectionException
1518
from lib.core.exception import sqlmapUnsupportedFeatureException
@@ -49,14 +52,14 @@ def fetchall(self):
4952
try:
5053
return self.cursor.fetchall()
5154
except pyodbc.ProgrammingError, msg:
52-
logger.warn("(remote) %s" % msg[1])
55+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
5356
return None
5457

5558
def execute(self, query):
5659
try:
5760
self.cursor.execute(query)
5861
except (pyodbc.OperationalError, pyodbc.ProgrammingError), msg:
59-
logger.warn("(remote) %s" % msg[1])
62+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
6063
except pyodbc.Error, msg:
6164
raise sqlmapConnectionException, msg[1]
6265

plugins/dbms/db2/connector.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
except ImportError, _:
1111
pass
1212

13+
import logging
14+
15+
from lib.core.data import conf
1316
from lib.core.data import logger
1417
from lib.core.exception import sqlmapConnectionException
1518
from plugins.generic.connector import Connector as GenericConnector
@@ -42,14 +45,14 @@ def fetchall(self):
4245
try:
4346
return self.cursor.fetchall()
4447
except ibm_db_dbi.ProgrammingError, msg:
45-
logger.warn("(remote) %s" % msg[1])
48+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
4649
return None
4750

4851
def execute(self, query):
4952
try:
5053
self.cursor.execute(query)
5154
except (ibm_db_dbi.OperationalError, ibm_db_dbi.ProgrammingError), msg:
52-
logger.warn("(remote) %s" % msg[1])
55+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
5356
except ibm_db_dbi.InternalError, msg:
5457
raise sqlmapConnectionException, msg[1]
5558

plugins/dbms/firebird/connector.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
except ImportError, _:
1111
pass
1212

13+
import logging
14+
1315
from lib.core.data import logger
1416
from lib.core.exception import sqlmapConnectionException
1517
from lib.core.settings import UNICODE_ENCODING
@@ -47,14 +49,14 @@ def fetchall(self):
4749
try:
4850
return self.cursor.fetchall()
4951
except kinterbasdb.OperationalError, msg:
50-
logger.warn("(remote) %s" % msg[1])
52+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
5153
return None
5254

5355
def execute(self, query):
5456
try:
5557
self.cursor.execute(query)
5658
except kinterbasdb.OperationalError, msg:
57-
logger.warn("(remote) %s" % msg[1])
59+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
5860
except kinterbasdb.Error, msg:
5961
raise sqlmapConnectionException, msg[1]
6062

plugins/dbms/mssqlserver/connector.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
except ImportError, _:
1212
pass
1313

14+
import logging
15+
1416
from lib.core.convert import utf8encode
1517
from lib.core.data import conf
1618
from lib.core.data import logger
@@ -49,7 +51,7 @@ def fetchall(self):
4951
try:
5052
return self.cursor.fetchall()
5153
except (pymssql.ProgrammingError, pymssql.OperationalError, _mssql.MssqlDatabaseException), msg:
52-
logger.warn("(remote) %s" % str(msg).replace("\n", " "))
54+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % str(msg).replace("\n", " "))
5355
return None
5456

5557
def execute(self, query):
@@ -59,7 +61,7 @@ def execute(self, query):
5961
self.cursor.execute(utf8encode(query))
6062
retVal = True
6163
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:
62-
logger.warn("(remote) %s" % str(msg).replace("\n", " "))
64+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % str(msg).replace("\n", " "))
6365
except pymssql.InternalError, msg:
6466
raise sqlmapConnectionException, msg
6567

plugins/dbms/mysql/connector.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
except ImportError, _:
1111
pass
1212

13+
import logging
14+
1315
from lib.core.data import conf
1416
from lib.core.data import logger
1517
from lib.core.exception import sqlmapConnectionException
@@ -44,7 +46,7 @@ def fetchall(self):
4446
try:
4547
return self.cursor.fetchall()
4648
except pymysql.ProgrammingError, msg:
47-
logger.warn(msg[1])
49+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
4850
return None
4951

5052
def execute(self, query):
@@ -54,7 +56,7 @@ def execute(self, query):
5456
self.cursor.execute(query)
5557
retVal = True
5658
except (pymysql.OperationalError, pymysql.ProgrammingError), msg:
57-
logger.warn("(remote) %s" % msg[1])
59+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
5860
except pymysql.InternalError, msg:
5961
raise sqlmapConnectionException, msg[1]
6062

plugins/dbms/oracle/connector.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
except ImportError, _:
1111
pass
1212

13+
import logging
1314
import os
1415

1516
from lib.core.convert import utf8encode
17+
from lib.core.data import conf
1618
from lib.core.data import logger
1719
from lib.core.exception import sqlmapConnectionException
1820
from plugins.generic.connector import Connector as GenericConnector
@@ -53,7 +55,7 @@ def fetchall(self):
5355
try:
5456
return self.cursor.fetchall()
5557
except cx_Oracle.InterfaceError, msg:
56-
logger.warn("(remote) %s" % msg)
58+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg)
5759
return None
5860

5961
def execute(self, query):
@@ -63,7 +65,7 @@ def execute(self, query):
6365
self.cursor.execute(utf8encode(query))
6466
retVal = True
6567
except (cx_Oracle.DatabaseError), msg:
66-
logger.warn("(remote) %s" % msg)
68+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg)
6769
except cx_Oracle.InternalError, msg:
6870
raise sqlmapConnectionException, msg
6971

plugins/dbms/sqlite/connector.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
except ImportError, _:
1111
pass
1212

13+
import logging
14+
1315
from lib.core.convert import utf8encode
1416
from lib.core.data import conf
1517
from lib.core.data import logger
@@ -68,14 +70,14 @@ def fetchall(self):
6870
try:
6971
return self.cursor.fetchall()
7072
except self.__sqlite.OperationalError, msg:
71-
logger.warn("(remote) %s" % msg[0])
73+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[0])
7274
return None
7375

7476
def execute(self, query):
7577
try:
7678
self.cursor.execute(utf8encode(query))
7779
except self.__sqlite.OperationalError, msg:
78-
logger.warn("(remote) %s" % msg[0])
80+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[0])
7981
except self.__sqlite.DatabaseError, msg:
8082
raise sqlmapConnectionException, msg[0]
8183

plugins/dbms/sybase/connector.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
except ImportError, _:
1212
pass
1313

14+
import logging
15+
1416
from lib.core.convert import utf8encode
1517
from lib.core.data import conf
1618
from lib.core.data import logger
@@ -49,14 +51,14 @@ def fetchall(self):
4951
try:
5052
return self.cursor.fetchall()
5153
except (pymssql.ProgrammingError, pymssql.OperationalError, _mssql.MssqlDatabaseException), msg:
52-
logger.warn("(remote) %s" % msg)
54+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg)
5355
return None
5456

5557
def execute(self, query):
5658
try:
5759
self.cursor.execute(utf8encode(query))
5860
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:
59-
logger.warn("(remote) %s" % msg)
61+
logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg)
6062
except pymssql.InternalError, msg:
6163
raise sqlmapConnectionException, msg
6264

0 commit comments

Comments
 (0)