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

Skip to content

Commit a31ac03

Browse files
stamparmstamparm
committed
Minor refactoring related to last couple of commits
1 parent 8f13bda commit a31ac03

10 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from lib.core.enums import OS
2020

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

‎lib/utils/hash.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ def dictionaryAttack(attack_dict):
985985
else:
986986
logger.info("using default dictionary")
987987

988-
dictPaths = filter(None, dictPaths)
988+
dictPaths = [_ for _ in dictPaths if _]
989989

990990
for dictPath in dictPaths:
991991
checkFile(dictPath)

‎plugins/dbms/maxdb/enumeration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def getTables(self, bruteForce=None):
6767
else:
6868
dbs = self.getDbs()
6969

70-
for db in filter(None, dbs):
70+
for db in (_ for _ in dbs if _):
7171
dbs[dbs.index(db)] = safeSQLIdentificatorNaming(db)
7272

7373
infoMsg = "fetching tables for database"

‎plugins/dbms/mssqlserver/enumeration.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def getTables(self):
8383
for db in dbs:
8484
dbs[dbs.index(db)] = safeSQLIdentificatorNaming(db)
8585

86-
dbs = filter(None, dbs)
86+
dbs = [_ for _ in dbs if _]
8787

8888
infoMsg = "fetching tables for database"
8989
infoMsg += "%s: %s" % ("s" if len(dbs) > 1 else "", ", ".join(db if isinstance(db, basestring) else db[0] for db in sorted(dbs)))
@@ -110,7 +110,7 @@ def getTables(self):
110110
break
111111

112112
if not isNoneValue(value):
113-
value = filter(None, arrayizeValue(value))
113+
value = [_ for _ in arrayizeValue(value) if _]
114114
value = [safeSQLIdentificatorNaming(unArrayizeValue(_), True) for _ in value]
115115
kb.data.cachedTables[db] = value
116116

@@ -340,7 +340,7 @@ def searchColumn(self):
340340
colQuery = "%s%s" % (colCond, colCondParam)
341341
colQuery = colQuery % unsafeSQLIdentificatorNaming(column)
342342

343-
for db in filter(None, dbs.keys()):
343+
for db in (_ for _ in dbs if _):
344344
db = safeSQLIdentificatorNaming(db)
345345

346346
if conf.excludeSysDbs and db in self.excludeDbsList:

‎plugins/dbms/sybase/enumeration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def getTables(self, bruteForce=None):
128128
for db in dbs:
129129
dbs[dbs.index(db)] = safeSQLIdentificatorNaming(db)
130130

131-
dbs = filter(None, dbs)
131+
dbs = [_ for _ in dbs if _]
132132

133133
infoMsg = "fetching tables for database"
134134
infoMsg += "%s: %s" % ("s" if len(dbs) > 1 else "", ", ".join(db if isinstance(db, basestring) else db[0] for db in sorted(dbs)))

‎plugins/generic/custom.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ def sqlFile(self):
130130

131131
snippet = getSQLSnippet(Backend.getDbms(), filename)
132132

133-
if snippet and all(query.strip().upper().startswith("SELECT") for query in filter(None, snippet.split(';' if ';' in snippet else '\n'))):
134-
for query in filter(None, snippet.split(';' if ';' in snippet else '\n')):
133+
if snippet and all(query.strip().upper().startswith("SELECT") for query in (_ for _ in snippet.split(';' if ';' in snippet else '\n') if _)):
134+
for query in (_ for _ in snippet.split(';' if ';' in snippet else '\n') if _):
135135
query = query.strip()
136136
if query:
137137
conf.dumper.query(query, self.sqlQuery(query))

‎plugins/generic/databases.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def getDbs(self):
179179
kb.data.cachedDbs.sort()
180180

181181
if kb.data.cachedDbs:
182-
kb.data.cachedDbs = filter(None, list(set(flattenValue(kb.data.cachedDbs))))
182+
kb.data.cachedDbs = [_ for _ in set(flattenValue(kb.data.cachedDbs)) if _]
183183

184184
return kb.data.cachedDbs
185185

@@ -285,7 +285,7 @@ def getTables(self, bruteForce=None):
285285
values = inject.getValue(query, blind=False, time=False)
286286

287287
if not isNoneValue(values):
288-
values = filter(None, arrayizeValue(values))
288+
values = [_ for _ in arrayizeValue(values) if _]
289289

