This commit is contained in:
Miroslav Stampar 2017-12-04 15:40:59 +01:00
parent 370884d07a
commit 06ca058300
3 changed files with 25 additions and 24 deletions

View File

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

View File

@ -140,27 +140,28 @@ def main():
init() init()
# Postponed imports (faster start) if not conf.updateAll:
if conf.profile: # Postponed imports (faster start)
from lib.core.profiling import profile if conf.profile:
profile() from lib.core.profiling import profile
elif conf.smokeTest: profile()
from lib.core.testing import smokeTest elif conf.smokeTest:
smokeTest() from lib.core.testing import smokeTest
elif conf.liveTest: smokeTest()
from lib.core.testing import liveTest elif conf.liveTest:
liveTest() from lib.core.testing import liveTest
else: liveTest()
from lib.controller.controller import start else:
try: from lib.controller.controller import start
start() try:
except thread.error as ex: start()
if "can't start new thread" in getSafeExString(ex): except thread.error as ex:
errMsg = "unable to start new threads. Please check OS (u)limits" if "can't start new thread" in getSafeExString(ex):
logger.critical(errMsg) errMsg = "unable to start new threads. Please check OS (u)limits"
raise SystemExit logger.critical(errMsg)
else: raise SystemExit
raise else:
raise
except SqlmapUserQuitException: except SqlmapUserQuitException:
errMsg = "user quit" errMsg = "user quit"

View File

@ -46,7 +46,7 @@ f872699e948d0692ce11b54781da814c lib/core/log.py
760d9df2a27ded29109b390ab202e72d lib/core/replication.py 760d9df2a27ded29109b390ab202e72d lib/core/replication.py
a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py
02d4762140a72fd44668d3dab5eabda9 lib/core/session.py 02d4762140a72fd44668d3dab5eabda9 lib/core/session.py
d69c0df794980411124dc8220b625d40 lib/core/settings.py f3cab97ab7305ad7ea0347825c4f09b2 lib/core/settings.py
35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py
a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py
d93501771b41315f9fb949305b6ed257 lib/core/target.py d93501771b41315f9fb949305b6ed257 lib/core/target.py
@ -224,7 +224,7 @@ c3cc8b7727161e64ab59f312c33b541a shell/stagers/stager.aspx_
1f7f125f30e0e800beb21e2ebbab18e1 shell/stagers/stager.jsp_ 1f7f125f30e0e800beb21e2ebbab18e1 shell/stagers/stager.jsp_
01e3505e796edf19aad6a996101c81c9 shell/stagers/stager.php_ 01e3505e796edf19aad6a996101c81c9 shell/stagers/stager.php_
c737efc0afe782c5dcfec9d27e827515 sqlmapapi.py c737efc0afe782c5dcfec9d27e827515 sqlmapapi.py
5055a9d152e379fd7d55cbbf06025834 sqlmap.py 2e96b06a471933baee72b803dfdceff6 sqlmap.py
ba9bb7b0fbfbd408c24bc99b3c8f0fd9 tamper/apostrophemask.py ba9bb7b0fbfbd408c24bc99b3c8f0fd9 tamper/apostrophemask.py
aa046ea026a3c72b714e726a2e775cd4 tamper/apostrophenullencode.py aa046ea026a3c72b714e726a2e775cd4 tamper/apostrophenullencode.py
0418d808878bf7cac4a28350116e64d0 tamper/appendnullbyte.py 0418d808878bf7cac4a28350116e64d0 tamper/appendnullbyte.py