sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-06-25 23:43:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

now also readInput() uses colouring

Browse Source
This commit is contained in:
Bernardo Damele 2012-07-11 17:53:32 +01:00
parent 02ec25b4b8
commit 53ccd09ca4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/core/common.py
View File

@ -700,7 +700,7 @@ def setCurrentMessage(message):
if logMsg: if logMsg:
kb.currentMessage = logMsg.group(0) kb.currentMessage = logMsg.group(0)
def setColour(message): def setColour(message, bold=False):
if not hasattr(kb, "currentMessage"): if not hasattr(kb, "currentMessage"):
return message return message
@ -717,12 +717,9 @@ def setColour(message):
"TRAFFIC IN": "grey" "TRAFFIC IN": "grey"
} }
if kb.currentMessage: return colored(message, color_map[kb.currentMessage] if kb.currentMessage else None, on_color='on_red' if kb.currentMessage == "CRITICAL" else None, attrs=['bold'] if (kb.currentMessage == "CRITICAL" or bold) else None)
return colored(message, color_map[kb.currentMessage], on_color='on_red' if kb.currentMessage == "CRITICAL" else None, attrs=['bold'] if kb.currentMessage == "CRITICAL" else None)
else:
return message
def dataToStdout(data, forceOutput=False): def dataToStdout(data, forceOutput=False, bold=False):
""" """
Writes text to the stdout (console) stream Writes text to the stdout (console) stream
""" """
@ -754,7 +751,7 @@ def dataToStdout(data, forceOutput=False):
except: except:
message = data.encode(UNICODE_ENCODING) message = data.encode(UNICODE_ENCODING)
sys.stdout.write(setColour(message)) sys.stdout.write(setColour(message, bold))
sys.stdout.flush() sys.stdout.flush()
if kb.get("multiThreadMode"): if kb.get("multiThreadMode"):
@ -796,6 +793,8 @@ def readInput(message, default=None, checkBatch=True):
Reads input from terminal Reads input from terminal
""" """
kb.currentMessage = None
if "\n" in message: if "\n" in message:
message += "%s> " % ("\n" if message.count("\n") > 1 else "") message += "%s> " % ("\n" if message.count("\n") > 1 else "")
elif message[-1] == ']': elif message[-1] == ']':
@ -818,7 +817,7 @@ def readInput(message, default=None, checkBatch=True):
data = default data = default
else: else:
logging._acquireLock() logging._acquireLock()
dataToStdout("\r%s" % message, True) dataToStdout("\r%s" % message, forceOutput=True, bold=True)
data = raw_input() or default data = raw_input() or default
#data = raw_input(message.encode(sys.stdout.encoding or UNICODE_ENCODING)) #data = raw_input(message.encode(sys.stdout.encoding or UNICODE_ENCODING))
logging._releaseLock() logging._releaseLock()