Code cleanup

lib/takeover/metasploit.py

@@ -32,7 +32,6 @@ from select import select
 from subprocess import PIPE
 from subprocess import Popen as execute
 
-from lib.core.agent import agent
 from lib.core.common import dataToStdout
 from lib.core.common import getLocalIP
 from lib.core.common import getRemoteIP

lib/takeover/registry.py

@@ -26,7 +26,6 @@ import os
 
 from lib.core.common import randomStr
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
 
 class Registry:

lib/takeover/udf.py

@@ -139,7 +139,7 @@ class UDF:
         errMsg = "udfSetLocalPaths() method must be defined within the plugin"
         raise sqlmapUnsupportedFeatureException(errMsg)
 
-    def udfCreateFromSharedLib(self):
+    def udfCreateFromSharedLib(self, udf=None, inpRet=None):
         errMsg = "udfCreateFromSharedLib() method must be defined within the plugin"
         raise sqlmapUnsupportedFeatureException(errMsg)
 
@@ -182,7 +182,7 @@ class UDF:
 
         self.checkDbmsOs()
 
-        if self.isDba() == False:
+        if not self.isDba():
             warnMsg  = "the functionality requested might not work because "
             warnMsg += "the session user is not a database administrator"
             logger.warn(warnMsg)
@@ -317,7 +317,7 @@ class UDF:
             udfList = []
             msg     = "which UDF do you want to call?"
 
-            for udf, inpRet in self.udfs.items():
+            for udf in self.udfs.keys():
                 udfList.append(udf)
                 msg += "\n[%d] %s" % (len(udfList), udf)