sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-25 02:53:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Should fix broken Travis

Browse Source
This commit is contained in:
Miroslav Stampar 2020-02-06 22:52:45 +01:00
parent 6825bf85a4
commit 19e08416b5
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/patch.py
View File

@ -36,6 +36,8 @@ from lib.request.templates import getPageTemplate
from thirdparty import six from thirdparty import six
from thirdparty.six.moves import http_client as _http_client from thirdparty.six.moves import http_client as _http_client
_rand = 0
def dirtyPatches(): def dirtyPatches():
""" """
Place for "dirty" Python related patches Place for "dirty" Python related patches

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.2.19" VERSION = "1.4.2.20"
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)

4
lib/core/testing.py
View File

@ -5,8 +5,6 @@ Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
See the file 'LICENSE' for copying permission See the file 'LICENSE' for copying permission
""" """
from __future__ import division
import doctest import doctest
import logging import logging
import os import os
@ -35,8 +33,6 @@ from lib.core.data import paths
from lib.core.data import queries from lib.core.data import queries
from lib.core.patch import unisonRandom from lib.core.patch import unisonRandom
_rand = 0
def vulnTest(): def vulnTest():
""" """
Runs the testing against 'vulnserver' Runs the testing against 'vulnserver'

9
lib/request/basic.py
View File

@ -4,7 +4,6 @@
Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/) Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
See the file 'LICENSE' for copying permission See the file 'LICENSE' for copying permission
""" """
from __future__ import print_function
import codecs import codecs
import gzip import gzip
@ -239,12 +238,8 @@ def checkCharEncoding(encoding, warn=True):
if encoding: if encoding:
try: try:
_ = getBytes(randomStr()) six.text_type(getBytes(randomStr()), encoding)
print(repr(_)) except:
print(encoding)
six.text_type(_, encoding)
except Exception as ex:
print(getSafeExString(ex))
if warn: if warn:
warnMsg = "invalid web page charset '%s'" % encoding warnMsg = "invalid web page charset '%s'" % encoding
singleTimeLogMessage(warnMsg, logging.WARN, encoding) singleTimeLogMessage(warnMsg, logging.WARN, encoding)