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

remove the old imgmanager from cookies. 

bug 287628, r=dwitte, sr=bzbarsky
This commit is contained in:
mvl%exedo.nl 2005-03-29 09:52:19 +00:00
Родитель 7a7722a829
Коммит 3db420c858
5 изменённых файлов: 0 добавлений и 539 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
extensions/cookie/Makefile.in
Просмотреть файл

@ -66,7 +66,6 @@ REQUIRES = xpcom \
CPPSRCS = \
nsModuleFactory.cpp \
nsPermission.cpp \
nsImgManager.cpp \
nsPermissionManager.cpp \
nsPopupWindowManager.cpp \
nsCookiePromptService.cpp \
@ -74,7 +73,6 @@ CPPSRCS = \
$(NULL)
XPIDLSRCS = \
nsIImgManager.idl \
nsIPermission.idl \
nsICookieAcceptDialog.idl \
nsICookiePromptService.idl \

62
extensions/cookie/nsIImgManager.idl
Просмотреть файл

@ -1,62 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** 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 mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* 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 file contains an interface to the Image Manager,
* used for blocking images from user-specified sites.
*/
#include "nsISupports.idl"
interface nsIURI;
[scriptable, uuid(D60B3710-166D-11d5-A542-0010A401EB10)]
interface nsIImgManager : nsISupports
{
/**
* Test if the given image from URI can be loaded
* @param uri the uri of the image which wants to be loaded
* @param firstUri the uri of the document which tried to load the image
* @return whether the image has permission to be loaded
*/
boolean testPermission(in nsIURI uri,
in nsIURI firstUri);
};
%{ C++
#define NS_IMGMANAGER_CONTRACTID "@mozilla.org/imgmanager;1"
%}

351
extensions/cookie/nsImgManager.cpp
Просмотреть файл

