diff --git a/doc/translations/README-tr-TR.md b/doc/translations/README-tr-TR.md index cf60143f2..5951d109e 100644 --- a/doc/translations/README-tr-TR.md +++ b/doc/translations/README-tr-TR.md @@ -23,7 +23,7 @@ Veya tercihen, [Git](https://github.com/sqlmapproject/sqlmap) reposunu klonlayar git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev -sqlmap [Python](https://www.python.org/download/) sitesinde bulunan **2.6**, **2.7** and **3.x** versiyonları ile bütün platformlarda çalışabilmektedir. +sqlmap [Python](https://www.python.org/download/) sitesinde bulunan **2.6**, **2.7** ve **3.x** versiyonları ile bütün platformlarda çalışabilmektedir. Kullanım ---- diff --git a/lib/core/settings.py b/lib/core/settings.py index 48325d6c7..89d31f23a 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.7.4.6" +VERSION = "1.7.4.10" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/lib/request/connect.py b/lib/request/connect.py index e2387b07d..e519802fb 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -814,7 +814,7 @@ class Connect(object): debugMsg = "got HTTP error code: %d ('%s')" % (code, status) logger.debug(debugMsg) - except (_urllib.error.URLError, socket.error, socket.timeout, _http_client.HTTPException, struct.error, binascii.Error, ProxyError, SqlmapCompressionException, WebSocketException, TypeError, ValueError, OverflowError, AttributeError, OSError): + except (_urllib.error.URLError, socket.error, socket.timeout, _http_client.HTTPException, struct.error, binascii.Error, ProxyError, SqlmapCompressionException, WebSocketException, TypeError, ValueError, OverflowError, AttributeError, OSError, AssertionError): tbMsg = traceback.format_exc() if conf.debug: diff --git a/lib/request/httpshandler.py b/lib/request/httpshandler.py index c9676a9c4..05e1ccf8b 100644 --- a/lib/request/httpshandler.py +++ b/lib/request/httpshandler.py @@ -27,7 +27,7 @@ try: except ImportError: pass -_protocols = filterNone(getattr(ssl, _, None) for _ in ("PROTOCOL_TLSv1_2", "PROTOCOL_TLSv1_1", "PROTOCOL_TLSv1", "PROTOCOL_SSLv3", "PROTOCOL_SSLv23", "PROTOCOL_SSLv2")) +_protocols = filterNone(getattr(ssl, _, None) for _ in ("PROTOCOL_TLS_CLIENT", "PROTOCOL_TLSv1_2", "PROTOCOL_TLSv1_1", "PROTOCOL_TLSv1", "PROTOCOL_SSLv3", "PROTOCOL_SSLv23", "PROTOCOL_SSLv2")) _lut = dict((getattr(ssl, _), _) for _ in dir(ssl) if _.startswith("PROTOCOL_")) _contexts = {} diff --git a/lib/request/redirecthandler.py b/lib/request/redirecthandler.py index 4920c561b..a305906b2 100644 --- a/lib/request/redirecthandler.py +++ b/lib/request/redirecthandler.py @@ -66,7 +66,7 @@ class SmartRedirectHandler(_urllib.request.HTTPRedirectHandler): self.redirect_request = self._redirect_request def _redirect_request(self, req, fp, code, msg, headers, newurl): - return _urllib.request.Request(newurl.replace(' ', '%20'), data=req.data, headers=req.headers, origin_req_host=req.get_origin_req_host()) + return _urllib.request.Request(newurl.replace(' ', '%20'), data=req.data, headers=req.headers, origin_req_host=req.get_origin_req_host() if hasattr(req, "get_origin_req_host") else req.origin_req_host) def http_error_302(self, req, fp, code, msg, headers): start = time.time() diff --git a/lib/utils/brute.py b/lib/utils/brute.py index 905e5d241..d927ed6a5 100644 --- a/lib/utils/brute.py +++ b/lib/utils/brute.py @@ -7,7 +7,6 @@ See the file 'LICENSE' for copying permission from __future__ import division -import logging import time from lib.core.common import Backend @@ -387,9 +386,6 @@ def fileExists(pathFile): kb.locks.io.release() try: - pushValue(logger.getEffectiveLevel()) - logger.setLevel(logging.CRITICAL) - runThreads(conf.threads, fileExistsThread, threadChoice=True) except KeyboardInterrupt: warnMsg = "user aborted during file existence " @@ -397,7 +393,6 @@ def fileExists(pathFile): logger.warning(warnMsg) finally: kb.bruteMode = False - logger.setLevel(popValue()) clearConsoleLine(True) dataToStdout("\n") diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py index 4c046f645..5d383ed72 100644 --- a/plugins/generic/filesystem.py +++ b/plugins/generic/filesystem.py @@ -222,13 +222,13 @@ class Filesystem(object): if conf.direct or isStackingAvailable(): if isStackingAvailable(): - debugMsg = "going to read the file with stacked query SQL " + debugMsg = "going to try to read the file with stacked query SQL " debugMsg += "injection technique" logger.debug(debugMsg) fileContent = self.stackedReadFile(remoteFile) elif Backend.isDbms(DBMS.MYSQL): - debugMsg = "going to read the file with a non-stacked query " + debugMsg = "going to try to read the file with non-stacked query " debugMsg += "SQL injection technique" logger.debug(debugMsg)