Minor fixes to checking/re-enabling of xp_cmdshell procedure

bdamele · bdamele · commit 39decebe85d2 · 2011-02-07T12:17:19.000Z
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -251,4 +251,4 @@
 MYSQL_ERROR_TRIM_LENGTH = 100
 
 # Do not unescape the injected statement if it contains any of the following SQL words
-EXCLUDE_UNESCAPE = ("WAITFOR DELAY ", " INTO DUMPFILE ", " INTO OUTFILE ", "CREATE ", "BULK ")
+EXCLUDE_UNESCAPE = ("WAITFOR DELAY ", " INTO DUMPFILE ", " INTO OUTFILE ", "CREATE ", "BULK ", "EXEC ", "RECONFIGURE ", "DECLARE ")
diff --git a/lib/takeover/xp_cmdshell.py b/lib/takeover/xp_cmdshell.py
@@ -93,7 +93,12 @@ def __xpCmdshellCheck(self):
 
         inject.goStacked(cmd)
 
-        return wasLastRequestDelayed()
+        delayed = wasLastRequestDelayed()
+
+        if isinstance(delayed, bool):
+            return delayed
+        else:
+            return None
 
     def xpCmdshellForgeCmd(self, cmd):
         self.__randStr = randomStr(lowercase=True)
