2 Commits

Author SHA1 Message Date
Solly Ross
e8986fa069 Release v0.6.2
Fixes a XSS vulnerability in the noVNC status display which could allow
remote VNC servers to inject arbitrary HTML into the noVNC display page.
2017-01-12 14:36:42 -05:00
Solly Ross
15ce2f71eb Use textContent instead of innerHTML
Previously, setting `innerHTML` was used to display the statuses.  These
could include content communicated from the remote VNC server, allowing
the remove VNC server to inject HTML into the noVNC page.

This commit switches all uses of `innerHTML` to use `textContent`, which
is not vulnerable to the HTML injection.
2017-01-12 11:58:22 -05:00
12 changed files with 16 additions and 16 deletions

View File

@@ -1 +1 @@
0.6.1
0.6.2

View File

@@ -285,7 +285,7 @@ var UI;
if (typeof(msg) !== 'undefined') {
$D('noVNC_control_bar').setAttribute("class", klass);
$D('noVNC_status').innerHTML = msg;
$D('noVNC_status').textContent = msg;
}
UI.updateVisualState();
@@ -360,9 +360,9 @@ var UI;
clearTimeout(UI.popupStatusTimeout);
if (typeof text === 'string') {
psp.innerHTML = text;
psp.textContent = text;
} else {
psp.innerHTML = $D('noVNC_status').innerHTML;
psp.textContent = $D('noVNC_status').textContent;
}
psp.style.display = "block";
psp.style.left = window.innerWidth/2 -

View File

@@ -1,6 +1,6 @@
{
"name": "noVNC",
"version": "0.6.1",
"version": "0.6.2",
"description": "An HTML5 VNC client",
"main": "karma.conf.js",
"directories": {

View File

@@ -36,7 +36,7 @@ if (Util.Engine.trident) {
function message(str) {
//console.log(str);
cell = $D('messages');
cell.innerHTML += str + newline;
cell.textContent += str + newline;
cell.scrollTop = cell.scrollHeight;
}

View File

@@ -20,7 +20,7 @@
function debug(str) {
console.log(str);
cell = $D('debug');
cell.innerHTML += str + "\n";
cell.textContent += str + "\n";
cell.scrollTop = cell.scrollHeight;
}

View File

@@ -42,7 +42,7 @@
function message(str) {
console.log(str);
cell = $D('messages');
cell.innerHTML += msg_cnt + ": " + str + "\n";
cell.textContent += msg_cnt + ": " + str + "\n";
cell.scrollTop = cell.scrollHeight;
msg_cnt += 1;
}

View File

@@ -35,7 +35,7 @@
function debug(str) {
console.log(str);
cell = $D('debug');
cell.innerHTML += str + "\n";
cell.textContent += str + "\n";
cell.scrollTop = cell.scrollHeight;
}

View File

@@ -44,7 +44,7 @@
function message(str) {
console.log(str);
cell = $D('messages');
cell.innerHTML += msg_cnt + ": " + str + newline;
cell.textContent += msg_cnt + ": " + str + newline;
cell.scrollTop = cell.scrollHeight;
msg_cnt++;
}

View File

@@ -56,7 +56,7 @@
function message(str) {
console.log(str);
cell = $D('messages');
cell.innerHTML += msg_cnt + ": " + str + newline;
cell.textContent += msg_cnt + ": " + str + newline;
cell.scrollTop = cell.scrollHeight;
msg_cnt++;
}

View File

@@ -64,7 +64,7 @@
function msg(str) {
console.log(str);
var cell = $D('messages');
cell.innerHTML += str + "\n";
cell.textContent += str + "\n";
cell.scrollTop = cell.scrollHeight;
}
function dbgmsg(str) {
@@ -88,7 +88,7 @@
break;
}
if (typeof mesg !== 'undefined') {
$D('VNC_status').innerHTML = mesg;
$D('VNC_status').textContent = mesg;
}
}

View File

@@ -51,7 +51,7 @@
function message(str) {
console.log(str);
var cell = $D('messages');
cell.innerHTML += str + "\n";
cell.textContent += str + "\n";
cell.scrollTop = cell.scrollHeight;
}
@@ -78,7 +78,7 @@
break;
}
if (typeof msg !== 'undefined') {
$D('VNC_status').innerHTML = msg;
$D('VNC_status').textContent = msg;
}
}

View File

@@ -152,7 +152,7 @@
if (typeof(msg) !== 'undefined') {
sb.setAttribute("class", "noVNC_status_" + level);
s.innerHTML = msg;
s.textContent = msg;
}
}