sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-28 20:43:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Trivial update#

Browse Source
This commit is contained in:
Miroslav Stampar 2018-01-31 10:50:34 +01:00
parent 30f8c30d6a
commit 31fa7f6c94
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/common.py
View File

@ -770,7 +770,7 @@ def getManualDirectories():
checkFile(listPath)
directories = getFileItems(listPath)
elif choice == '4':
targets = set([conf.hostname])
targets = {conf.hostname}
_ = conf.hostname.split('.')
if _[0] == "www":

2
lib/core/settings.py
View File

@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
from lib.core.enums import OS
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.2.1.20"
VERSION = "1.2.1.21"
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)

2
lib/takeover/web.py
View File

@ -205,7 +205,7 @@ class Web:
if readInput(message, default='Y', boolean=True):
headers = {}
been = set([conf.url])
been = {conf.url}
for match in re.finditer(r"=['\"]((https?):)?(//[^/'\"]+)?(/[\w/.-]*)\bwp-", kb.originalPage or "", re.I):
url = "%s%s" % (conf.url.replace(conf.path, match.group(4)), "wp-content/wp-db.php")

2
lib/utils/crawler.py
View File

@ -126,7 +126,7 @@ def crawl(target):
dataToStdout("\r[%s] [INFO] %s" % (time.strftime("%X"), status), True)
threadData.shared.deeper = set()
threadData.shared.unprocessed = set([target])
threadData.shared.unprocessed = {target}
if not conf.sitemapUrl:
message = "do you want to check for the existence of "

2
lib/utils/har.py
View File

@ -180,7 +180,7 @@ class Response:
"size": len(self.content or "")
}
binary = set(['\0', '\1'])
binary = {'\0', '\1'}
if any(c in binary for c in self.content):
content["encoding"] = "base64"
content["text"] = base64.b64encode(self.content)

14
lib/utils/hash.py
View File

@ -693,9 +693,7 @@ def hashRecognition(value):
if isinstance(value, basestring):
for name, regex in getPublicTypeMembers(HASH):
# Hashes for Oracle and old MySQL look the same hence these checks
if isOracle and regex == HASH.MYSQL_OLD:
continue
elif isMySQL and regex == HASH.ORACLE_OLD:
if isOracle and regex == HASH.MYSQL_OLD or isMySQL and regex == HASH.ORACLE_OLD:
continue
elif regex == HASH.CRYPT_GENERIC:
if any((value.lower() == value, value.upper() == value)):
@ -712,7 +710,7 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
count = 0
rotator = 0
hashes = set([item[0][1] for item in attack_info])
hashes = set(item[0][1] for item in attack_info)
wordlist = Wordlist(wordlists, proc_id, getattr(proc_count, "value", 0), custom_wordlist)
@ -758,7 +756,7 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
if rotator >= len(ROTATING_CHARS):
rotator = 0
status = 'current status: %s... %s' % (word.ljust(5)[:5], ROTATING_CHARS[rotator])
status = "current status: %s... %s" % (word.ljust(5)[:5], ROTATING_CHARS[rotator])
if not api:
dataToStdout("\r[%s] [INFO] %s" % (time.strftime("%X"), status))
@ -827,12 +825,14 @@ def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found
elif (proc_id == 0 or getattr(proc_count, "value", 0) == 1) and count % HASH_MOD_ITEM_DISPLAY == 0:
rotator += 1
if rotator >= len(ROTATING_CHARS):
rotator = 0
status = 'current status: %s... %s' % (word.ljust(5)[:5], ROTATING_CHARS[rotator])
status = "current status: %s... %s" % (word.ljust(5)[:5], ROTATING_CHARS[rotator])
if user and not user.startswith(DUMMY_USER_PREFIX):
status += ' (user: %s)' % user
status += " (user: %s)" % user
if not api:
dataToStdout("\r[%s] [INFO] %s" % (time.strftime("%X"), status))

6
plugins/generic/enumeration.py
View File

@ -60,13 +60,13 @@ class Enumeration(Custom, Databases, Entries, Search, Users):
bannerParser(kb.data.banner)
if conf.os and conf.os == "windows":
kb.bannerFp["type"] = set(["Windows"])
kb.bannerFp["type"] = {"Windows"}
elif conf.os and conf.os == "linux":
kb.bannerFp["type"] = set(["Linux"])
kb.bannerFp["type"] = {"Linux"}
elif conf.os:
kb.bannerFp["type"] = set(["%s%s" % (conf.os[0].upper(), conf.os[1:])])
kb.bannerFp["type"] = {"%s%s" % (conf.os[0].upper(), conf.os[1:])}
if conf.os:
setOs()

