From 193102a271b7baecda85f14b04398f08bcdc1910 Mon Sep 17 00:00:00 2001 From: Abel Coronado Date: Fri, 16 Mar 2018 17:09:50 +0100 Subject: [PATCH] B #1778: VM log doesn't escape markup characters (#1875) (cherry picked from commit d6aaf49a68864b57d96297e49597e0695c2aea35) --- .../public/app/tabs/vms-tab/panels/log.js | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/log.js b/src/sunstone/public/app/tabs/vms-tab/panels/log.js index 9ad8cd3aba..e24a0622c9 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/log.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/log.js @@ -27,10 +27,10 @@ define(function(require) { CONSTANTS */ - var TAB_ID = require('../tabId'); - var PANEL_ID = require('./log/panelId'); - var RESOURCE = "VM" - var XML_ROOT = "VM" + var TAB_ID = require("../tabId"); + var PANEL_ID = require("./log/panelId"); + var RESOURCE = "VM"; + var XML_ROOT = "VM"; /* CONSTRUCTOR @@ -80,7 +80,7 @@ define(function(require) { var log_lines = response['vm_log'].split("\n"); var colored_log = ''; for (var i = 0; i < log_lines.length; i++) { - var line = log_lines[i]; + var line = escapeHtml(log_lines[i]); if (line.match(/\[E\]/)) { line = '' + line + ''; } @@ -91,8 +91,9 @@ define(function(require) { '
' + '
' + colored_log + - '
' + - '
') + "" + + ""); + $(".vm_log_container", context).animate({scrollTop: $(".vm_log_container", context).prop("scrollHeight")}, "slow"); }, error: function(request, error_json) { @@ -109,4 +110,13 @@ define(function(require) { } }); } + + function escapeHtml(log_line) { + return log_line + .replace(/&/g, "&") + .replace(//g, ">") + .replace(/"/g, """) + .replace(/'/g, "'"); + } });