@ -1,351 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** 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 mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* 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 "nsImgManager.h"
#include "nsIDocument.h"
#include "nsIContent.h"
#include "nsINodeInfo.h"
#include "nsIURI.h"
#include "nsIServiceManager.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMDocument.h"
#include "nsIDocShellTreeItem.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIPrefBranch2.h"
#include "nsIDocShell.h"
#include "nsString.h"
#include "nsContentPolicyUtils.h"
// Possible behavior pref values
#define IMAGE_ACCEPT 0
#define IMAGE_NOFOREIGN 1
#define IMAGE_DENY 2
static const char kImageBehaviorPrefName[] = "network.image.imageBehavior";
static const char kImageWarningPrefName[] = "network.image.warnAboutImages";
static const char kImageBlockImageInMailNewsPrefName[] = "mailnews.message_display.disable_remote_image";
static const PRUint8 kImageBehaviorPrefDefault = IMAGE_ACCEPT;
static const PRPackedBool kImageWarningPrefDefault = PR_FALSE;
static const PRPackedBool kImageBlockImageInMailNewsPrefDefault = PR_FALSE;
////////////////////////////////////////////////////////////////////////////////
// nsImgManager Implementation
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS4(nsImgManager,
nsIImgManager,
nsIContentPolicy,
nsIObserver,
nsSupportsWeakReference)
nsImgManager::nsImgManager()
: mBehaviorPref(kImageBehaviorPrefDefault)
, mWarningPref(kImageWarningPrefDefault)
, mBlockInMailNewsPref(kImageBlockImageInMailNewsPrefDefault)
{
}
nsImgManager::~nsImgManager()
{
}
nsresult nsImgManager::Init()
{
// On error, just don't use the host based lookup anymore. We can do the
// other things, like mailnews blocking
mPermissionManager = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
nsCOMPtr<nsIPrefBranch2> prefBranch = do_GetService(NS_PREFSERVICE_CONTRACTID);
if (prefBranch) {
prefBranch->AddObserver(kImageBehaviorPrefName, this, PR_TRUE);
// We don't do anything with it yet, but let it be. (bug 110112, 146513)
prefBranch->AddObserver(kImageWarningPrefName, this, PR_TRUE);
prefBranch->AddObserver(kImageBlockImageInMailNewsPrefName, this, PR_TRUE);
PrefChanged(prefBranch, nsnull);
}
return NS_OK;
}
void
nsImgManager::PrefChanged(nsIPrefBranch *aPrefBranch,
const char *aPref)
{
PRBool val;
#define PREF_CHANGED(_P) (!aPref || !strcmp(aPref, _P))
if (PREF_CHANGED(kImageBehaviorPrefName) &&
NS_SUCCEEDED(aPrefBranch->GetIntPref(kImageBehaviorPrefName, &val)) &&
val >= 0 && val <= 2)
mBehaviorPref = val;
if (PREF_CHANGED(kImageWarningPrefName) &&
NS_SUCCEEDED(aPrefBranch->GetBoolPref(kImageWarningPrefName, &val)))
mWarningPref = val;
if (PREF_CHANGED(kImageBlockImageInMailNewsPrefName) &&
NS_SUCCEEDED(aPrefBranch->GetBoolPref(kImageBlockImageInMailNewsPrefName, &val)))
mBlockInMailNewsPref = val;
}
/**
* Helper function to get the root DocShell given a context
*
* @param aContext The context (can be null)
* @return the root DocShell containing aContext, if found
*/
static inline already_AddRefed<nsIDocShell>
GetRootDocShell(nsISupports *context)
{
nsIDocShell *docshell = NS_CP_GetDocShellFromContext(context);
if (!docshell)
return nsnull;
nsresult rv;
nsCOMPtr<nsIDocShellTreeItem> docshellTreeItem(do_QueryInterface(docshell, &rv));
if (NS_FAILED(rv))
return nsnull;
nsCOMPtr<nsIDocShellTreeItem> rootItem;
// we want the app docshell, so don't use GetSameTypeRootTreeItem
rv = docshellTreeItem->GetRootTreeItem(getter_AddRefs(rootItem));
if (NS_FAILED(rv))
return nsnull;
nsIDocShell *result;
CallQueryInterface(rootItem, &result);
return result;
}
// nsIContentPolicy Implementation
NS_IMETHODIMP nsImgManager::ShouldLoad(PRUint32 aContentType,
nsIURI *aContentLocation,
nsIURI *aRequestingLocation,
nsISupports *aRequestingContext,
const nsACString &aMimeGuess,
nsISupports *aExtra,
PRInt16 *aDecision)
{
*aDecision = nsIContentPolicy::ACCEPT;
nsresult rv;
// we can't do anything w/ out this
if (!aContentLocation)
return NS_OK;
if (aContentType == nsIContentPolicy::TYPE_IMAGE) {
// we only want to check http, https, ftp
// remember ftp for a later check (disabling ftp images from mailnews)
PRBool isFtp;
rv = aContentLocation->SchemeIs("ftp", &isFtp);
NS_ENSURE_SUCCESS(rv,rv);
PRBool needToCheck = isFtp;
if (!needToCheck) {
rv = aContentLocation->SchemeIs("http", &needToCheck);
NS_ENSURE_SUCCESS(rv,rv);
if (!needToCheck) {
rv = aContentLocation->SchemeIs("https", &needToCheck);
NS_ENSURE_SUCCESS(rv,rv);
}
}
// for chrome:// and resources and others, no need to check.
if (!needToCheck)
return NS_OK;
nsCOMPtr<nsIDocShell> docshell(GetRootDocShell(aRequestingContext));
if (docshell) {
PRUint32 appType;
rv = docshell->GetAppType(&appType);
if (NS_SUCCEEDED(rv) && appType == nsIDocShell::APP_TYPE_MAIL) {
// never allow ftp for mail messages,
// because we don't want to send the users email address
// as the anonymous password
if (mBlockInMailNewsPref || isFtp) {
*aDecision = nsIContentPolicy::REJECT_REQUEST;
return NS_OK;
}
}
}
PRBool shouldLoad;
rv = TestPermission(aContentLocation, aRequestingLocation, &shouldLoad);
NS_ENSURE_SUCCESS(rv, rv);
if (!shouldLoad)
*aDecision = nsIContentPolicy::REJECT_REQUEST;
}
return NS_OK;
}
NS_IMETHODIMP nsImgManager::ShouldProcess(PRUint32 aContentType,
nsIURI *aContentLocation,
nsIURI *aRequestingLocation,
nsISupports *aRequestingContext,
const nsACString &aMimeGuess,
nsISupports *aExtra,
PRInt16 *aDecision)
{
// For loads where aRequestingContext is chrome, we should just
// accept. Those are most likely toplevel loads in windows, and
// chrome generally knows what it's doing anyway.
nsCOMPtr<nsIDocShellTreeItem> item =
do_QueryInterface(NS_CP_GetDocShellFromContext(aRequestingContext));
if (item) {
PRInt32 type;
item->GetItemType(&type);
if (type == nsIDocShellTreeItem::typeChrome) {
*aDecision = nsIContentPolicy::ACCEPT;
return NS_OK;
}
}
// This isn't a load from chrome. Just do a ShouldLoad() check --
// we want the same answer here
return ShouldLoad(aContentType, aContentLocation, aRequestingLocation,
aRequestingContext, aMimeGuess, aExtra, aDecision);
}
NS_IMETHODIMP
nsImgManager::TestPermission(nsIURI *aCurrentURI,
nsIURI *aFirstURI,
PRBool *aPermission)
{
nsresult rv;
*aPermission = PR_TRUE;
// check the permission list first; if we find an entry, it overrides
// default prefs. this is new behavior, see bug 184059.
if (mPermissionManager) {
PRUint32 temp;
mPermissionManager->TestPermission(aCurrentURI, "image", &temp);
// if we found an entry, use it
if (temp != nsIPermissionManager::UNKNOWN_ACTION) {
*aPermission = (temp != nsIPermissionManager::DENY_ACTION);
return NS_OK;
}
}
if (mBehaviorPref == IMAGE_DENY) {
*aPermission = PR_FALSE;
return NS_OK;
}
// Third party checking
if (mBehaviorPref == IMAGE_NOFOREIGN) {
// We need a requesting uri for third party checks to work.
if (!aFirstURI)
return NS_OK;
PRBool trustedSource = PR_FALSE;
rv = aFirstURI->SchemeIs("chrome", &trustedSource);
NS_ENSURE_SUCCESS(rv,rv);
if (!trustedSource) {
rv = aFirstURI->SchemeIs("resource", &trustedSource);
NS_ENSURE_SUCCESS(rv,rv);
}
if (trustedSource)
return NS_OK;
// compare tails of names checking to see if they have a common domain
// we do this by comparing the tails of both names where each tail
// includes at least one dot
// A more generic method somewhere would be nice
nsCAutoString currentHost;
rv = aCurrentURI->GetAsciiHost(currentHost);
if (NS_FAILED(rv)) return rv;
// Search for two dots, starting at the end.
// If there are no two dots found, ++dot will turn to zero,
// that will return the entire string.
PRInt32 dot = currentHost.RFindChar('.');
dot = currentHost.RFindChar('.', dot-1);
++dot;
// Get the domain, ie the last part of the host (www.domain.com -> domain.com)
// This will break on co.uk
const nsACString &tail = Substring(currentHost, dot, currentHost.Length() - dot);
nsCAutoString firstHost;
rv = aFirstURI->GetAsciiHost(firstHost);
if (NS_FAILED(rv)) return rv;
// If the tail is longer then the whole firstHost, it will never match
if (firstHost.Length() < tail.Length()) {
*aPermission = PR_FALSE;
return NS_OK;
}
// Get the last part of the firstUri with the same length as |tail|
const nsACString &firstTail = Substring(firstHost, firstHost.Length() - tail.Length(), tail.Length());
// Check that both tails are the same, and that just before the tail in
// |firstUri| there is a dot. That means both url are in the same domain
if ((firstHost.Length() > tail.Length() &&
firstHost.CharAt(firstHost.Length() - tail.Length() - 1) != '.') ||
!tail.Equals(firstTail)) {
*aPermission = PR_FALSE;
}
}
return NS_OK;
}
NS_IMETHODIMP
nsImgManager::Observe(nsISupports *aSubject,
const char *aTopic,
const PRUnichar *aData)
{
nsCOMPtr<nsIPrefBranch> prefBranch = do_QueryInterface(aSubject);
NS_ASSERTION(!nsCRT::strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic),
"unexpected topic - we only deal with pref changes!");
if (prefBranch)
PrefChanged(prefBranch, NS_LossyConvertUTF16toASCII(aData).get());
return NS_OK;
}

