Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-10-22 02:25:05 +00:00
Code Issues Projects Releases Wiki Activity

#491: M1449548 (adapted for 45)

Browse Source
This commit is contained in:
Cameron Kaiser 2018-05-02 22:41:38 -07:00
parent 61b49f3ff2
commit 9923420504
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
browser/base/content/browser-addons.js
View File

@ -459,15 +459,15 @@ var LightWeightThemeWebInstaller = {
switch (message.name) { switch (message.name) {
case "LightWeightThemeWebInstaller:Install": { case "LightWeightThemeWebInstaller:Install": {
this._installRequest(data.themeData, data.baseURI); this._installRequest(data.themeData, data.principal, data.baseURI);
break; break;
} }
case "LightWeightThemeWebInstaller:Preview": { case "LightWeightThemeWebInstaller:Preview": {
this._preview(data.themeData, data.baseURI); this._preview(data.themeData, data.principal, data.baseURI);
break; break;
} }
case "LightWeightThemeWebInstaller:ResetPreview": { case "LightWeightThemeWebInstaller:ResetPreview": {
this._resetPreview(data && data.baseURI); this._resetPreview(data && data.principal);
break; break;
} }
} }
@ -489,14 +489,19 @@ var LightWeightThemeWebInstaller = {
return this._manager = temp.LightweightThemeManager; return this._manager = temp.LightweightThemeManager;
}, },
_installRequest: function (dataString, baseURI) { _installRequest: function (dataString, principal, baseURI) {
// Don't allow installing off null principals.
if (!principal.URI) {
return;
}
let data = this._manager.parseTheme(dataString, baseURI); let data = this._manager.parseTheme(dataString, baseURI);
if (!data) { if (!data) {
return; return;
} }
if (this._isAllowed(baseURI)) { if (this._isAllowed(principal)) {
this._install(data); this._install(data);
return; return;
} }
@ -507,7 +512,7 @@ var LightWeightThemeWebInstaller = {
gNavigatorBundle.getString("lwthemeInstallRequest.allowButton.accesskey"); gNavigatorBundle.getString("lwthemeInstallRequest.allowButton.accesskey");
let message = let message =
gNavigatorBundle.getFormattedString("lwthemeInstallRequest.message", gNavigatorBundle.getFormattedString("lwthemeInstallRequest.message",
[makeURI(baseURI).host]); [makeURI(principal.URI).host]);
let buttons = [{ let buttons = [{
label: allowButtonText, label: allowButtonText,
accessKey: allowButtonAccesskey, accessKey: allowButtonAccesskey,
@ -608,8 +613,8 @@ var LightWeightThemeWebInstaller = {
}); });
}, },
_preview: function (dataString, baseURI) { _preview: function (dataString, principal, baseURI) {
if (!this._isAllowed(baseURI)) if (!this._isAllowed(principal))
return; return;
let data = this._manager.parseTheme(dataString, baseURI); let data = this._manager.parseTheme(dataString, baseURI);
@ -621,29 +626,20 @@ var LightWeightThemeWebInstaller = {
this._manager.previewTheme(data); this._manager.previewTheme(data);
}, },
_resetPreview: function (baseURI) { _resetPreview: function (principal) {
if (baseURI && !this._isAllowed(baseURI)) if (!this._isAllowed(principal))
return; return;
gBrowser.tabContainer.removeEventListener("TabSelect", this, false); gBrowser.tabContainer.removeEventListener("TabSelect", this, false);
this._manager.resetPreview(); this._manager.resetPreview();
}, },
_isAllowed: function (srcURIString) { _isAllowed: function (principal) {
let uri; if (!principal || !principal.URI || !principal.URI.schemeIs("https")) {
try {
uri = makeURI(srcURIString);
}
catch(e) {
//makeURI fails if srcURIString is a nonsense URI
return false;
}
if (!uri.schemeIs("https")) {
return false; return false;
} }
let pm = Services.perms; let pm = Services.perms;
return pm.testPermission(uri, "install") == pm.ALLOW_ACTION; return pm.testPermission(principal.URI, "install") == pm.ALLOW_ACTION;
} }
}; };

4
browser/base/content/content.js
View File

@ -811,6 +811,7 @@ var LightWeightThemeWebInstallListener = {
case "InstallBrowserTheme": { case "InstallBrowserTheme": {
sendAsyncMessage("LightWeightThemeWebInstaller:Install", { sendAsyncMessage("LightWeightThemeWebInstaller:Install", {
baseURI: event.target.baseURI, baseURI: event.target.baseURI,
principal: event.target.nodePrincipal,
themeData: event.target.getAttribute("data-browsertheme"), themeData: event.target.getAttribute("data-browsertheme"),
}); });
break; break;
@ -818,6 +819,7 @@ var LightWeightThemeWebInstallListener = {
case "PreviewBrowserTheme": { case "PreviewBrowserTheme": {
sendAsyncMessage("LightWeightThemeWebInstaller:Preview", { sendAsyncMessage("LightWeightThemeWebInstaller:Preview", {
baseURI: event.target.baseURI, baseURI: event.target.baseURI,
principal: event.target.nodePrincipal,
themeData: event.target.getAttribute("data-browsertheme"), themeData: event.target.getAttribute("data-browsertheme"),
}); });
this._previewWindow = event.target.ownerDocument.defaultView; this._previewWindow = event.target.ownerDocument.defaultView;
@ -832,7 +834,7 @@ var LightWeightThemeWebInstallListener = {
case "ResetBrowserThemePreview": { case "ResetBrowserThemePreview": {
if (this._previewWindow) { if (this._previewWindow) {
sendAsyncMessage("LightWeightThemeWebInstaller:ResetPreview", sendAsyncMessage("LightWeightThemeWebInstaller:ResetPreview",
{baseURI: event.target.baseURI}); {principal: event.target.nodePrincipal});
this._resetPreviewWindow(); this._resetPreviewWindow();
} }
break; break;