14
txt/checksum.md5
View File

@ -27,7 +27,7 @@ a7b0c8e5a18a3abe8803999dcfc4664f lib/controller/handler.py
1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py
e3a3f5218b2e52dd0afafdfc9fed2002 lib/core/agent.py
86a4703d5474badd8462146510b2c460 lib/core/bigarray.py
27d1b0a4609eece643141408d1f18716 lib/core/common.py
e4fa4177b9d3c24555fb275335496e29 lib/core/common.py
2a40d5b5997265daa890545d4a4a59b9 lib/core/convert.py
9f87391b6a3395f7f50830b391264f27 lib/core/data.py
72016ea5c994a711a262fd64572a0fcd lib/core/datatype.py
@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a lib/core/readlineng.py
0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py
a7db43859b61569b601b97f187dd31c5 lib/core/revision.py
fcb74fcc9577523524659ec49e2e964b lib/core/session.py
2ef6392db210a10901554ea061ee7256 lib/core/settings.py
4f27b5c4801cad5c6b8361f953a4f313 lib/core/settings.py
d0adc28a38e43a787df4471f7f027413 lib/core/shell.py
63491be462c515a1a3880c27c2acc4a2 lib/core/subprocessng.py
505aaa61e1bba3c3d4567c3e667699e3 lib/core/target.py
@ -85,7 +85,7 @@ acc1db3667bf910b809eb279b60595eb lib/takeover/icmpsh.py
703e15714316a8cc4bbe54cdd0a8cb87 lib/takeover/metasploit.py
0fc9b00596df21c8878ef92f513ecad7 lib/takeover/registry.py
48575dde7bb867b7937769f569a98309 lib/takeover/udf.py
1398cb4ee55becf628367854b5310f33 lib/takeover/web.py
3972e3e00115c6e4e03336e23e35b1de lib/takeover/web.py
d8c10f278e5943b137a222f4cedca59d lib/takeover/xp_cmdshell.py
f6844893afa7569052529e1c8d89bc35 lib/techniques/blind/inference.py
1e5532ede194ac9c083891c2f02bca93 lib/techniques/blind/__init__.py
@ -100,12 +100,12 @@ c497003ecf231d03a311a816a6b3b753 lib/techniques/union/test.py
6c3c4c7d43ad75e61a73184323a81eac lib/techniques/union/use.py
918d6f34c415c578c2eae8730f555ae8 lib/utils/api.py
37dfb641358669f62c2acedff241348b lib/utils/brute.py
a34c4fd2e7d78c5dfdd9eeccb079fb1c lib/utils/crawler.py
8f2f246d17f5891a2e584533bd18e65c lib/utils/crawler.py
985c737cd8a6a722160c55cf5ee224f4 lib/utils/deps.py
a6d6888e14a7c11f0884c8cc18489caa lib/utils/getch.py
7af29f61302c8693cd6436d4b69e22d3 lib/utils/har.py
2384f77330583b53018a7dab5fc1c90f lib/utils/har.py
9bd8fbfb9c25ee685c97b260331e7165 lib/utils/hashdb.py
578007a75d75a2e510a9ec33f01eeeb0 lib/utils/hash.py
29dee8f54cfb39feb0545d237542f866 lib/utils/hash.py
145120b21fcfca843d5e2c8b0562e4db lib/utils/htmlentities.py
1e5532ede194ac9c083891c2f02bca93 lib/utils/__init__.py
010d8327239d33af4ce9f25683cfc012 lib/utils/pivotdumptable.py
@ -205,7 +205,7 @@ a3db8618eed5bb2807b6f77605cba9cc plugins/dbms/sybase/__init__.py
e6cd1c5a5244d83396b401f7db43d323 plugins/generic/custom.py
315a3ced9667065b24de040af296037a plugins/generic/databases.py
b1bd764e8f417222ebb1890232290679 plugins/generic/entries.py
d82f2c78c1d4d7c6487e94fd3a68a908 plugins/generic/enumeration.py
00e0b1b5713784c8131660bfc40bbaac plugins/generic/enumeration.py
ea0f3b9085061b272bfd98c13ad2d977 plugins/generic/filesystem.py
f5d5419efddfe04648ea5e953c650793 plugins/generic/fingerprint.py
1e5532ede194ac9c083891c2f02bca93 plugins/generic/__init__.py