sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some more refactoring

Browse Source
This commit is contained in:
Miroslav Stampar 2012-07-11 20:13:23 +02:00
parent d7926b8aac
commit c6464b44be
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/core/common.py
View File

@ -78,8 +78,10 @@ from lib.core.exception import sqlmapMissingDependence
from lib.core.exception import sqlmapSilentQuitException from lib.core.exception import sqlmapSilentQuitException
from lib.core.exception import sqlmapSyntaxException from lib.core.exception import sqlmapSyntaxException
from lib.core.log import FORMATTER from lib.core.log import FORMATTER
from lib.core.log import LEVEL_ATTRS
from lib.core.log import LEVEL_COLORS
from lib.core.log import LEVEL_ON_COLORS
from lib.core.optiondict import optDict from lib.core.optiondict import optDict
from lib.core.settings import COLOR_MAP
from lib.core.settings import CUSTOM_INJECTION_MARK_CHAR from lib.core.settings import CUSTOM_INJECTION_MARK_CHAR
from lib.core.settings import DEFAULT_COOKIE_DELIMITER from lib.core.settings import DEFAULT_COOKIE_DELIMITER
from lib.core.settings import DEFAULT_GET_POST_DELIMITER from lib.core.settings import DEFAULT_GET_POST_DELIMITER
@ -696,14 +698,12 @@ def singleTimeLogMessage(message, level=logging.INFO, flag=None):
logger.log(level, message) logger.log(level, message)
def setColor(message, bold=False): def setColor(message, bold=False):
retVal = message
level = extractRegexResult(r"\A\s*\[(?P<result>[A-Z ]+)\]", message) level = extractRegexResult(r"\A\s*\[(?P<result>[A-Z ]+)\]", message)
if level: if level:
attrs = ('bold',) if (level == "CRITICAL" or bold) else None retVal = colored(message, color=LEVEL_COLORS.get(level), on_color=LEVEL_ON_COLORS.get(level), attrs=LEVEL_ATTRS.get(level))
on_color = 'on_red' if level == "CRITICAL" else None else:
color = COLOR_MAP.get(level) retVal = message
retVal = colored(message, color=color, on_color=on_color, attrs=attrs)
return retVal return retVal

20
lib/core/log.py
View File

@ -18,6 +18,26 @@ logging.addLevelName(CUSTOM_LOGGING.TRAFFIC_IN, "TRAFFIC IN")
LOGGER = logging.getLogger("sqlmapLog") LOGGER = logging.getLogger("sqlmapLog")
LEVEL_COLORS = {
"CRITICAL": "white",
"ERROR": "red",
"WARNING": "yellow",
"INFO": "green",
"DEBUG": "blue",
"PAYLOAD": "magenta",
"TRAFFIC OUT": "cyan",
"TRAFFIC IN": "grey"
}
LEVEL_ON_COLORS = {
"CRITICAL": "on_red",
}
LEVEL_ATTRS = {
"CRITICAL": ('bold',),
}
try: try:
import ctypes import ctypes
LOGGER_HANDLER = ColorizingStreamHandler(sys.stdout) LOGGER_HANDLER = ColorizingStreamHandler(sys.stdout)

11
lib/core/settings.py
View File

@ -268,17 +268,6 @@ BASIC_HELP_ITEMS = (
"wizard" "wizard"
) )
COLOR_MAP = {
"CRITICAL": "white",
"ERROR": "red",
"WARNING": "yellow",
"INFO": "green",
"DEBUG": "blue",
"PAYLOAD": "magenta",
"TRAFFIC OUT": "cyan",
"TRAFFIC IN": "grey"
}
# string representation for NULL value # string representation for NULL value
NULL = "NULL" NULL = "NULL"