mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
removing nsCookies.{h,cpp} and nsCookieManager.{h,cpp}. to find old blame info and logs for those files, look in attic.
cookie rewrite part 3, b=200632, r=alecf, sr=darin.
This commit is contained in:
dwitte%stanford.edu
parent
e49f24690b
commit
cc8373a599
@ -1,202 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape 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/NPL/
|
||||
*
|
||||
* 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 NPL, 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 NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsCookieManager.h"
|
||||
#include "nsCookies.h"
|
||||
#include "nsICookieService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsIScriptGlobalObject.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// used in logging via ::Add(), to indicate origin of cookie
|
||||
#ifdef PR_LOGGING
|
||||
#define kCookieHeader "(added via cookiemanager interface)"
|
||||
#else
|
||||
#define kCookieHeader ""
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class nsCookieEnumerator : public nsISimpleEnumerator
|
||||
{
|
||||
public:
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// note: mCookieCount is initialized just once in the ctor. While it might
|
||||
// appear that the cookie list can change while the cookiemanager is running,
|
||||
// the cookieservice is actually on the same thread, so it can't. Note that
|
||||
// a new nsCookieEnumerator is created each time the cookiemanager is loaded.
|
||||
// So we only need to get the count once. If we ever change the cookieservice to
|
||||
// run on a different thread, then something to the effect of a lock will be
|
||||
// required. see bug 191682 for details.
|
||||
nsCookieEnumerator() :
|
||||
mCookieIndex(0)
|
||||
{
|
||||
PRInt32 temp;
|
||||
COOKIE_RemoveExpiredCookies(NOW_IN_SECONDS, temp);
|
||||
mCookieCount = sCookieList->Count();
|
||||
}
|
||||
|
||||
NS_IMETHOD HasMoreElements(PRBool *result)
|
||||
{
|
||||
*result = mCookieIndex < mCookieCount;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHOD GetNext(nsISupports **result)
|
||||
{
|
||||
if (mCookieIndex >= mCookieCount) {
|
||||
*result = nsnull;
|
||||
NS_ERROR("bad cookie index");
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
|
||||
cookie_CookieStruct *cookieInList = NS_STATIC_CAST(cookie_CookieStruct*, sCookieList->ElementAt(mCookieIndex++));
|
||||
NS_ASSERTION(cookieInList, "corrupt cookie list");
|
||||
|
||||
// create a new nsICookie and copy the cookie data
|
||||
if (!(*result = COOKIE_ChangeFormat(cookieInList).get())) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual ~nsCookieEnumerator()
|
||||
{
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
PRInt32 mCookieIndex;
|
||||
PRInt32 mCookieCount;
|
||||
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsCookieEnumerator, nsISimpleEnumerator);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// nsCookieManager Implementation
|
||||
|
||||
NS_IMPL_ISUPPORTS3(nsCookieManager, nsICookieManager, nsICookieManager2, nsISupportsWeakReference);
|
||||
|
||||
nsCookieManager::nsCookieManager()
|
||||
{
|
||||
}
|
||||
|
||||
nsCookieManager::~nsCookieManager()
|
||||
{
|
||||
}
|
||||
|
||||
nsresult nsCookieManager::Init()
|
||||
{
|
||||
// XXX we need this until we merge the cookiemanager into the cookieservice.
|
||||
// otherwise, sCookieList is un-initialized (required by COOKIE_Read).
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsICookieService> cookieService = do_GetService(NS_COOKIESERVICE_CONTRACTID, &rv);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
COOKIE_Read();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsCookieManager::RemoveAll()
|
||||
{
|
||||
::COOKIE_RemoveAll();
|
||||
::COOKIE_Write();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsCookieManager::GetEnumerator(nsISimpleEnumerator **entries)
|
||||
{
|
||||
*entries = nsnull;
|
||||
|
||||
nsCookieEnumerator* cookieEnum = new nsCookieEnumerator();
|
||||
if (!cookieEnum) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
NS_ADDREF(cookieEnum);
|
||||
*entries = cookieEnum;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsCookieManager::Add(const nsACString &aDomain,
|
||||
const nsACString &aPath,
|
||||
const nsACString &aName,
|
||||
const nsACString &aValue,
|
||||
PRBool aIsSecure,
|
||||
PRInt32 aExpires)
|
||||
{
|
||||
cookie_CookieStruct *cookie = new cookie_CookieStruct;
|
||||
if (!cookie) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
nsInt64 currentTime = NOW_IN_SECONDS;
|
||||
cookie->host = aDomain;
|
||||
cookie->path = aPath;
|
||||
cookie->name = aName;
|
||||
cookie->cookie = aValue;
|
||||
cookie->expires = nsInt64(aExpires);
|
||||
cookie->lastAccessed = currentTime;
|
||||
cookie->isSession = PR_FALSE;
|
||||
cookie->isSecure = aIsSecure;
|
||||
cookie->isDomain = PR_TRUE;
|
||||
cookie->status = nsICookie::STATUS_UNKNOWN;
|
||||
cookie->policy = nsICookie::POLICY_UNKNOWN;
|
||||
|
||||
nsresult rv = COOKIE_Add(cookie, currentTime, nsnull, kCookieHeader);
|
||||
if (NS_FAILED(rv)) {
|
||||
delete cookie;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsCookieManager::Remove(const nsACString& host,
|
||||
const nsACString& name,
|
||||
const nsACString& path,
|
||||
PRBool blocked)
|
||||
{
|
||||
::COOKIE_Remove(host, name, path, blocked);
|
||||
return NS_OK;
|
||||
}
|
||||
@ -1,65 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape 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/NPL/
|
||||
*
|
||||
* 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 NPL, 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 NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef nsCookieManager_h__
|
||||
#define nsCookieManager_h__
|
||||
|
||||
#include "nsICookieManager2.h"
|
||||
#include "nsWeakReference.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class nsCookieManager : public nsICookieManager2,
|
||||
public nsSupportsWeakReference {
|
||||
public:
|
||||
|
||||
// nsISupports
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSICOOKIEMANAGER
|
||||
NS_DECL_NSICOOKIEMANAGER2
|
||||
|
||||
nsCookieManager();
|
||||
virtual ~nsCookieManager(void);
|
||||
nsresult Init();
|
||||
|
||||
};
|
||||
|
||||
// {AAAB6710-0F2C-11d5-A53B-0010A401EB10}
|
||||
#define NS_COOKIEMANAGER_CID {0xaaab6710,0xf2c,0x11d5,{0xa5,0x3b,0x0,0x10,0xa4,0x1,0xeb,0x10}}
|
||||
|
||||
#endif /* nsCookieManager_h__ */
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,115 +0,0 @@
|
||||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape 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/NPL/
|
||||
*
|
||||
* 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 NPL, 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 NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef COOKIES_H
|
||||
#define COOKIES_H
|
||||
|
||||
#include "nsCookie.h"
|
||||
#include "nsString.h"
|
||||
#include "nsInt64.h"
|
||||
#include "prtime.h"
|
||||
#include "nsVoidArray.h"
|
||||
#include "nsIURI.h"
|
||||
#include "nsIHttpChannel.h"
|
||||
#include "nsIDOMWindowInternal.h"
|
||||
|
||||
// XXX these casts and constructs are horrible, but our nsInt64/nsTime
|
||||
// classes are lacking so we need them for now. see bug 198694.
|
||||
#define USEC_PER_SEC (nsInt64(PRInt32(1000000)))
|
||||
#define NOW_IN_SECONDS (nsInt64(PR_Now()) / USEC_PER_SEC)
|
||||
|
||||
// main cookie storage struct
|
||||
typedef struct _cookie_CookieStruct {
|
||||
nsCString path;
|
||||
nsCString host;
|
||||
nsCString name;
|
||||
nsCString cookie;
|
||||
PRInt64 expires;
|
||||
PRInt64 lastAccessed;
|
||||
PRPackedBool isSession;
|
||||
PRPackedBool isSecure;
|
||||
PRPackedBool isDomain;
|
||||
nsCookieStatus status;
|
||||
nsCookiePolicy policy;
|
||||
} cookie_CookieStruct;
|
||||
|
||||
// define logging macros for convenience
|
||||
#define SET_COOKIE PR_TRUE
|
||||
#define GET_COOKIE PR_FALSE
|
||||
|
||||
// logging handlers
|
||||
#ifdef MOZ_LOGGING
|
||||
// in order to do logging, the following environment variables need to be set:
|
||||
//
|
||||
// set NSPR_LOG_MODULES=cookie:3 -- shows rejected cookies
|
||||
// set NSPR_LOG_MODULES=cookie:4 -- shows accepted and rejected cookies
|
||||
// set NSPR_LOG_FILE=c:\cookie.log
|
||||
//
|
||||
// this next define has to appear before the include of prlog.h
|
||||
#define FORCE_PR_LOG /* Allow logging in the release build */
|
||||
#include "prlog.h"
|
||||
#endif
|
||||
|
||||
#ifdef PR_LOGGING
|
||||
#define COOKIE_LOGFAILURE(a, b, c, d) cookie_LogFailure(a, b, c, d)
|
||||
#define COOKIE_LOGSUCCESS(a, b, c, d) cookie_LogSuccess(a, b, c, d)
|
||||
|
||||
extern void cookie_LogFailure(PRBool aSetCookie, nsIURI *aHostURI, const char *aCookieString, const char *aReason);
|
||||
extern void cookie_LogSuccess(PRBool aSetCookie, nsIURI *aHostURI, const char *aCookieString, cookie_CookieStruct *aCookie);
|
||||
extern void cookie_LogFailure(PRBool aSetCookie, nsIURI *aHostURI, const nsAFlatCString &aCookieString, const char *aReason);
|
||||
extern void cookie_LogSuccess(PRBool aSetCookie, nsIURI *aHostURI, const nsAFlatCString &aCookieString, cookie_CookieStruct *aCookie);
|
||||
#else
|
||||
#define COOKIE_LOGFAILURE(a, b, c, d) /* nothing */
|
||||
#define COOKIE_LOGSUCCESS(a, b, c, d) /* nothing */
|
||||
#endif
|
||||
|
||||
// function prototypes
|
||||
extern nsresult COOKIE_Read();
|
||||
extern nsresult COOKIE_Write();
|
||||
extern void COOKIE_RemoveExpiredCookies(nsInt64 aCurrentTime, PRInt32 &aOldestPosition);
|
||||
extern char * COOKIE_GetCookie(nsIURI *aHostURI, nsIURI *aFirstURI, nsIChannel *aChannel);
|
||||
extern void COOKIE_SetCookie(nsIURI *aHostURI, nsIURI *aFirstURI, nsIPrompt *aPrompt, const char *aCookieHeader, const char *aServerTime, nsIChannel *aChannel);
|
||||
extern void COOKIE_RemoveAll();
|
||||
extern void COOKIE_Remove(const nsACString &host, const nsACString &name, const nsACString &path, PRBool blocked);
|
||||
extern nsresult COOKIE_Add(cookie_CookieStruct *aCookie, nsInt64 aCurrentTime, nsIURI *aHostURI, const char *aCookieHeader);
|
||||
extern already_AddRefed<nsICookie> COOKIE_ChangeFormat(cookie_CookieStruct *aCookie);
|
||||
|
||||
// constants & variables
|
||||
extern nsVoidArray *sCookieList;
|
||||
|
||||
#endif /* COOKIES_H */
|
||||
Loading…
Reference in New Issue
Block a user