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

Skip to content

Commit fd89fdf

Browse files
stamparmstamparm
committed
Minor cleaning up
1 parent 2e53096 commit fd89fdf

8 files changed

Lines changed: 13 additions & 17 deletions

File tree

‎lib/core/common.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@
165165
from lib.core.settings import URLENCODE_CHAR_LIMIT
166166
from lib.core.settings import URLENCODE_FAILSAFE_CHARS
167167
from lib.core.settings import USER_AGENT_ALIASES
168-
from lib.core.settings import VERSION
169168
from lib.core.settings import VERSION_STRING
170169
from lib.core.settings import WEBSCARAB_SPLITTER
171170
from lib.core.threads import getCurrentThreadData
@@ -3371,7 +3370,7 @@ def getLatestRevision():
33713370
"""
33723371
Retrieves latest revision from the offical repository
33733372
3374-
>>> getLatestRevision() == VERSION
3373+
>>> from lib.core.settings import VERSION; getLatestRevision() == VERSION
33753374
True
33763375
"""
33773376

‎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.2.10.6"
22+
VERSION = "1.2.10.7"
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)

‎plugins/dbms/maxdb/enumeration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
See the file 'LICENSE' for copying permission
66
"""
77

8-
from lib.core.common import randomStr
98
from lib.core.common import readInput
109
from lib.core.common import safeSQLIdentificatorNaming
1110
from lib.core.common import unsafeSQLIdentificatorNaming

‎plugins/dbms/mysql/filesystem.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def linesTerminatedWriteFile(self, wFile, dFile, fileType, forceCheck=False):
136136
query = getSQLSnippet(DBMS.MYSQL, "write_file_limit", OUTFILE=dFile, HEXSTRING=fcEncodedStr)
137137
query = agent.prefixQuery(query) # Note: No need for suffix as 'write_file_limit' already ends with comment (required)
138138
payload = agent.payload(newValue=query)
139-
page = Request.queryPage(payload)
139+
Request.queryPage(payload, content=False, raise404=False, silent=True, noteResponseTime=False)
140140

141141
warnMsg = "expect junk characters inside the "
142142
warnMsg += "file as a leftover from original query"

‎plugins/dbms/sybase/enumeration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from lib.core.common import filterPairValues
99
from lib.core.common import isTechniqueAvailable
10-
from lib.core.common import randomStr
1110
from lib.core.common import readInput
1211
from lib.core.common import safeSQLIdentificatorNaming
1312
from lib.core.common import unArrayizeValue

‎plugins/generic/users.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from lib.core.common import isNumPosStrValue
2020
from lib.core.common import isTechniqueAvailable
2121
from lib.core.common import parsePasswordHash
22-
from lib.core.common import randomStr
2322
from lib.core.common import readInput
2423
from lib.core.common import unArrayizeValue
2524
from lib.core.convert import hexencode

‎sqlmap.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@
6969
errMsg = "user aborted"
7070

7171
if "logger" in globals():
72-
logger.error(errMsg)
72+
logger.critical(errMsg)
7373
raise SystemExit
7474
else:
7575
import time
76-
exit("\r[%s] [ERROR] %s" % (time.strftime("%X"), errMsg))
76+
exit("\r[%s] [CRITICAL] %s" % (time.strftime("%X"), errMsg))
7777

7878
def modulePath():
7979
"""
@@ -196,7 +196,7 @@ def main():
196196

197197
errMsg = "user aborted"
198198
try:
199-
logger.error(errMsg)
199+
logger.critical(errMsg)
200200
except KeyboardInterrupt:
201201
pass
202202

