corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug 30915 using nsAggregatePrincipal. r=norris

Browse Source
This commit is contained in:
mstoltz@netscape.com
2000-03-31 00:31:18 +00:00
parent 662caa4b7f
commit 078db5a68c
7 changed files with 234 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/html/document/src/nsHTMLDocument.cpp
View File

@@ -66,6 +66,7 @@
#include "nsContentList.h"
#include "nsDOMError.h"
#include "nsICodebasePrincipal.h"
#include "nsIAggregatePrincipal.h"
#include "nsIScriptSecurityManager.h"
#include "nsJSUtils.h"
#include "nsDOMPropEnums.h"
@@ -1445,6 +1446,7 @@ NS_IMETHODIMP
nsHTMLDocument::SetDomain(const nsString& aDomain)
{
// Check new domain
nsAutoString current;
if (NS_FAILED(GetDomain(current)))
return NS_ERROR_FAILURE;
@@ -1462,7 +1464,7 @@ nsHTMLDocument::SetDomain(const nsString& aDomain)
// Error: illegal domain
return NS_ERROR_DOM_BAD_DOCUMENT_DOMAIN;
}
// Create new URI
nsCOMPtr<nsIURI> uri;
if (NS_FAILED(GetDomainURI(getter_AddRefs(uri))))
@@ -1487,7 +1489,15 @@ nsHTMLDocument::SetDomain(const nsString& aDomain)
NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
return securityManager->GetCodebasePrincipal(newURI, &mPrincipal);
nsCOMPtr<nsIPrincipal> newCodebase;
rv = securityManager->GetCodebasePrincipal(newURI, getter_AddRefs(newCodebase));
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
nsCOMPtr<nsIAggregatePrincipal> agg = do_QueryInterface(mPrincipal, &rv);
NS_ASSERTION(NS_SUCCEEDED(rv), "Principal not an aggregate.");
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
return agg->SetCodebase(newCodebase);
}
NS_IMETHODIMP