290290
if len(values) > 0 and not isListLike(values[0]):
291291
values = [(dbs[0], _) for _ in values]
@@ -462,7 +462,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
462462
for col in colList:
463463
colList[colList.index(col)] = safeSQLIdentificatorNaming(col)
464464

465-
colList = filter(None, colList)
465+
colList = [_ for _ in colList if _]
466466

467467
if conf.tbl:
468468
if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2, DBMS.HSQLDB, DBMS.H2):

‎plugins/generic/entries.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def dumpTable(self, foundData=None):
139139
continue
140140

141141
columns = kb.data.cachedColumns[safeSQLIdentificatorNaming(conf.db)][safeSQLIdentificatorNaming(tbl, True)]
142-
colList = sorted(filter(None, columns.keys()))
142+
colList = sorted(column for column in columns if column)
143143

144144
if conf.exclude:
145145
colList = [_ for _ in colList if _ not in conf.exclude.split(',')]
@@ -553,7 +553,7 @@ def dumpFoundColumn(self, dbs, foundCols, colConsider):
553553
continue
554554

555555
conf.tbl = table
556-
colList = filter(None, sorted(columns))
556+
colList = filter(column for column in columns if column)
557557

558558
if conf.exclude:
559559
colList = [_ for _ in colList if _ not in conf.exclude.split(',')]

‎plugins/generic/users.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def getPasswordHashes(self):
171171
else:
172172
users = []
173173

174-
users = filter(None, users)
174+
users = [_ for _ in users if _]
175175

176176
if any(isTechniqueAvailable(_) for _ in (PAYLOAD.TECHNIQUE.UNION, PAYLOAD.TECHNIQUE.ERROR, PAYLOAD.TECHNIQUE.QUERY)) or conf.direct:
177177
if Backend.isDbms(DBMS.MSSQL) and Backend.isVersionWithin(("2005", "2008")):
@@ -370,7 +370,7 @@ def getPrivileges(self, query2=False):
370370
else:
371371
users = []
372372

373-
users = filter(None, users)
373+
users = [_ for _ in users if _]
374374

375375
# Set containing the list of DBMS administrators
376376
areAdmins = set()

