sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-03 13:14:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring for #4077

Browse Source
This commit is contained in:
Miroslav Stampar 2020-01-15 22:47:06 +01:00
parent 3776f2eeea
commit 1cfe370276
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/convert.py
View File

@ -238,7 +238,7 @@ def getBytes(value, encoding=None, errors="strict", unsafe=True):
retVal = value retVal = value
if encoding is None: if encoding is None:
encoding = conf.encoding or UNICODE_ENCODING encoding = conf.get("encoding") or UNICODE_ENCODING
try: try:
codecs.lookup(encoding) codecs.lookup(encoding)

2
lib/core/settings.py
View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.4.1.24" VERSION = "1.4.1.25"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} 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) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

12
lib/utils/api.py
View File

@ -29,6 +29,8 @@ from lib.core.convert import decodeBase64
from lib.core.convert import dejsonize from lib.core.convert import dejsonize
from lib.core.convert import encodeBase64 from lib.core.convert import encodeBase64
from lib.core.convert import encodeHex from lib.core.convert import encodeHex
from lib.core.convert import getBytes
from lib.core.convert import getText
from lib.core.convert import jsonize from lib.core.convert import jsonize
from lib.core.data import conf from lib.core.data import conf
from lib.core.data import kb from lib.core.data import kb
@ -711,17 +713,19 @@ def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter=REST
def _client(url, options=None): def _client(url, options=None):
logger.debug("Calling '%s'" % url) logger.debug("Calling '%s'" % url)
try: try:
data = None
if options is not None:
data = jsonize(options).encode("utf-8")
headers = {"Content-Type": "application/json"} headers = {"Content-Type": "application/json"}
if options is not None:
data = getBytes(jsonize(options))
else:
data = None
if DataStore.username or DataStore.password: if DataStore.username or DataStore.password:
headers["Authorization"] = "Basic %s" % encodeBase64("%s:%s" % (DataStore.username or "", DataStore.password or ""), binary=False) headers["Authorization"] = "Basic %s" % encodeBase64("%s:%s" % (DataStore.username or "", DataStore.password or ""), binary=False)
req = _urllib.request.Request(url, data, headers) req = _urllib.request.Request(url, data, headers)
response = _urllib.request.urlopen(req) response = _urllib.request.urlopen(req)
text = response.read().decode("utf-8") text = getText(response.read())
except: except:
if options: if options:
logger.error("Failed to load and parse %s" % url) logger.error("Failed to load and parse %s" % url)