Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-07 11:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 829679 - Package installation without // on the manifest URL causes webapps.json corruption r=ferjm a=tef+

Browse Source
This commit is contained in:
Fabrice Desré 2013-01-14 11:41:24 -08:00
parent 54f692f186
commit 15102081e5
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dom/apps/src/Webapps.js
View File

@ -72,14 +72,28 @@ WebappsRegistry.prototype = {
return uri.prePath;
},
_validateScheme: function(aURL) {
let scheme = Services.io.newURI(aURL, null, null).scheme;
if (scheme != "http" && scheme != "https") {
_validateURL: function(aURL) {
let uri;
let res;
try {
uri = Services.io.newURI(aURL, null, null);
if (uri.schemeIs("http") || uri.schemeIs("https")) {
res = uri.spec;
}
} catch(e) {
throw new Components.Exception(
"INVALID_URL_SCHEME: '" + scheme + "'; must be 'http' or 'https'",
"INVALID_URL: '" + aURL, Cr.NS_ERROR_FAILURE
);
}
// The scheme is incorrect, throw an exception.
if (!res) {
throw new Components.Exception(
"INVALID_URL_SCHEME: '" + uri.scheme + "'; must be 'http' or 'https'",
Cr.NS_ERROR_FAILURE
);
}
return uri.spec;
},
// Checks that we run as a foreground page, and fire an error on the
@ -105,14 +119,14 @@ WebappsRegistry.prototype = {
// mozIDOMApplicationRegistry implementation
install: function(aURL, aParams) {
let uri = this._validateURL(aURL);
let request = this.createRequest();
if (!this._ensureForeground(request)) {
return request;
}
this._validateScheme(aURL);
let installURL = this._window.location.href;
let requestID = this.getRequestId(request);
let receipts = (aParams && aParams.receipts &&
@ -126,8 +140,8 @@ WebappsRegistry.prototype = {
cpmm.sendAsyncMessage("Webapps:Install",
{ app: {
installOrigin: this._getOrigin(installURL),
origin: this._getOrigin(aURL),
manifestURL: aURL,
origin: this._getOrigin(uri),
manifestURL: uri,
receipts: receipts,
categories: categories
},
@ -184,14 +198,14 @@ WebappsRegistry.prototype = {
// mozIDOMApplicationRegistry2 implementation
installPackage: function(aURL, aParams) {
let uri = this._validateURL(aURL);
let request = this.createRequest();
if (!this._ensureForeground(request)) {
return request;
}
this._validateScheme(aURL);
let installURL = this._window.location.href;
let requestID = this.getRequestId(request);
let receipts = (aParams && aParams.receipts &&
@ -205,8 +219,8 @@ WebappsRegistry.prototype = {
cpmm.sendAsyncMessage("Webapps:InstallPackage",
{ app: {
installOrigin: this._getOrigin(installURL),
origin: this._getOrigin(aURL),
manifestURL: aURL,
origin: this._getOrigin(uri),
manifestURL: uri,
receipts: receipts,
categories: categories
},