‎txt/checksum.md5‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fe370021c6bc99daf44b2bfc0d1effb3 lib/core/patch.py
4949
7d8a22c582ad201f65b73225e4456170 lib/core/replication.py
5050
3179d34f371e0295dd4604568fb30bcd lib/core/revision.py
5151
d6269c55789f78cf707e09a0f5b45443 lib/core/session.py
52-
ae2061c30dfddcc64719a2ed8f41bd09 lib/core/settings.py
52+
d9ee29595bb4272fda11b3079753cdd6 lib/core/settings.py
5353
4483b4a5b601d8f1c4281071dff21ecc lib/core/shell.py
5454
10fd19b0716ed261e6d04f311f6f527c lib/core/subprocessng.py
5555
9c7b5c6397fb3da33e7a4d7876d159c6 lib/core/target.py
@@ -108,7 +108,7 @@ da4bc159e6920f1f7e45c92c39941690 lib/utils/deps.py
108108
f7c64515a3e4fcfe8266ca2be77be565 lib/utils/getch.py
109109
0d497906b06eb82d14da676e9f9c98f5 lib/utils/har.py
110110
d11f7f208ccf3a7753ccc417b4b01901 lib/utils/hashdb.py
111-
8fcdcf21cf037e0673d785489eb6806f lib/utils/hash.py
111+
07412688758500c3b4e46ae7e28e9709 lib/utils/hash.py
112112
17009289bb5c0dc0cceaa483113101e1 lib/utils/htmlentities.py
113113
fb6be55d21a70765e35549af2484f762 lib/utils/__init__.py
114114
833b05c72c9fa60b0a25b0a26f8f31fb lib/utils/pivotdumptable.py
@@ -163,14 +163,14 @@ ed2bdb4eb574066521e88241a21f4bf7 plugins/dbms/informix/fingerprint.py
163163
fcbd61e7ac30eb4c8f09ffd341fa27bb plugins/dbms/informix/takeover.py
164164
fb6be55d21a70765e35549af2484f762 plugins/dbms/__init__.py
165165
ad0b369b6b81a427abede09784db91c5 plugins/dbms/maxdb/connector.py
166-
ea186b97a394b61d82ecf7ed22b0cff6 plugins/dbms/maxdb/enumeration.py
166+
c96d31697b0ea9b81a8ae19b00e220f5 plugins/dbms/maxdb/enumeration.py
167167
7886148c3d6114d43aa1d78b0512fe12 plugins/dbms/maxdb/filesystem.py
168168
691c86dc54cf3cc69b0f5a5ea5fe9a3c plugins/dbms/maxdb/fingerprint.py
169169
8ad820fdfd2454363279eda7a9a08e6e plugins/dbms/maxdb/__init__.py
170170
8fe248263926639acf41db3179db13d0 plugins/dbms/maxdb/syntax.py
171171
479ce664674859d0e61c5221f9e835fd plugins/dbms/maxdb/takeover.py
172172
6ef95017815eb5d2d0f5645a6f5c7a79 plugins/dbms/mssqlserver/connector.py
173-
69bfc53a409e79511802f668439bf4be plugins/dbms/mssqlserver/enumeration.py
173+
2f61dfdc00b780d015a8d3b8e9a23d8d plugins/dbms/mssqlserver/enumeration.py
174174
bb02bdf47c71ed93d28d20b98ea0f8c6 plugins/dbms/mssqlserver/filesystem.py
175175
bcabbf98e72bf3c6e971b56d8da60261 plugins/dbms/mssqlserver/fingerprint.py
176176
6bffd484ef47111dd8a6e46e127ab5c7 plugins/dbms/mssqlserver/__init__.py
@@ -205,16 +205,16 @@ fb018fd23dcebdb36dddd22ac92efa2c plugins/dbms/postgresql/__init__.py
205205
1ca5b1d7c64686827e80988933c397fa plugins/dbms/sqlite/syntax.py
206206
224835bf71e99bac6e50b689afac5122 plugins/dbms/sqlite/takeover.py
207207
1f726d02ce4c709c0a3d327be947c72b plugins/dbms/sybase/connector.py
208-
37a4e529dfb6bf3387c22e66cd9966f7 plugins/dbms/sybase/enumeration.py
208+
ac1cef8f0d14be9ea71e6627e25a9c60 plugins/dbms/sybase/enumeration.py
209209
9f16fb52a70e5fb01876f1bc5f5ef532 plugins/dbms/sybase/filesystem.py
210210
69c104c5a2ff3e2c88a41205bb96d812 plugins/dbms/sybase/fingerprint.py
211211
2fae8e5d100fc9fb70769e483c29e8fb plugins/dbms/sybase/__init__.py
212212
ec3f406591fc9472f5750bd40993e72e plugins/dbms/sybase/syntax.py
213213
369476221b3059106410de05766227e0 plugins/dbms/sybase/takeover.py
214214
312020bc31ffb0bc6077f62e6fff6e73 plugins/generic/connector.py
215-
1ea0b0e7aa15b7687e1b00845e33f9ab plugins/generic/custom.py
216-
f0ee05d8c97dc2ca20b39512a1cc9f99 plugins/generic/databases.py
217-
e1c9b3c9b14e71c06381dd6832119158 plugins/generic/entries.py
215+
d749b7f7b4bcf1f646290dec739f1e6d plugins/generic/custom.py
216+
791db3be35714c9a2e55a7abe9127da4 plugins/generic/databases.py
217+
8a70329d0bfc21cf89b7a46118d16d17 plugins/generic/entries.py
218218
f3624debb8ae6fbcfb5f1b7f1d0743d1 plugins/generic/enumeration.py
219219
cda119b7b0d1afeb60f912009cdb0cf5 plugins/generic/filesystem.py
220220
65e75cd3c2c7acffa6ac13b086e0f383 plugins/generic/fingerprint.py
@@ -223,7 +223,7 @@ de1928d6865547764ae9a896da4bf1d4 plugins/generic/misc.py
223223
c95bf3dec22cc638100efef99e2ccc3c plugins/generic/search.py
224224
1989f6cbed217f4222dc2dce72992d91 plugins/generic/syntax.py
225225
44c388ea08d4296e2bf2706e19cbe64a plugins/generic/takeover.py
226-
a4b9f764140e89279e3d0dace99bfa5f plugins/generic/users.py
226+
f57914512ae22521b988b5094f1a0d6f plugins/generic/users.py
227227
fb6be55d21a70765e35549af2484f762 plugins/__init__.py
228228
5dc693e22f5d020c5c568d7325bd4226 shell/backdoors/backdoor.asp_
229229
158bfa168128393dde8d6ed11fe9a1b8 shell/backdoors/backdoor.aspx_

0 commit comments

Comments
 (0)