‎txt/checksum.md5‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ c7443613a0a2505b1faec931cee2a6ef lib/controller/handler.py
2929
1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py
3030
8eb0a5dbd79bd58fedac4c0cc344246b lib/core/agent.py
3131
c347f085bd561adfa26d3a9512e5f3b9 lib/core/bigarray.py
32-
cbf9428039f52d8ee80fcf79b6583b7c lib/core/common.py
32+
2f47247892e5d558bbbe97c6cec7121f lib/core/common.py
3333
0d082da16c388b3445e656e0760fb582 lib/core/convert.py
3434
9f87391b6a3395f7f50830b391264f27 lib/core/data.py
3535
72016ea5c994a711a262fd64572a0fcd lib/core/datatype.py
@@ -49,7 +49,7 @@ c8c386d644d57c659d74542f5f57f632 lib/core/patch.py
4949
0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py
5050
a7db43859b61569b601b97f187dd31c5 lib/core/revision.py
5151
fcb74fcc9577523524659ec49e2e964b lib/core/session.py
52-
5192b4916a979e3fb249b72e3a89b3a6 lib/core/settings.py
52+
16e697be36101880289e6095a0978a4b lib/core/settings.py
5353
dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py
5454
a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py
5555
62bc180e3e828949ffb342a8f756c183 lib/core/target.py
@@ -156,7 +156,7 @@ aa77fec4fe6b2d7ca4a91aebd9ff4e21 plugins/dbms/informix/syntax.py
156156
25f0fb28e9defcab48a2e946fbb7550a plugins/dbms/informix/takeover.py
157157
1e5532ede194ac9c083891c2f02bca93 plugins/dbms/__init__.py
158158
6917f9b045f6188b89e816dea9b46a3f plugins/dbms/maxdb/connector.py
159-
53d1bf931baa6b76198ece861e2318a3 plugins/dbms/maxdb/enumeration.py
159+
1f3f9d4c7ec62452ed2465cd9cf50aa1 plugins/dbms/maxdb/enumeration.py
160160
ffd26f64142226d0b1ed1d70f7f294c0 plugins/dbms/maxdb/filesystem.py
161161
9f9f1c4c4c3150545c4b61d1cffc76a8 plugins/dbms/maxdb/fingerprint.py
162162
4321d7018f5121343460ebfd83bb69be plugins/dbms/maxdb/__init__.py
@@ -171,7 +171,7 @@ f25c50a95e5390ecd32be5a011637349 plugins/dbms/mssqlserver/__init__.py
171171
3c0845fa526e1bb7bbe636fcfcbcc4a6 plugins/dbms/mssqlserver/takeover.py
172172
11a5724fdc0b0c0eb2626d952cda216a plugins/dbms/mysql/connector.py
173173
445164daf59b890aeacc968af58fcb53 plugins/dbms/mysql/enumeration.py
174-
34216d44fe66ffc8c5b4a0714839cf9f plugins/dbms/mysql/filesystem.py
174+
edec54520556a5eb66900fca697940ff plugins/dbms/mysql/filesystem.py
175175
1c0175476b833a1b788550726be67c99 plugins/dbms/mysql/fingerprint.py
176176
30065993f8300994e4658634121609e9 plugins/dbms/mysql/__init__.py
177177
0e2adbee217f5b94dcc124d24b8dde99 plugins/dbms/mysql/syntax.py
@@ -198,7 +198,7 @@ f639120d42b33b6ca67930bddbf2ac1f plugins/dbms/sqlite/__init__.py
198198
964e59d2eba619b068b0a15cea28efe0 plugins/dbms/sqlite/syntax.py
199199
3364b2938d7040c507cd622c323557dc plugins/dbms/sqlite/takeover.py
200200
9e64e67291a4c369bad8b8cf2cfa722a plugins/dbms/sybase/connector.py
201-
b856f677371a59d4a01b72bacac88032 plugins/dbms/sybase/enumeration.py
201+
4fe9ee0dfa50e9c46e6512128471cbee plugins/dbms/sybase/enumeration.py
202202
74de450dd6d6d006aa9c7eed56e6b09a plugins/dbms/sybase/filesystem.py
203203
0329ab09187614bea02398def59695ec plugins/dbms/sybase/fingerprint.py
204204
a3db8618eed5bb2807b6f77605cba9cc plugins/dbms/sybase/__init__.py
@@ -216,7 +216,7 @@ f7874230e5661910d5fd21544c7d1022 plugins/generic/misc.py
216216
b1d2a7f3170f9b69e71335aa47f9b08b plugins/generic/search.py
217217
a70cc0ada4b0cc9e7df23cb6d48a4a0c plugins/generic/syntax.py
218218
a37c21cc3fa5c0c220d33d450bf503ed plugins/generic/takeover.py
219-
4db140069923afbae38fd93e37c00248 plugins/generic/users.py
219+
e762c77ff79e4c138145501f6fbb10cb plugins/generic/users.py
220220
1e5532ede194ac9c083891c2f02bca93 plugins/__init__.py
221221
5dc693e22f5d020c5c568d7325bd4226 shell/backdoors/backdoor.asp_
222222
158bfa168128393dde8d6ed11fe9a1b8 shell/backdoors/backdoor.aspx_
@@ -227,7 +227,7 @@ ec2ba8c757ac96425dcd2b97970edd3a shell/stagers/stager.asp_
227227
0c48ddb1feb7e38a951ef05a0d48e032 shell/stagers/stager.jsp_
228228
2f9e459a4cf6a58680978cdce5ff7971 shell/stagers/stager.php_
229229
cd90da0474d7b1a67d7b40d208493375 sqlmapapi.py
230-
5f30815ebe320e46e5898dc819e629a7 sqlmap.py
230+
c66cb57ef2d927d5e22a84413121b9ef sqlmap.py
231231
523dab9e1093eb59264c6beb366b255a tamper/0x2char.py
232232
3a1697585ae4e7bf315e9dda97d6f321 tamper/apostrophemask.py
233233
d7a119a74be9b385ee3884fb5e6af041 tamper/apostrophenullencode.py

0 commit comments

Comments
 (0)