Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b9151ca

Browse files
stamparmstamparm
committed
Trivial case update
1 parent 4cc13d3 commit b9151ca

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎lib/core/common.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
from lib.core.convert import getBytes
5858
from lib.core.convert import getText
5959
from lib.core.convert import getUnicode
60-
from lib.core.convert import htmlunescape
60+
from lib.core.convert import htmlUnescape
6161
from lib.core.convert import stdoutEncode
6262
from lib.core.data import conf
6363
from lib.core.data import kb
@@ -2001,7 +2001,7 @@ def getFilteredPageContent(page, onlyText=True, split=" "):
20012001
if isinstance(page, six.text_type):
20022002
retVal = re.sub(r"(?si)<script.+?</script>|<!--.+?-->|<style.+?</style>%s" % (r"|<[^>]+>|\t|\n|\r" if onlyText else ""), split, page)
20032003
retVal = re.sub(r"%s{2,}" % split, split, retVal)
2004-
retVal = htmlunescape(retVal.strip().strip(split))
2004+
retVal = htmlUnescape(retVal.strip().strip(split))
20052005

20062006
return retVal
20072007

@@ -2636,7 +2636,7 @@ def extractErrorMessage(page):
26362636
match = re.search(regex, page, re.IGNORECASE)
26372637

26382638
if match:
2639-
retVal = htmlunescape(match.group("result")).replace("<br>", "\n").strip()
2639+
retVal = htmlUnescape(match.group("result")).replace("<br>", "\n").strip()
26402640
break
26412641

26422642
return retVal

‎lib/core/convert.py‎

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ def base64unpickle(value):
7070

7171
return retVal
7272

73-
def htmlunescape(value):
73+
def htmlUnescape(value):
7474
"""
7575
Returns (basic conversion) HTML unescaped value
7676
77-
>>> htmlunescape('a&lt;b')
77+
>>> htmlUnescape('a&lt;b')
7878
'a<b'
7979
"""
8080

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from thirdparty.six import unichr as _unichr
1919

2020
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
21-
VERSION = "1.3.5.110"
21+
VERSION = "1.3.5.111"
2222
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2323
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2424
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

‎lib/techniques/error/use.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from lib.core.compat import xrange
3535
from lib.core.convert import decodeHex
3636
from lib.core.convert import getUnicode
37-
from lib.core.convert import htmlunescape
37+
from lib.core.convert import htmlUnescape
3838
from lib.core.data import conf
3939
from lib.core.data import kb
4040
from lib.core.data import logger
@@ -204,7 +204,7 @@ def _oneShotErrorUse(expression, field=None, chunkTest=False):
204204
retVal = decodeDbmsHexValue(retVal) if conf.hexConvert else retVal
205205

206206
if isinstance(retVal, six.string_types):
207-
retVal = htmlunescape(retVal).replace("<br>", "\n")
207+
retVal = htmlUnescape(retVal).replace("<br>", "\n")
208208

209209
retVal = _errorReplaceChars(retVal)
210210

‎lib/techniques/union/use.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
from lib.core.convert import decodeBase64
4343
from lib.core.convert import getBytes
4444
from lib.core.convert import getUnicode
45-
from lib.core.convert import htmlunescape
45+
from lib.core.convert import htmlUnescape
4646
from lib.core.data import conf
4747
from lib.core.data import kb
4848
from lib.core.data import logger
@@ -147,7 +147,7 @@ def _(regex):
147147

148148
# Special case when DBMS is Microsoft SQL Server and error message is used as a result of UNION injection
149149
if Backend.isDbms(DBMS.MSSQL) and wasLastResponseDBMSError():
150-
retVal = htmlunescape(retVal).replace("<br>", "\n")
150+
retVal = htmlUnescape(retVal).replace("<br>", "\n")
151151

152152
hashDBWrite("%s%s" % (conf.hexConvert or False, expression), retVal)
153153

‎lib/utils/crawler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from lib.core.common import safeCSValue
2121
from lib.core.common import urldecode
2222
from lib.core.compat import xrange
23-
from lib.core.convert import htmlunescape
23+
from lib.core.convert import htmlUnescape
2424
from lib.core.data import conf
2525
from lib.core.data import kb
2626
from lib.core.data import logger
@@ -99,7 +99,7 @@ def crawlThread():
9999
if href:
100100
if threadData.lastRedirectURL and threadData.lastRedirectURL[0] == threadData.lastRequestUID:
101101
current = threadData.lastRedirectURL[1]
102-
url = _urllib.parse.urljoin(current, htmlunescape(href))
102+
url = _urllib.parse.urljoin(current, htmlUnescape(href))
103103

104104
# flag to know if we are dealing with the same target host
105105
_ = checkSameHost(url, target)

0 commit comments

Comments
 (0)