switching few readInput defaults for brute forcing when no table/column found

stamparm · stamparm · commit c7a606637f69 · 2012-04-27T12:59:22.000Z
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
@@ -840,8 +840,8 @@ def getTables(self, bruteForce=None):
 
                 return kb.data.cachedTables
 
-            message = "do you want to use common table existence check? [Y/n/q]"
-            test = readInput(message, default="Y")
+            message = "do you want to use common table existence check? %s" % ("[Y/n/q]" if Backend.getIdentifiedDbms() in (DBMS.ACCESS,) else "[y/N/q]")
+            test = readInput(message, default="Y" if "Y" in message else "N")
 
             if test[0] in ("n", "N"):
                 return
@@ -1060,8 +1060,8 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):
 
                 return kb.data.cachedColumns
 
-            message = "do you want to use common columns existence check? [Y/n/q]"
-            test = readInput(message, default="Y")
+            message = "do you want to use common column existence check? %s" % ("[Y/n/q]" if Backend.getIdentifiedDbms() in (DBMS.ACCESS,) else "[y/N/q]")
+            test = readInput(message, default="Y" if "Y" in message else "N")
 
             if test[0] in ("n", "N"):
                 return
@@ -1979,8 +1979,8 @@ def searchTable(self):
             bruteForce = True
 
         if bruteForce:
-            message = "do you want to use common table existence check? [Y/n/q]"
-            test = readInput(message, default="Y")
+            message = "do you want to use common table existence check? %s" % ("[Y/n/q]" if Backend.getIdentifiedDbms() in (DBMS.ACCESS,) else "[y/N/q]")
+            test = readInput(message, default="Y" if "Y" in message else "N")
 
             if test[0] in ("n", "N"):
                 return
@@ -2130,8 +2130,8 @@ def searchColumn(self):
             bruteForce = True
 
         if bruteForce:
-            message = "do you want to use common columns existence check? [Y/n/q]"
-            test = readInput(message, default="Y")
+            message = "do you want to use common column existence check? %s" % ("[Y/n/q]" if Backend.getIdentifiedDbms() in (DBMS.ACCESS,) else "[y/N/q]")
+            test = readInput(message, default="Y" if "Y" in message else "N")
 
             if test[0] in ("n", "N"):
                 return
