mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 553169: Implement InstallTrigger, the XPI content handler and confirmation for web triggered installs. r=robstrong, r=dveditz

This commit is contained in:
Dave Townsend 2010-04-29 13:11:23 -07:00
Родитель 3b40c64466
Коммит 7bbe7a3657
18 изменённых файлов: 1051 добавлений и 90 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
browser/app/profile/firefox.js
Просмотреть файл

@ -52,11 +52,6 @@ pref("general.startup.browser", true);
pref("browser.chromeURL","chrome://browser/content/");
pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul");
pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul");
pref("xpinstall.dialog.progress.type.skin", "Extension:Manager");
pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager");
// Developers can set this to |true| if they are constantly changing files in their
// extensions directory so that the extension system does not constantly think that

20
browser/base/content/browser.js
Просмотреть файл

@ -597,8 +597,8 @@ const gXPInstallObserver = {
{
var brandBundle = document.getElementById("bundle_brand");
switch (aTopic) {
case "xpinstall-install-blocked":
var installInfo = aSubject.QueryInterface(Components.interfaces.nsIXPIInstallInfo);
case "addon-install-blocked":
var installInfo = aSubject.QueryInterface(Components.interfaces.amIWebInstallInfo);
var win = installInfo.originatingWindow;
var shell = win.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIWebNavigation)
@ -608,7 +608,13 @@ const gXPInstallObserver = {
var host = installInfo.originatingURI.host;
var brandShortName = brandBundle.getString("brandShortName");
var notificationName, messageString, buttons;
if (!gPrefService.getBoolPref("xpinstall.enabled")) {
var enabled = true;
try {
enabled = gPrefService.getBoolPref("xpinstall.enabled");
}
catch (e) {
}
if (!enabled) {
notificationName = "xpinstall-disabled"
if (gPrefService.prefIsLocked("xpinstall.enabled")) {
messageString = gNavigatorBundle.getString("xpinstallDisabledMessageLocked");
@ -639,9 +645,7 @@ const gXPInstallObserver = {
accessKey: gNavigatorBundle.getString("xpinstallPromptAllowButton.accesskey"),
popup: null,
callback: function() {
var mgr = Components.classes["@mozilla.org/xpinstall/install-manager;1"]
.createInstance(Components.interfaces.nsIXPInstallManager);
mgr.initManagerWithInstallInfo(installInfo);
installInfo.install();
return false;
}
}];
@ -1183,7 +1187,7 @@ function prepareForStartup() {
function delayedStartup(isLoadingBlank, mustLoadSidebar) {
Services.obs.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
Services.obs.addObserver(gXPInstallObserver, "xpinstall-install-blocked", false);
Services.obs.addObserver(gXPInstallObserver, "addon-install-blocked", false);
BrowserOffline.init();
OfflineApps.init();
@ -1401,7 +1405,7 @@ function BrowserShutdown()
}
Services.obs.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
Services.obs.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
Services.obs.removeObserver(gXPInstallObserver, "addon-install-blocked");
Services.obs.removeObserver(gPluginHandler.pluginCrashed, "plugin-crashed");
try {

3
browser/installer/package-manifest.in
Просмотреть файл

@ -257,7 +257,6 @@
@BINPATH@/components/xpcom_threads.xpt
@BINPATH@/components/xpcom_xpti.xpt
@BINPATH@/components/xpconnect.xpt
@BINPATH@/components/xpinstall.xpt
@BINPATH@/components/xulapp.xpt
@BINPATH@/components/xuldoc.xpt
@BINPATH@/components/xultmpl.xpt
@ -296,6 +295,8 @@
@BINPATH@/components/GPSDGeolocationProvider.js
@BINPATH@/components/nsSidebar.js
@BINPATH@/components/addonManager.js
@BINPATH@/components/amContentHandler.js
@BINPATH@/components/amWebInstallListener.js
@BINPATH@/components/nsBlocklistService.js
#ifdef MOZ_UPDATER
@BINPATH@/components/nsUpdateService.js

1
config/autoconf.mk.in
Просмотреть файл

@ -126,7 +126,6 @@ IBMBIDI = @IBMBIDI@
MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
ACCESSIBILITY = @ACCESSIBILITY@
MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@
MOZ_XPINSTALL = @MOZ_XPINSTALL@
MOZ_JSLOADER = @MOZ_JSLOADER@
MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@

17
configure.in
Просмотреть файл

@ -4922,7 +4922,6 @@ MOZ_UNIVERSALCHARDET=1
MOZ_URL_CLASSIFIER=
MOZ_USE_NATIVE_UCONV=
MOZ_VIEW_SOURCE=1
MOZ_XPINSTALL=1
MOZ_XSLT_STANDALONE=
MOZ_XTF=1
MOZ_XUL=1
@ -5740,17 +5739,6 @@ case "$target" in
esac
fi
dnl ========================================================
dnl xpinstall support on by default
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(xpinstall,
[ --disable-xpinstall Disable xpinstall support],
MOZ_XPINSTALL=,
MOZ_XPINSTALL=1 )
if test "$MOZ_XPINSTALL"; then
AC_DEFINE(MOZ_XPINSTALL)
fi
dnl ========================================================
dnl xpcom js loader support on by default
dnl ========================================================
@ -6343,10 +6331,6 @@ if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then
fi
fi
# Automatically disable installer if xpinstall isn't built
if test -z "$MOZ_XPINSTALL"; then
MOZ_INSTALLER=
fi
AC_SUBST(MOZ_INSTALLER)
AC_MSG_CHECKING([for tar archiver])
@ -8426,7 +8410,6 @@ AC_SUBST(ENABLE_TESTS)
AC_SUBST(IBMBIDI)
AC_SUBST(MOZ_UNIVERSALCHARDET)
AC_SUBST(ACCESSIBILITY)
AC_SUBST(MOZ_XPINSTALL)
AC_SUBST(MOZ_VIEW_SOURCE)
AC_SUBST(MOZ_SPELLCHECK)
AC_SUBST(MOZ_USER_DIR)

2
modules/libpref/src/Makefile.in
Просмотреть файл

@ -85,7 +85,7 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \
GARBAGE += greprefs.js
GREPREF_FILES = $(topsrcdir)/xpinstall/public/xpinstall.js $(topsrcdir)/netwerk/base/public/security-prefs.js $(srcdir)/init/all.js
GREPREF_FILES = $(topsrcdir)/netwerk/base/public/security-prefs.js $(srcdir)/init/all.js
# Optimizer bug with GCC 3.2.2 on OS/2
ifeq ($(OS_ARCH), OS2)

1
netwerk/confvars.sh
Просмотреть файл

@ -39,4 +39,3 @@
MOZ_APP_NAME=mozilla
MOZ_EXTENSIONS_DEFAULT=""
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_XPINSTALL=

10
toolkit/library/libxul-config.mk
Просмотреть файл

@ -123,12 +123,10 @@ STATIC_LIBS += chromium_s
endif
ifndef WINCE
ifdef MOZ_XPINSTALL
STATIC_LIBS += \
mozreg_s \
$(NULL)
endif
endif
# component libraries
COMPONENT_LIBS += \
@ -150,6 +148,7 @@ COMPONENT_LIBS += \
txmgr \
chrome \
commandlines \
extensions \
toolkitcomps \
pipboot \
pipnss \
@ -197,13 +196,6 @@ COMPONENT_LIBS += \
$(NULL)
endif
ifdef MOZ_XPINSTALL
DEFINES += -DMOZ_XPINSTALL
COMPONENT_LIBS += \
xpinstall \
$(NULL)
endif
ifdef MOZ_JSDEBUGGER
DEFINES += -DMOZ_JSDEBUGGER
COMPONENT_LIBS += \

9
toolkit/library/nsStaticXULComponents.cpp
Просмотреть файл

@ -144,13 +144,6 @@
#define PLUGINS_MODULES
#endif
#ifdef MOZ_XPINSTALL
#define XPINSTALL_MODULES \
MODULE(nsSoftwareUpdate)
#else
#define XPINSTALL_MODULES
#endif
#ifdef MOZ_JSDEBUGGER
#define JSDEBUGGER_MODULES \
MODULE(JavaScript_Debugger)
@ -269,9 +262,9 @@
STORAGE_MODULE \
PLACES_MODULES \
XULENABLED_MODULES \
MODULE(AddonsModule) \
MODULE(nsToolkitCompsModule) \
XREMOTE_MODULES \
XPINSTALL_MODULES \
JSDEBUGGER_MODULES \
MODULE(BOOT) \
MODULE(NSS) \

97
toolkit/mozapps/extensions/amContentHandler.js Normal file
Просмотреть файл

@ -0,0 +1,97 @@
/*
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is the Extension Manager.
#
# The Initial Developer of the Original Code is
# the Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Dave Townsend <dtownsend@oxymoronical.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
*/
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cr = Components.results;
const XPI_CONTENT_TYPE = "application/x-xpinstall";
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
function amContentHandler() {
}
amContentHandler.prototype = {
/**
* Handles a new request for an application/x-xpinstall file.
*
* @param mimetype
* The mimetype of the file
* @param context
* The context passed to nsIChannel.asyncOpen
*/
handleContent: function XCH_handleContent(mimetype, context, request) {
if (mimetype != XPI_CONTENT_TYPE)
throw Cr.NS_ERROR_WONT_HANDLE_CONTENT;
if (!(request instanceof Ci.nsIChannel))
throw Cr.NS_ERROR_WONT_HANDLE_CONTENT;
let uri = request.URI;
let referer = null;
if (request instanceof Ci.nsIPropertyBag2) {
referer = request.getPropertyAsInterface("docshell.internalReferrer",
Ci.nsIURI);
}
let window = null;
let callbacks = request.notificationCallbacks ?
request.notificationCallbacks :
request.loadGroup.notificationCallbacks;
if (callbacks)
window = callbacks.getInterface(Ci.nsIDOMWindow);
request.cancel(Cr.NS_BINDING_ABORTED);
let manager = Cc["@mozilla.org/addons/integration;1"].
getService(Ci.amIWebInstaller);
manager.installAddonsFromWebpage(mimetype, window, referer, [uri.spec],
[null], [null], [null], null, 1);
},
classDescription: "XPI Content Handler",
contractID: "@mozilla.org/uriloader/content-handler;1?type=" + XPI_CONTENT_TYPE,
classID: Components.ID("{7beb3ba8-6ec3-41b4-b67c-da89b8518922}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler])
};
function NSGetModule(compMgr, fileSpec)
XPCOMUtils.generateModule([amContentHandler]);

126
toolkit/mozapps/extensions/amIInstallTrigger.idl Normal file
Просмотреть файл

@ -0,0 +1,126 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Extension Manager.
*
* The Initial Developer of the Original Code is
* the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Dave Townsend <dtownsend@oxymoronical.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISupports.idl"
interface nsIVariant;
/**
* A callback function that webpages can implement to be notified when triggered
* installs complete.
*/
[scriptable, function, uuid(bb22f5c0-3ca1-48f6-873c-54e87987700f)]
interface amIInstallCallback : nsISupports
{
/**
* Called when an install completes or fails.
* @param url
* The url of the add-on being installed
* @param status
* 0 if the install was successful or negative if not
*/
void onInstallEnded(in AString url, in PRInt32 status);
};
/**
* The interface for the InstallTrigger object available to all websites.
*/
[scriptable, uuid(14b4e84d-001c-4403-a608-52a67ffaab40)]
interface amIInstallTrigger : nsISupports
{
/**
* Retained for backwards compatibility.
*/
const PRUint32 SKIN = 1;
const PRUint32 LOCALE = 2;
const PRUint32 CONTENT = 4;
const PRUint32 PACKAGE = 7;
/**
* Tests if installation is enabled. This method is deprecated, please use
* "enabled" in the future.
*/
boolean updateEnabled();
/**
* Tests if installation is enabled.
*/
boolean enabled();
/**
* Starts a new installation of a set of add-ons.
*
* @param args
* The add-ons to install. This should be a JS object, each property
* is the name of an add-on to be installed. The value of the
* property should either be a string URL, or an object with the
* following properties:
* * URL for the add-on's URL
* * IconURL for an icon for the add-on
* * Hash for a hash of the add-on
* @param callback
* A callback to call as each installation succeeds or fails
* @return true if the installations were successfully started
*/
boolean install(in nsIVariant args, [optional] in amIInstallCallback callback);
/**
* Starts installing a new add-on. This method is deprecated, please use
* "install" in the future.
*
* @param type
* Unused, retained for backwards compatibility
* @param url
* The URL of the add-on
* @param skin
* Unused, retained for backwards compatibility
* @return true if the installation was successfully started
*/
boolean installChrome(in PRUint32 type, in AString url, in AString skin);
/**
* Starts installing a new add-on. This method is deprecated, please use
* "install" in the future.
*
* @param url
* The URL of the add-on
* @param flags
* Unused, retained for backwards compatibility
* @return true if the installation was successfully started
*/
boolean startSoftwareUpdate(in AString url, [optional] in PRInt32 flags);
};

105
toolkit/mozapps/extensions/amIWebInstallListener.idl Normal file
Просмотреть файл

@ -0,0 +1,105 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Extension Manager.
*
* The Initial Developer of the Original Code is
* the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Dave Townsend <dtownsend@oxymoronical.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISupports.idl"
interface nsIDOMWindowInternal;
interface nsIURI;
interface nsIVariant;
/**
* amIWebInstallInfo is used by the default implementation of
* amIWebInstallListener to communicate with the running application and allow
* it to warn the user about blocked installs and start the installs running.
*/
[scriptable, uuid(8710e692-3989-4dc7-b607-40d57610ae75)]
interface amIWebInstallInfo : nsISupports
{
readonly attribute nsIDOMWindowInternal originatingWindow;
readonly attribute nsIURI originatingURI;
readonly attribute nsIVariant installs;
/**
* Starts all installs.
*/
void install();
};
/**
* The registered amIWebInstallListener is used to notify about new installs
* triggered by websites. The default implementation displays a confirmation
* dialog when add-ons are ready to install and uses the observer service to
* notify when installations are blocked.
*/
[scriptable, uuid(ea806f3a-1b27-4d3d-9aee-88dec4c29fda)]
interface amIWebInstallListener : nsISupports
{
/**
* Called when the website is not allowed to directly prompt the user to
* install add-ons.
*
* @param window
* The window that triggered the installs
* @param uri
* The URI of the site that triggered the installs
* @param installs
* The AddonInstalls that were blocked
* @param count
* The number of AddonInstalls
* @return true if the caller should start the installs
*/
boolean onWebInstallBlocked(in nsIDOMWindowInternal window, in nsIURI uri,
[array, size_is(count)] in nsIVariant installs,
[optional] in PRUint32 count);
/**
* Called when a website wants to ask the user to install add-ons.
*
* @param window
* The window that triggered the installs
* @param uri
* The URI of the site that triggered the installs
* @param installs
* The AddonInstalls that were requested
* @param count
* The number of AddonInstalls
* @return true if the caller should start the installs
*/
boolean onWebInstallRequested(in nsIDOMWindowInternal window, in nsIURI uri,
[array, size_is(count)] in nsIVariant installs,
[optional] in PRUint32 count);
};

398
toolkit/mozapps/extensions/amInstallTrigger.cpp Normal file
Просмотреть файл

@ -0,0 +1,398 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Extension Manager.
*
* The Initial Developer of the Original Code is
* the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Dave Townsend <dtownsend@oxymoronical.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "amInstallTrigger.h"
#include "nsIClassInfoImpl.h"
#include "nsIGenericFactory.h"
#include "nsIComponentManager.h"
#include "nsIComponentRegistrar.h"
#include "nsICategoryManager.h"
#include "nsServiceManagerUtils.h"
#include "nsXPIDLString.h"
#include "nsIScriptNameSpaceManager.h"
#include "nsDOMJSUtils.h"
#include "nsIXPConnect.h"
#include "nsContentUtils.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsNetUtil.h"
#include "nsIScriptSecurityManager.h"
//
// Helper function for URI verification
//
static nsresult
CheckLoadURIFromScript(JSContext *cx, const nsACString& uriStr)
{
nsresult rv;
nsCOMPtr<nsIScriptSecurityManager> secman(do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
// get the script principal
nsCOMPtr<nsIPrincipal> principal;
rv = secman->GetSubjectPrincipal(getter_AddRefs(principal));
NS_ENSURE_SUCCESS(rv, rv);
if (!principal)
return NS_ERROR_FAILURE;
// convert the requested URL string to a URI
// Note that we use a null base URI here, since that's what we use when we
// actually convert the string into a URI to load.
nsCOMPtr<nsIURI> uri;
rv = NS_NewURI(getter_AddRefs(uri), uriStr);
NS_ENSURE_SUCCESS(rv, rv);
// are we allowed to load this one?
rv = secman->CheckLoadURIWithPrincipal(principal, uri,
nsIScriptSecurityManager::DISALLOW_INHERIT_PRINCIPAL);
return rv;
}
NS_IMPL_ISUPPORTS1_CI(amInstallTrigger, amIInstallTrigger)
amInstallTrigger::amInstallTrigger()
{
mManager = do_GetService("@mozilla.org/addons/integration;1");
}
amInstallTrigger::~amInstallTrigger()
{
}
JSContext*
amInstallTrigger::GetJSContext()
{
nsCOMPtr<nsIXPConnect> xpc = do_GetService(nsIXPConnect::GetCID());
// get the xpconnect native call context
nsAXPCNativeCallContext *cc = nsnull;
xpc->GetCurrentNativeCallContext(&cc);
if (!cc)
return nsnull;
// Get JSContext of current call
JSContext* cx;
nsresult rv = cc->GetJSContext(&cx);
if (NS_FAILED(rv))
return nsnull;
return cx;
}
already_AddRefed<nsIDOMWindowInternal>
amInstallTrigger::GetOriginatingWindow(JSContext* cx)
{
nsIScriptGlobalObject *globalObject = nsnull;
nsIScriptContext *scriptContext = GetScriptContextFromJSContext(cx);
if (!scriptContext)
return nsnull;
globalObject = scriptContext->GetGlobalObject();
if (!globalObject)
return nsnull;
nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(globalObject);
return window.forget();
}
already_AddRefed<nsIURI>
amInstallTrigger::GetOriginatingURI(nsIDOMWindowInternal* aWindow)
{
if (!aWindow)
return nsnull;
nsCOMPtr<nsIDOMDocument> domdoc;
aWindow->GetDocument(getter_AddRefs(domdoc));
nsCOMPtr<nsIDocument> doc(do_QueryInterface(domdoc));
nsIURI* uri = doc->GetDocumentURI();
NS_IF_ADDREF(uri);
return uri;
}
/* boolean updateEnabled (); */
NS_IMETHODIMP
amInstallTrigger::UpdateEnabled(PRBool *_retval NS_OUTPARAM)
{
return Enabled(_retval);
}
/* boolean enabled (); */
NS_IMETHODIMP
amInstallTrigger::Enabled(PRBool *_retval NS_OUTPARAM)
{
nsCOMPtr<nsIDOMWindowInternal> window = GetOriginatingWindow(GetJSContext());
nsCOMPtr<nsIURI> referer = GetOriginatingURI(window);
return mManager->IsInstallEnabled(NS_LITERAL_STRING("application/x-xpinstall"), referer, _retval);
}
/* boolean install (in nsIVariant args, [optional] in amIInstallCallback callback); */
NS_IMETHODIMP
amInstallTrigger::Install(nsIVariant *args,
amIInstallCallback *callback,
PRBool *_retval NS_OUTPARAM)
{
JSContext *cx = GetJSContext();
nsCOMPtr<nsIDOMWindowInternal> window = GetOriginatingWindow(cx);
nsCOMPtr<nsIURI> referer = GetOriginatingURI(window);
jsval params;
nsresult rv = args->GetAsJSVal(&params);
NS_ENSURE_SUCCESS(rv, rv);
if (!JSVAL_IS_OBJECT(params) || !JSVAL_TO_OBJECT(params))
return NS_ERROR_INVALID_ARG;
JSIdArray *ida = JS_Enumerate(cx, JSVAL_TO_OBJECT(params));
if (!ida)
return NS_ERROR_FAILURE;
PRUint32 count = ida->length;
nsTArray<const PRUnichar*> names;
nsTArray<const PRUnichar*> uris;
nsTArray<const PRUnichar*> icons;
nsTArray<const PRUnichar*> hashes;
jsval v;
for (PRUint32 i = 0; i < count; i++ ) {
JS_IdToValue(cx, ida->vector[i], &v);
JSString *str = JS_ValueToString(cx, v);
if (!str) {
JS_DestroyIdArray(cx, ida);
return NS_ERROR_FAILURE;
}
const PRUnichar* name = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(str));
const PRUnichar* uri = nsnull;
const PRUnichar* icon = nsnull;
const PRUnichar* hash = nsnull;
JS_GetUCProperty(cx, JSVAL_TO_OBJECT(params), reinterpret_cast<const jschar*>(name), nsCRT::strlen(name), &v);
if (JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v)) {
jsval v2;
if (JS_GetProperty(cx, JSVAL_TO_OBJECT(v), "URL", &v2) && !JSVAL_IS_VOID(v2)) {
JSString *str = JS_ValueToString(cx, v2);
if (!str) {
JS_DestroyIdArray(cx, ida);
return NS_ERROR_FAILURE;
}
uri = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(str));
}
if (JS_GetProperty(cx, JSVAL_TO_OBJECT(v), "IconURL", &v2) && !JSVAL_IS_VOID(v2)) {
JSString *str = JS_ValueToString(cx, v2);
if (!str) {
JS_DestroyIdArray(cx, ida);
return NS_ERROR_FAILURE;
}
icon = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(str));
}
if (JS_GetProperty(cx, JSVAL_TO_OBJECT(v), "Hash", &v2) && !JSVAL_IS_VOID(v2)) {
JSString *str = JS_ValueToString(cx, v2);
if (!str) {
JS_DestroyIdArray(cx, ida);
return NS_ERROR_FAILURE;
}
hash = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(str));
}
}
else {
uri = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(JS_ValueToString(cx, v)));
}
if (!uri) {
JS_DestroyIdArray(cx, ida);
return NS_ERROR_FAILURE;
}
nsCString tmpURI = NS_ConvertUTF16toUTF8(uri);
// Get relative URL to load
if (referer) {
rv = referer->Resolve(tmpURI, tmpURI);
if (NS_FAILED(rv)) {
JS_DestroyIdArray(cx, ida);
return rv;
}
}
rv = CheckLoadURIFromScript(cx, tmpURI);
if (NS_FAILED(rv)) {
JS_DestroyIdArray(cx, ida);
return rv;
}
uri = UTF8ToNewUnicode(tmpURI);
if (icon) {
nsCString tmpIcon = NS_ConvertUTF16toUTF8(icon);
if (referer) {
rv = referer->Resolve(tmpIcon, tmpIcon);
if (NS_FAILED(rv)) {
JS_DestroyIdArray(cx, ida);
return rv;
}
}
// If the page can't load the icon then just ignore it
rv = CheckLoadURIFromScript(cx, tmpIcon);
if (NS_FAILED(rv))
icon = nsnull;
else
icon = UTF8ToNewUnicode(tmpIcon);
}
names.AppendElement(name);
uris.AppendElement(uri);
icons.AppendElement(icon);
hashes.AppendElement(hash);
}
JS_DestroyIdArray(cx, ida);
rv = mManager->InstallAddonsFromWebpage(NS_LITERAL_STRING("application/x-xpinstall"),
window, referer, uris.Elements(),
hashes.Elements(), names.Elements(),
icons.Elements(), callback, count,
_retval);
for (PRUint32 i = 0; i < uris.Length(); i++) {
NS_Free(const_cast<PRUnichar*>(uris[i]));
if (icons[i])
NS_Free(const_cast<PRUnichar*>(icons[i]));
}
return rv;
}
/* boolean installChrome (in PRUint32 type, in AString url, in AString skin); */
NS_IMETHODIMP
amInstallTrigger::InstallChrome(PRUint32 type,
const nsAString & url,
const nsAString & skin,
PRBool *_retval NS_OUTPARAM)
{
return StartSoftwareUpdate(url, 0, _retval);
}
/* boolean startSoftwareUpdate (in AString url, [optional] in PRInt32 flags); */
NS_IMETHODIMP
amInstallTrigger::StartSoftwareUpdate(const nsAString & url,
PRInt32 flags,
PRBool *_retval NS_OUTPARAM)
{
nsresult rv;
JSContext *cx = GetJSContext();
nsCOMPtr<nsIDOMWindowInternal> window = GetOriginatingWindow(cx);
nsCOMPtr<nsIURI> referer = GetOriginatingURI(window);
nsTArray<const PRUnichar*> names;
nsTArray<const PRUnichar*> uris;
nsTArray<const PRUnichar*> icons;
nsTArray<const PRUnichar*> hashes;
nsCString tmpURI = NS_ConvertUTF16toUTF8(url);
// Get relative URL to load
if (referer) {
rv = referer->Resolve(tmpURI, tmpURI);
NS_ENSURE_SUCCESS(rv, rv);
}
rv = CheckLoadURIFromScript(cx, tmpURI);
NS_ENSURE_SUCCESS(rv, rv);
names.AppendElement((PRUnichar*)nsnull);
uris.AppendElement(UTF8ToNewUnicode(tmpURI));
icons.AppendElement((PRUnichar*)nsnull);
hashes.AppendElement((PRUnichar*)nsnull);
rv = mManager->InstallAddonsFromWebpage(NS_LITERAL_STRING("application/x-xpinstall"),
window, referer, uris.Elements(),
hashes.Elements(), names.Elements(),
icons.Elements(), nsnull, 1, _retval);
NS_Free(const_cast<PRUnichar*>(uris[0]));
return rv;
}
NS_DECL_CLASSINFO(amInstallTrigger)
NS_GENERIC_FACTORY_CONSTRUCTOR(amInstallTrigger)
static NS_METHOD
RegisterInstallTrigger(nsIComponentManager *aCompMgr,
nsIFile *aPath,
const char *registryLocation,
const char *componentType,
const nsModuleComponentInfo *info)
{
nsresult rv = NS_OK;
nsCOMPtr<nsICategoryManager> catman =
do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsXPIDLCString previous;
rv = catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY,
"InstallTrigger",
AM_INSTALLTRIGGER_CONTRACTID,
PR_TRUE, PR_TRUE, getter_Copies(previous));
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}
// The list of components we register
static const nsModuleComponentInfo components[] =
{
{ "InstallTrigger Component",
AM_InstallTrigger_CID,
AM_INSTALLTRIGGER_CONTRACTID,
amInstallTriggerConstructor,
RegisterInstallTrigger,
nsnull, // unregister
nsnull, // factory destructor
NS_CI_INTERFACE_GETTER_NAME(amInstallTrigger),
nsnull, // language helper
&NS_CLASSINFO_NAME(amInstallTrigger),
nsIClassInfo::DOM_OBJECT // flags
}
};
NS_IMPL_NSGETMODULE(AddonsModule, components)

65
toolkit/mozapps/extensions/amInstallTrigger.h Normal file
Просмотреть файл

@ -0,0 +1,65 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Extension Manager.
*
* The Initial Developer of the Original Code is
* the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Dave Townsend <dtownsend@oxymoronical.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "jscntxt.h"
#include "amIInstallTrigger.h"
#include "nsIDOMWindowInternal.h"
#include "nsIURI.h"
#include "amIWebInstaller.h"
#include "nsCOMPtr.h"
#define AM_InstallTrigger_CID \
{0xfcfcdf1e, 0xe9ef, 0x4141, {0x90, 0xd8, 0xd5, 0xff, 0x84, 0xc1, 0x7c, 0xce}}
#define AM_INSTALLTRIGGER_CONTRACTID "@mozilla.org/addons/installtrigger;1"
class amInstallTrigger : public amIInstallTrigger
{
public:
NS_DECL_ISUPPORTS
NS_DECL_AMIINSTALLTRIGGER
amInstallTrigger();
private:
~amInstallTrigger();
JSContext* GetJSContext();
already_AddRefed<nsIDOMWindowInternal> GetOriginatingWindow(JSContext* cx);
already_AddRefed<nsIURI> GetOriginatingURI(nsIDOMWindowInternal* aWindow);
nsCOMPtr<amIWebInstaller> mManager;
};

221
toolkit/mozapps/extensions/amWebInstallListener.js Normal file
Просмотреть файл

@ -0,0 +1,221 @@
/*
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is the Extension Manager.
#
# The Initial Developer of the Original Code is
# the Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Dave Townsend <dtownsend@oxymoronical.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
*/
/**
* This is a default implementation of amIWebInstallListener that should work
* for most applications but can be overriden. It notifies the observer service
* about blocked installs. For normal installs it pops up an install
* confirmation when all the add-ons have been downloaded.
*/
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cr = Components.results;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/AddonManager.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
/**
* Logs a warning message
*
* @param str
* The string to log
*/
function WARN(str) {
dump("*** addons.weblistener: " + str + "\n");
}
/**
* Creates a new installer to monitor downloads and prompt to install when
* ready
*
* @param window
* The window that started the installations
* @param url
* The URL that started the installations
* @installs installs
* An array of AddonInstalls
*/
function Installer(window, url, installs) {
this.window = window;
this.url = url;
this.downloads = installs;
this.installs = [];
this.bundle = Cc["@mozilla.org/intl/stringbundle;1"].
getService(Ci.nsIStringBundleService).
createBundle("chrome://mozapps/locale/extensions/extensions.properties");
this.count = installs.length;
installs.forEach(function(install) {
install.addListener(this);
// Might already be a local file
if (install.state == AddonManager.STATE_DOWNLOADED)
this.onDownloadEnded(install);
else
install.install();
}, this);
}
Installer.prototype = {
window: null,
downloads: null,
installs: null,
count: null,
/**
* Checks if all downloads are now complete and if so prompts to install.
*/
checkAllDownloaded: function() {
if (--this.count > 0)
return;
// Maybe none of the downloads were sucessful
if (this.installs.length == 0)
return;
let args = {};
args.url = this.url;
args.installs = this.installs;
args.wrappedJSObject = args;
Services.ww.openWindow(this.window, "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul",
null, "chrome,modal,centerscreen", args);
},
onDownloadCancelled: function(install) {
install.removeListener(this);
this.checkAllDownloaded();
},
onDownloadFailed: function(install, error) {
install.removeListener(this);
// TODO show some better error
Services.prompt.alert(this.window, "Download Failed", "The download of " + install.sourceURL + " failed: " + error);
this.checkAllDownloaded();
},
onDownloadEnded: function(install) {
install.removeListener(this);
if (install.addon.appDisabled) {
// App disabled items are not compatible
install.cancel();
let title = null;
let text = null;
let problems = "";
if (!install.addon.isCompatible)
problems += "incompatible, ";
if (!install.addon.providesUpdatesSecurely)
problems += "insecure updates, ";
if (install.addon.blocklistState == Ci.nsIBlocklistService.STATE_BLOCKED) {
problems += "blocklisted, ";
title = bundle.GetStringFromName("blocklistedInstallTitle2");
text = this.bundle.formatStringFromName("blocklistedInstallMsg2",
[install.addon.name], 1);
}
problems = problems.substring(0, problems.length - 2);
WARN("Not installing " + install.addon.id + " because of the following: " + problems);
title = this.bundle.GetStringFromName("incompatibleTitle2", 1);
text = this.bundle.formatStringFromName("incompatibleMessage",
[install.addon.name,
install.addon.version,
Services.appinfo.name,
Services.appinfo.version], 4);
Services.prompt.alert(this.window, title, text);
}
else {
this.installs.push(install);
}
this.checkAllDownloaded();
return false;
},
};
function extWebInstallListener() {
}
extWebInstallListener.prototype = {
/**
* @see amIWebInstallListener.idl
*/
onWebInstallBlocked: function(window, uri, installs) {
let info = {
originatingWindow: window,
originatingURI: uri,
installs: installs,
install: function() {
dump("Start installs\n");
new Installer(this.originatingWindow, this.originatingURI, this.installs);
},
QueryInterface: XPCOMUtils.generateQI([Ci.amIWebInstallInfo])
};
Services.obs.notifyObservers(info, "addon-install-blocked", null);
return false;
},
/**
* @see amIWebInstallListener.idl
*/
onWebInstallRequested: function(window, uri, installs) {
new Installer(window, uri, installs);
// We start the installs ourself
return false;
},
classDescription: "XPI Install Handler",
contractID: "@mozilla.org/addons/web-install-listener;1",
classID: Components.ID("{0f38e086-89a3-40a5-8ffc-9b694de1d04a}"),
QueryInterface: XPCOMUtils.generateQI([Ci.amIWebInstallListener])
};
function NSGetModule(compMgr, fileSpec)
XPCOMUtils.generateModule([extWebInstallListener]);

47
toolkit/mozapps/xpinstall/content/xpinstallConfirm.js
Просмотреть файл

@ -35,11 +35,9 @@
#
# ***** END LICENSE BLOCK *****
var XPInstallConfirm =
{
_param: null
};
var args
var XPInstallConfirm = {};
XPInstallConfirm.init = function ()
{
@ -49,13 +47,9 @@ XPInstallConfirm.init = function ()
var _timeout;
var bundle = document.getElementById("xpinstallConfirmStrings");
this._param = window.arguments[0].QueryInterface(Components.interfaces.nsIDialogParamBlock);
if (!this._param)
close();
this._param.SetInt(0, 1); // The default return value is "Cancel"
args = window.arguments[0].wrappedJSObject;
var _installCountdownLength = 5;
try {
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
@ -66,29 +60,28 @@ XPInstallConfirm.init = function ()
var itemList = document.getElementById("itemList");
var numItemsToInstall = this._param.GetInt(1);
var numItemsToInstall = args.installs.length;
for (var i = 0; i < numItemsToInstall; ++i) {
var installItem = document.createElement("installitem");
itemList.appendChild(installItem);
installItem.name = this._param.GetString(i);
installItem.url = this._param.GetString(++i);
var icon = this._param.GetString(++i);
if (icon != "")
installItem.name = args.installs[i].addon.name;
installItem.url = args.installs[i].sourceURL;
var icon = args.installs[i].iconURL;
if (icon != null)
installItem.icon = icon;
var cert = this._param.GetString(++i);
if (cert)
installItem.cert = bundle.getFormattedString("signed", [cert]);
else
if (args.installs[i].certName) {
installItem.cert = bundle.getFormattedString("signed", [args.installs[i].certName]);
}
else {
installItem.cert = bundle.getString("unverified");
installItem.signed = cert ? "true" : "false";
}
installItem.signed = args.installs[i].certName ? "true" : "false";
}
var introString = bundle.getString("itemWarnIntroSingle");
if (numItemsToInstall > 4)
introString = bundle.getFormattedString("itemWarnIntroMultiple", [numItemsToInstall / 4]);
if (this._param.objects && this._param.objects.length)
introString = this._param.objects.queryElementAt(0, Components.interfaces.nsISupportsString).data;
var textNode = document.createTextNode(introString);
var introNode = document.getElementById("itemWarningIntro");
while (introNode.hasChildNodes())
@ -173,12 +166,16 @@ XPInstallConfirm.init = function ()
XPInstallConfirm.onOK = function ()
{
this._param.SetInt(0, 0);
args.installs.forEach(function(install) {
install.install();
});
return true;
}
XPInstallConfirm.onCancel = function ()
{
this._param.SetInt(0, 1);
args.installs.forEach(function(install) {
install.cancel();
});
return true;
}

8
toolkit/toolkit-makefiles.sh
Просмотреть файл

@ -554,12 +554,6 @@ MAKEFILES_xpcom_tests="
xpcom/tests/static-checker/Makefile
"
MAKEFILES_xpinstall="
xpinstall/Makefile
xpinstall/public/Makefile
xpinstall/src/Makefile
"
MAKEFILES_xpfe="
widget/src/xremoteclient/Makefile
toolkit/components/remote/Makefile
@ -841,7 +835,6 @@ add_makefiles "
$MAKEFILES_widget
$MAKEFILES_xpcom
$MAKEFILES_xpcom_tests
$MAKEFILES_xpinstall
$MAKEFILES_xpfe
$MAKEFILES_embedding
$MAKEFILES_xulapp
@ -1004,7 +997,6 @@ if [ "$ENABLE_TESTS" ]; then
widget/tests/Makefile
xpcom/sample/program/Makefile
xpcom/tests/external/Makefile
xpinstall/tests/Makefile
"
fi

6
toolkit/toolkit-tiers.mk
Просмотреть файл

@ -59,10 +59,8 @@ tier_platform_dirs += modules/zlib
endif
ifndef WINCE
ifneq (,$(MOZ_XPINSTALL))
tier_platform_dirs += modules/libreg
endif
endif
tier_platform_dirs += \
modules/libpref \
@ -214,10 +212,6 @@ endif
tier_platform_dirs += toolkit
ifdef MOZ_XPINSTALL
tier_platform_dirs += xpinstall
endif
ifdef MOZ_PSM
tier_platform_dirs += security/manager
else