summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-05 11:02:56 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-05 11:02:56 -0300
commitf57c6788c306db597802ea6d3232116b8984f62f (patch)
tree6bd2bb67b7435e25c4e3375e98587532fdf3917f
parent7553122cbe514db292ae57aa57a69c2c11036244 (diff)
parent4e5731c58becec8043cb2de5c3b9214f1f8cc849 (diff)
Merge remote-tracking branch 'ivan/feature/4146_support-html-in-logger-window' into develop
-rw-r--r--changes/bug-4146_logger-window-html-support2
-rw-r--r--src/leap/bitmask/gui/loggerwindow.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug-4146_logger-window-html-support b/changes/bug-4146_logger-window-html-support
new file mode 100644
index 00000000..27615d86
--- /dev/null
+++ b/changes/bug-4146_logger-window-html-support
@@ -0,0 +1,2 @@
+- Escape logs with html contents so they get displayed in plaintext
+ on the log viewer. Closes #4146.
diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py
index ad2ceded..6ef58558 100644
--- a/src/leap/bitmask/gui/loggerwindow.py
+++ b/src/leap/bitmask/gui/loggerwindow.py
@@ -19,6 +19,7 @@
History log window
"""
import logging
+import cgi
from PySide import QtGui
@@ -90,7 +91,7 @@ class LoggerWindow(QtGui.QDialog):
logging.CRITICAL: "background: red; color: white; font: bold;"
}
level = log[LeapLogHandler.RECORD_KEY].levelno
- message = log[LeapLogHandler.MESSAGE_KEY]
+ message = cgi.escape(log[LeapLogHandler.MESSAGE_KEY])
if self._logs_to_display[level]:
open_tag = "<tr style='" + html_style[level] + "'>"