changes regarding Feature #160

lib/controller/action.py

@@ -24,6 +24,7 @@ Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 from lib.controller.handler import setHandler
 from lib.core.common import getHtmlErrorFp
+from lib.core.common import dataToStdout
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.exception import sqlmapUnsupportedDBMSException
@@ -64,7 +65,7 @@ def action():
 
         raise sqlmapUnsupportedDBMSException, errMsg
 
-    print "%s\n" % conf.dbmsHandler.getFingerprint()
+    dataToStdout("%s\n" % conf.dbmsHandler.getFingerprint())
 
     # Techniques options
     if conf.stackedTest:

lib/controller/controller.py

@@ -42,8 +42,6 @@ from lib.core.exception import sqlmapNotVulnerableException
 from lib.core.session import setInjection
 from lib.core.target import initTargetEnv
 from lib.core.target import setupTargetEnv
-from lib.core.testing import smokeTest
-from lib.core.testing import liveTest
 from lib.utils.parenthesis import checkForParenthesis
 
 def __selectInjection(injData):
@@ -99,16 +97,6 @@ def start():
     if conf.optimize:
         conf.useCommonPrediction = conf.useNullConnection = conf.keepAlive = True
 
-
-    if conf.smokeTest:
-        smokeTest()
-
-    if conf.liveTest:
-        liveTest()
-
-    if conf.smokeTest or conf.liveTest:
-        return
-
     if conf.direct:
         initTargetEnv()
         setupTargetEnv()
@@ -173,7 +161,7 @@ def start():
             if conf.useNullConnection:
                 checkNullConnection()
 
-            if not conf.dropSetCookie:
+            if not conf.dropSetCookie and conf.cj:
                 for _, cookie in enumerate(conf.cj):
                     cookie = getUnicode(cookie)
                     index  = cookie.index(" for ")