Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #43 from marsf/Bug1275065
Browse files Browse the repository at this point in the history 
Bug 1275065 - Unsafe innerHTML usage in b2gInstaller r=gerard-majax
  • Loading branch information
@lissyx
lissyx committed Jun 16, 2016
2 parents f6cf202 + 6840def commit fa85ecf
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 50 deletions.
96 changes: 50 additions & 46 deletions about.js
View file
Expand Up @@ -36,7 +36,7 @@ const kContent = "content";
const kBlobs = "blobs";
const kImages = "images";

const kAppIni = "/system/b2g/application.ini"
const kAppIni = "/system/b2g/application.ini";

let CONFIG_URL;
try {
Expand Down Expand Up @@ -88,7 +88,7 @@ function xhr(url, opts) {
**/
function getBlobs(device, root, map) {
console.debug("Pulling blobs ...");
if (!device || !device.type === "adb") {
if (!device || device.type !== "adb") {
console.error("Device", device, "is not valid");
return Promise.reject("notready");
}
Expand Down Expand Up @@ -241,10 +241,10 @@ function buildBootable(root, to) {
options.dt = deviceTree.path;
}

for (let i = 0; i < results.length; i++) {
for (var i = 0; i < results.length; i++) {
let filename = filesToRead[i];
options[filename] = results[i].trim();
};
}

console.debug("Prepared options", options);

Expand Down Expand Up @@ -755,7 +755,7 @@ function isSupportedConfig(device, supportedDevice) {
(values.indexOf(propVal) !== -1) : (values === propVal);

if (!isOk) {
console.debug("Property match failure", prop, "expected one of", values, "but got", propVal)
console.debug("Property match failure", prop, "expected one of", values, "but got", propVal);
anyPropNotGood = true;
break;
}
Expand Down Expand Up @@ -1029,7 +1029,7 @@ function deviceStep(evt) {
return readApplicationIni(adbDevice);
}).then(appIni => {
console.log("Read appIni: ", appIni);
applicationIni = appIni
applicationIni = appIni;
if (runsB2G) {
return stopB2GOrDisableLockScreen(adbDevice);
} else {
Expand Down Expand Up @@ -1120,7 +1120,7 @@ function flashStep(evt) {

console.log("Devices enumerated, MUST be fastboot", fastbootDevice);

if (!fastbootDevice.type === "fastboot") {
if (fastbootDevice.type !== "fastboot") {
console.error("We should have been into fastboot mode :(");
return Promise.reject();
}
Expand Down Expand Up @@ -1168,27 +1168,24 @@ function flashStep(evt) {
});
}

function drawBuild(build) {
return `<li><label class="build">
<input type="radio" value="${build.url}" name="build" />
<div class="description">
<h4>${build.name}</h4>
<span>${build.description}</span>
</div>
</label></li>`;
}

function drawUnsupported(build) {
return `<li><label class="build">
<div class="description">
<h4>${build.name}</h4>
<span>${build.description}</span>
</div>
</label></li>`;
}
/**
* Create the list item from HTML template.
* @param {Object} build - The build data of target device.
* @param {Boolean} isSupported - Whether device supports the build or not.
* @returns {Object} - documentFragment object.
**/
function drawBuild(build, isSupported) {
var tmpl = document.querySelector("#buildItemTemplate");
if (isSupported && build.url) {
tmpl.content.querySelector("input").value = encodeURI(build.url);
tmpl.content.querySelector("input").style.display = "inherit";
} else {
tmpl.content.querySelector("input").style.display = "none";
}
tmpl.content.querySelector("h4").textContent = build.name;
tmpl.content.querySelector("span").textContent = build.description;

function drawRow(device) {
return device.builds.map(drawBuild).join('');
return document.importNode(tmpl.content, true);
}

function percentStr(current, total) {
Expand Down Expand Up @@ -1227,7 +1224,7 @@ function downloadProgressFailure(info) {
var steps = ['downloading', 'extracting', 'fetching', 'creating', 'flashing'];
steps.forEach(function(step) {
var li = $('.' + step)[0];
let isPending = li.classList.contains('pending')
let isPending = li.classList.contains('pending');
let isInProgress = li.classList.contains('inprogress');
if (isPending || isInProgress) {
li.classList.remove('inprogress');
Expand Down Expand Up @@ -1260,7 +1257,7 @@ function getBuildUrl() {
// tmp file
// TODO: cache
function downloadBuild() {
let buildUrl = getBuildUrl()
let buildUrl = getBuildUrl();

// If the build value isnt a url, its a local file the user uploaded
// and we can skip the download
Expand Down Expand Up @@ -1398,18 +1395,17 @@ function install() {
// SELECT BUILD
function buildAdded(evt) {
var file = evt.target.files[0];
var row = drawBuild({
url: file.mozFullPath,
name: file.name,
description: ''
});
$('#devices')[0].insertAdjacentHTML('beforeend', row);
$('#devices')[0].appendChild(drawBuild({
url: file.mozFullPath,
name: file.name,
description: ''
}, true));
$('#devices li:last-child input')[0].setAttribute('checked', 'checked');
buildChecked();
}

function buildChecked(checked) {
currentStep('flash')
currentStep('flash');
}

// CONNECT DEVICE
Expand All @@ -1435,15 +1431,23 @@ function deviceConnected() {
// We dont get a human readable name from the device, pick
// it up from the configuration name
deviceName = builds[0].id;
$('#devices')[0].innerHTML = builds.map(drawRow).join('');
supportedDevice = true;
var buildItems = document.createDocumentFragment();
for (var i = 0, ilen = builds.length; i < ilen; i++) {
var devices = builds[i];
for (var j = 0, jlen = devices.builds.length; j < jlen; j++) {
buildItems.appendChild(drawBuild(devices.builds[j], supportedDevice));
}
}
$('#devices')[0].appendChild(buildItems);
} else {
$('#noDevice')[0].innerHTML = drawUnsupported(
supportedDevice = false;
$('#noDevice')[0].appendChild(drawBuild(
{
name: device.model || device.id,
description: "No build is available for this device, but you can use a local blobfree distribution if that is available."
});
supportedDevice = false;
},
supportedDevice));
}

$('#deviceId')[0].textContent = deviceName;
Expand Down Expand Up @@ -1478,7 +1482,7 @@ function deviceDisconnected() {
function done() {
$('#confirmDialog')[0].style.display = 'none';
currentStep('select');
};
}

function showOffline(isOffline) {
document.getElementById('offline').style.visibility =
Expand Down Expand Up @@ -1539,7 +1543,7 @@ function verifyGecko() {
buildID.slice(6,8), // day
buildID.slice(8,10), // hour
buildID.slice(10,12), // min
buildID.slice(12,14)) // ms
buildID.slice(12,14)); // ms

// Limiting to mozilla-central
// Bug 1059081 landed on May 19th, 2015
Expand All @@ -1551,15 +1555,15 @@ function verifyGecko() {
}

let isLinuxOk = Services.appinfo.OS === "Linux";
let isDarwinOk = Services.appinfo.OS === "Darwin"
&& Services.appinfo.XPCOMABI === "x86_64-gcc3";
let isDarwinOk = Services.appinfo.OS === "Darwin" &&
Services.appinfo.XPCOMABI === "x86_64-gcc3";
if (!isLinuxOk && !isDarwinOk) {
console.debug("Only Linux and (Darwin x86-64) are supported");
return reject(new Error("GECKO_UNSUPPORTED_OS_ARCH"));
}

let isNightly = !Services.appinfo.isReleaseBuild
&& (Services.appinfo.platformVersion.match("a") !== null);
let isNightly = !Services.appinfo.isReleaseBuild &&
(Services.appinfo.platformVersion.match("a") !== null);
if (!isNightly) {
return reject(new Error("GECKO_UNSUPPORTED_BUILD"));
}
Expand Down
9 changes: 9 additions & 0 deletions about.xhtml
View file
Expand Up @@ -31,6 +31,15 @@
<ul id="devices"></ul>
<ul id="noDevice"></ul>
<input id="userBuild" type="file" value="Upload your own build" />
<template id="buildItemTemplate">
<li><label class="build">
<input type="radio" value="" name="build" /><!-- value: build.url -->
<div class="description">
<h4></h4><!-- build.name -->
<span></span><!-- build.description -->
</div>
</label></li>
</template>
</section>

<section class="flash">
Expand Down
2 changes: 1 addition & 1 deletion test/mochitest/test_devices.html
View file
Expand Up @@ -63,7 +63,7 @@
return new Promise((resolve, reject) => {
let devices = c.getElementById("devices");
ok(devices, "has devices node");
is(devices.childNodes.length, 2, "two builds available");
is(devices.childElementCount, 2, "two builds available");

let url, name, desc;
url = devices.getElementsByTagName("input")[0].value;
Expand Down
4 changes: 2 additions & 2 deletions test/mochitest/test_devices_unkown.html
View file
Expand Up @@ -50,11 +50,11 @@

let devices = c.getElementById("devices");
ok(devices, "has devices node");
is(devices.childNodes.length, 0, "no build available");
is(devices.childElementCount, 0, "no build available");

let noDevice = c.getElementById("noDevice");
ok(noDevice, "has noDevice node");
is(noDevice.childNodes.length, 1, "one element for no device");
is(noDevice.childElementCount, 1, "one element for no device");

let unsupportedDeviceName = c.querySelector("#noDevice h4");
is(unsupportedDeviceName.textContent, fakeAdbDevice.model, "matching model for unsupported device");
Expand Down
2 changes: 1 addition & 1 deletion test/mochitest/test_select_build.html
View file
Expand Up @@ -40,7 +40,7 @@
function assert_select_build(id, nbExpected, nameExpected, descExpected) {
let devices = c.getElementById("devices");
ok(devices, "has devices node");
is(devices.childNodes.length, nbExpected, "two builds available");
is(devices.childElementCount, nbExpected, "two builds available");

let e = devices.getElementsByTagName("input")[id];
ok(e, "has build id", id);
Expand Down

0 comments on commit fa85ecf

Please sign in to comment.