Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nsJARChannel now gets its owner from the underlying nsJAR, for the correct security level. bug=7270 r=norris

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@59133 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mstoltz%netscape.com 2000-01-29 00:06:15 +00:00
parent cbd5ead858
commit d4d5e38b63
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/modules/libjar/nsJARChannel.cpp
View File

@ -28,6 +28,7 @@
#include "nsIMIMEService.h"
#include "nsAutoLock.h"
#include "nsIFileStreams.h"
#include "nsIPrincipal.h"
static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
@ -545,6 +546,17 @@ nsJARChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
NS_IMETHODIMP
nsJARChannel::GetOwner(nsISupports* *aOwner)
{
if (!mOwner)
{
nsIPrincipal* principal;
nsresult rv = mJAR->GetPrincipal(mJAREntry, &principal);
if (NS_SUCCEEDED(rv) && principal)
mOwner = do_QueryInterface(principal);
else
mOwner = null_nsCOMPtr();
NS_IF_RELEASE(principal);
}
*aOwner = mOwner.get();
NS_IF_ADDREF(*aOwner);
return NS_OK;

12
mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp
View File

@ -28,6 +28,7 @@
#include "nsIMIMEService.h"
#include "nsAutoLock.h"
#include "nsIFileStreams.h"
#include "nsIPrincipal.h"
static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
@ -545,6 +546,17 @@ nsJARChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
NS_IMETHODIMP
nsJARChannel::GetOwner(nsISupports* *aOwner)
{
if (!mOwner)
{
nsIPrincipal* principal;
nsresult rv = mJAR->GetPrincipal(mJAREntry, &principal);
if (NS_SUCCEEDED(rv) && principal)
mOwner = do_QueryInterface(principal);
else
mOwner = null_nsCOMPtr();
NS_IF_RELEASE(principal);
}
*aOwner = mOwner.get();
NS_IF_ADDREF(*aOwner);
return NS_OK;