Minor patches related to the sqlmapproject#1206

stamparm · stamparm · commit e8f87bfa4113 · 2015-05-11T11:01:21.000+02:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -2181,13 +2181,15 @@ def _setTorSocksProxySettings():
     socks.wrapmodule(urllib2)
 
 def _checkWebSocket():
-    infoMsg = "checking URL is WebSocket or not"
+    infoMsg = "checking for WebSocket"
     logger.debug(infoMsg)
+
     if conf.url and (conf.url.startswith("ws:/") or conf.url.startswith("wss:/")):
         try:
             from websocket import ABNF
         except ImportError:
-            errMsg = "it seems that python 'websocket-client' third-party library not be installed. "
+            errMsg = "sqlmap requires third-party module 'websocket-client' "
+            errMsg += "in order to use WebSocket funcionality"
             raise SqlmapMissingDependence(errMsg)
 
 def _checkTor():
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -599,7 +599,7 @@ class _(dict):
                 warnMsg += "from the target URL"
             elif "Handshake status" in tbMsg:
                 status = re.search("Handshake status ([\d]{3})", tbMsg)
-                errMsg = "websocket handshake status %s" % status.group(1) if status else 'unknown'
+                errMsg = "websocket handshake status %s" % status.group(1) if status else "unknown"
                 raise SqlmapConnectionException(errMsg)
             else:
                 warnMsg = "unable to connect to the target URL"
diff --git a/lib/utils/deps.py b/lib/utils/deps.py
@@ -72,7 +72,7 @@ def checkDependencies():
         debugMsg = "'python-ntlm' third-party library is found"
         logger.debug(debugMsg)
     except ImportError:
-        warnMsg = "sqlmap requires 'python-ntlm' third-party library for "
+        warnMsg = "sqlmap requires 'python-ntlm' third-party library "
         warnMsg += "if you plan to attack a web application behind NTLM "
         warnMsg += "authentication. Download from http://code.google.com/p/python-ntlm/"
         logger.warn(warnMsg)
@@ -83,8 +83,8 @@ def checkDependencies():
         debugMsg = "'python websocket-client' library is found"
         logger.debug(debugMsg)
     except ImportError:
-        warnMsg = "sqlmap requires 'python websocket-client' third-party library for "
-        warnMsg += "if you plan to attack a web application behind websocket. "
+        warnMsg = "sqlmap requires 'websocket-client' third-party library "
+        warnMsg += "if you plan to attack a web application using WebSocket. "
         warnMsg += "Download from https://pypi.python.org/pypi/websocket-client/"
         logger.warn(warnMsg)
         missing_libraries.add('websocket-client')
