PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-09 22:21:30 +00:00
Code Issues Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
Miroslav Stampar
2012-12-07 11:54:34 +01:00
parent fbaeecdaf9
commit 75e6d77fbc
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/utils/google.py
View File

@@ -16,6 +16,7 @@ from lib.core.common import getUnicode
from lib.core.common import urlencode
from lib.core.data import conf
from lib.core.data import logger
from lib.core.enums import CUSTOM_LOGGING
from lib.core.exception import SqlmapConnectionException
from lib.core.exception import SqlmapGenericException
from lib.core.settings import GOOGLE_REGEX
@@ -67,7 +68,7 @@ class Google(object):
requestMsg = "HTTP request:\nGET %s" % url
requestMsg += " %s" % httplib.HTTPConnection._http_vsn_str
logger.log(8, requestMsg)
logger.log(CUSTOM_LOGGING.TRAFFIC_OUT, requestMsg)
page = conn.read()
code = conn.code
@@ -82,7 +83,7 @@ class Google(object):
elif conf.verbose > 4:
responseMsg += "%s\n%s\n" % (responseHeaders, page)
logger.log(7, responseMsg)
logger.log(CUSTOM_LOGGING.TRAFFIC_IN, responseMsg)
except urllib2.HTTPError, e:
try:
page = e.read()

3
lib/utils/timeout.py
View File

@@ -8,6 +8,7 @@ See the file 'doc/COPYING' for copying permission
import threading
from lib.core.data import logger
from lib.core.enums import CUSTOM_LOGGING
def timeout(func, args=(), kwargs={}, duration=1, default=None):
class InterruptableThread(threading.Thread):
@@ -19,7 +20,7 @@ def timeout(func, args=(), kwargs={}, duration=1, default=None):
try:
self.result = func(*args, **kwargs)
except Exception, msg:
logger.log(7, msg)
logger.log(CUSTOM_LOGGING.TRAFFIC_IN, msg)
self.result = default
thread = InterruptableThread()