Update for sqlmapproject#2410

Author: stamparm

lib/core/settings.py

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

lib/utils/api.py

@@ -767,7 +767,12 @@ def client(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT):
  logger.error("Program arguments are missing")
  continue
 
- argv = ["sqlmap.py"] + shlex.split(command)[1:]
+ try:
+ argv = ["sqlmap.py"] + shlex.split(command)[1:]
+ except Exception, ex:
+ logger.error("Error occurred while parsing arguments ('%s')" % ex)
+ taskid = None
+ continue
 
  try:
  cmdLineOptions = cmdLineParser(argv).__dict__
@@ -819,18 +824,19 @@ def client(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT):
  return
 
  elif command in ("help", "?"):
- msg = "help Show this help message\n"
- msg += "new ARGS Start a new scan task with provided arguments (e.g. 'new -u \"http://testphp.vulnweb.com/artists.php?artist=1\"')\n"
- msg += "use TASKID Switch current context to different task (e.g. 'use c04d8c5c7582efb4')\n"
- msg += "data Retrieve and show data for current task\n"
- msg += "log Retrieve and show log for current task\n"
- msg += "status Retrieve and show status for current task\n"
- msg += "option Retrieve and show options for current task\n"
- msg += "stop Stop current task\n"
- msg += "kill Kill current task\n"
- msg += "list Display all tasks\n"
- msg += "flush Flush tasks (delete all tasks)\n"
- msg += "exit Exit this client\n"
+ msg = "help Show this help message\n"
+ msg += "new ARGS Start a new scan task with provided arguments (e.g. 'new -u \"http://testphp.vulnweb.com/artists.php?artist=1\"')\n"
+ msg += "use TASKID Switch current context to different task (e.g. 'use c04d8c5c7582efb4')\n"
+ msg += "data Retrieve and show data for current task\n"
+ msg += "log Retrieve and show log for current task\n"
+ msg += "status Retrieve and show status for current task\n"
+ msg += "option OPTION Retrieve and show option for current task\n"
+ msg += "options Retrieve and show all options for current task\n"
+ msg += "stop Stop current task\n"
+ msg += "kill Kill current task\n"
+ msg += "list Display all tasks\n"
+ msg += "flush Flush tasks (delete all tasks)\n"
+ msg += "exit Exit this client\n"
 
  dataToStdout(msg)
 

txt/checksum.md5

@@ -45,7 +45,7 @@ a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py
 d8e9250f3775119df07e9070eddccd16 lib/core/replication.py
 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py
 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py
-d459e275f77cb0e75d025e90638c0334 lib/core/settings.py
+c3f9110aa13353de71cfdb38373cae2c lib/core/settings.py
 d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py
 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py
 afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py
@@ -99,7 +99,7 @@ d3da4c7ceaf57c4687a052d58722f6bb lib/techniques/dns/use.py
 310efc965c862cfbd7b0da5150a5ad36 lib/techniques/union/__init__.py
 4bed3ed51faad9b910899cacf56e8eac lib/techniques/union/test.py
 8cd5655c60a638caa30ca1220896aeda lib/techniques/union/use.py
-2503710e4b6316e40ddde872d5bbd04a lib/utils/api.py
+11e6e46fac5afc8a6ce5862fd910d164 lib/utils/api.py
 29e32d59fcdd63c5a13498af1f367c8c lib/utils/crawler.py
 ba12c69a90061aa14d848b8396e79191 lib/utils/deps.py
 3b9fd519164e0bf275d5fd361c3f11ff lib/utils/getch.py