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

bug 63451 - moved signature verification functions from nsIZipReader to nsIJAR. r=sgehani, sr=shaver

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@87730 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mstoltz%netscape.com
2001-02-23 00:15:04 +00:00
parent e28eb27169
commit 68e9bdd8c0
11 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/caps/src/nsScriptSecurityManager.cpp
View File

@@ -56,6 +56,7 @@
#include "nsDirectoryServiceDefs.h"
#include "nsIFile.h"
#include "nsIZipReader.h"
#include "nsIJAR.h"
#include "nsIPluginInstance.h"
#include "nsIXPConnect.h"
#include "nsIScriptGlobalObject.h"
@@ -366,8 +367,6 @@ nsSecurityNameSet::AddNameSet(nsIScriptContext* aScriptContext)
return NS_OK;
}
/////////////////////////////
// nsScriptSecurityManager //
/////////////////////////////
@@ -399,6 +398,10 @@ SetBit(unsigned char *bitVector, PRInt32 index)
// Methods implementing nsIScriptSecurityManager //
///////////////////////////////////////////////////
static char *domPropNames[] = {
NS_DOM_PROP_NAMES
};
NS_IMETHODIMP
nsScriptSecurityManager::CheckScriptAccess(JSContext *cx,
void *aObj, PRInt32 domPropInt,
@@ -1292,15 +1295,16 @@ nsScriptSecurityManager::SetCanEnableCapability(const char* certificateID,
#endif
systemCertFile->Append("systemSignature.jar");
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
nsCOMPtr<nsIZipReader> systemCertJar;
nsCOMPtr<nsIZipReader> systemCertZip;
rv = nsComponentManager::CreateInstance(kZipReaderCID, nsnull,
NS_GET_IID(nsIZipReader),
getter_AddRefs(systemCertJar));
getter_AddRefs(systemCertZip));
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
systemCertJar->Init(systemCertFile);
rv = systemCertJar->Open();
systemCertZip->Init(systemCertFile);
rv = systemCertZip->Open();
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIJAR> systemCertJar = do_QueryInterface(systemCertZip);
rv = systemCertJar->GetCertificatePrincipal(nsnull,
getter_AddRefs(mSystemCertificate));
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
@@ -1672,12 +1676,6 @@ nsScriptSecurityManager::CheckPermissions(JSContext *aCx, JSObject *aObj,
/*
** Access tests failed, so now report error.
*/
char *str;
if (NS_FAILED(subject->ToUserVisibleString(&str)))
return NS_ERROR_FAILURE;
JS_ReportError(aCx, "access disallowed from scripts at %s to documents "
"at another domain", str);
nsCRT::free(str);
return NS_ERROR_DOM_PROP_ACCESS_DENIED;
}
@@ -1748,10 +1746,6 @@ nsScriptSecurityManager::CheckXPCPermissions(JSContext *aJSContext,
return NS_OK;
}
static char *domPropNames[] = {
NS_DOM_PROP_NAMES
};
struct nsDomainEntry {
nsDomainEntry(const char *anOrigin, const char *aPolicy,
int aPolicyLength)