84
extensions/cookie/nsImgManager.h
Просмотреть файл

@ -1,84 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
// vim: ft=cpp et sw=4 tw=78 ts=4
/* ***** 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 mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* 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 ***** */
#ifndef nsImgManager_h__
#define nsImgManager_h__
#include "nsIImgManager.h"
#include "nsIContentPolicy.h"
#include "nsIObserver.h"
#include "nsWeakReference.h"
#include "nsIPermissionManager.h"
class nsIPrefBranch;
////////////////////////////////////////////////////////////////////////////////
class nsImgManager : public nsIImgManager,
public nsIContentPolicy,
public nsIObserver,
public nsSupportsWeakReference
{
public:
// nsISupports
NS_DECL_ISUPPORTS
NS_DECL_NSIIMGMANAGER
NS_DECL_NSICONTENTPOLICY
NS_DECL_NSIOBSERVER
nsImgManager();
virtual ~nsImgManager();
nsresult Init();
protected:
void PrefChanged(nsIPrefBranch *, const char *);
nsCOMPtr<nsIPermissionManager> mPermissionManager;
PRUint8 mBehaviorPref;
PRPackedBool mWarningPref;
PRPackedBool mBlockInMailNewsPref;
};
// {D60B3710-166D-11d5-A542-0010A401EB10}
#define NS_IMGMANAGER_CID \
{ 0xd60b3710, 0x166d, 0x11d5, { 0xa5, 0x42, 0x0, 0x10, 0xa4, 0x1, 0xeb, 0x10 } }
#endif /* nsImgManager_h__ */

