diff --git a/lib/core/replication.py b/lib/core/replication.py index 965e45a92..d69851995 100644 --- a/lib/core/replication.py +++ b/lib/core/replication.py @@ -15,6 +15,13 @@ class Replication: replication purposes. """ + # sqlite data types + NULL = DataType('NULL') + INTEGER = DataType('INTEGER') + REAL = DataType('REAL') + TEXT = DataType('TEXT') + BLOB = DataType('BLOB') + def __init__(self, dbpath): self.dbpath = dbpath self.connection = sqlite3.connect(dbpath) @@ -67,13 +74,6 @@ class Replication: stmt += 'WHERE %s' % condition return self.parent.cursor.execute(stmt) - # sqlite data types - NULL = DataType('NULL') - INTEGER = DataType('INTEGER') - REAL = DataType('REAL') - TEXT = DataType('TEXT') - BLOB = DataType('BLOB') - def createTable(self, tblname, columns=None, typeless=False): """ This function creates Table instance with current connection settings. diff --git a/lib/request/connect.py b/lib/request/connect.py index c72d6e7c0..4f1840246 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -212,12 +212,15 @@ class Connect: page = decodePage(page, responseHeaders.get("Content-Encoding"), responseHeaders.get("Content-Type")) except urllib2.HTTPError, e: + code = e.code + status = e.msg + if e.code == 401: errMsg = "not authorized, try to provide right HTTP " - errMsg += "authentication type and valid credentials (%d)" % e.code + errMsg += "authentication type and valid credentials (%d)" % code raise sqlmapConnectionException, errMsg elif e.code == 404 and raise404: - errMsg = "page not found (%d)" % e.code + errMsg = "page not found (%d)" % code raise sqlmapConnectionException, errMsg else: try: @@ -225,13 +228,10 @@ class Connect: responseHeaders = e.info() except socket.timeout: warnMsg = "connection timed out while trying " - warnMsg += "to get error page information (%d)" % e.code + warnMsg += "to get error page information (%d)" % code logger.warn(warnMsg) return None, None - code = e.code - status = e.msg - debugMsg = "got HTTP error code: %d (%s)" % (code, status) logger.debug(debugMsg)