40
extensions/cookie/nsModuleFactory.cpp
Просмотреть файл

@ -39,7 +39,6 @@
#include "nsIModule.h"
#include "nsIGenericFactory.h"
#include "nsIServiceManager.h"
#include "nsImgManager.h"
#include "nsPermissionManager.h"
#include "nsPopupWindowManager.h"
#include "nsICategoryManager.h"
@ -48,52 +47,13 @@
#include "nsXPIDLString.h"
// Define the constructor function for the objects
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsImgManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPermissionManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPopupWindowManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCookiePermission, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCookiePromptService)
static NS_METHOD
RegisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath,
const char *registryLocation, const char *componentType,
const nsModuleComponentInfo *info)
{
nsresult rv;
nsCOMPtr<nsICategoryManager> catman =
do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
nsXPIDLCString previous;
return catman->AddCategoryEntry("content-policy",
NS_IMGMANAGER_CONTRACTID,
NS_IMGMANAGER_CONTRACTID,
PR_TRUE, PR_TRUE, getter_Copies(previous));
}
static NS_METHOD
UnregisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath,
const char *registryLocation,
const nsModuleComponentInfo *info)
{
nsresult rv;
nsCOMPtr<nsICategoryManager> catman =
do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
return catman->DeleteCategoryEntry("content-policy",
NS_IMGMANAGER_CONTRACTID,
PR_TRUE);
}
// The list of components we register
static const nsModuleComponentInfo components[] = {
{ "ImgManager",
NS_IMGMANAGER_CID,
NS_IMGMANAGER_CONTRACTID,
nsImgManagerConstructor,
RegisterContentPolicy, UnregisterContentPolicy
},
{ "PermissionManager",
NS_PERMISSIONMANAGER_CID,
NS_PERMISSIONMANAGER_CONTRACTID,