Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 312124: Make Subsume treat about:blank principals as being weaker than other, non-about:blank principals, since that's how other code treats them. r=caillon sr=brendan

Browse Source
This commit is contained in:
mrbkap%gmail.com 2005-10-14 18:57:26 +00:00
parent ed10075fa8
commit ca23c546c9
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
caps/src/nsPrincipal.cpp
View File

@ -1,4 +1,5 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 sw=2 et tw=80: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@ -277,6 +278,32 @@ nsPrincipal::Equals(nsIPrincipal *aOther, PRBool *aResult)
NS_IMETHODIMP
nsPrincipal::Subsumes(nsIPrincipal *aOther, PRBool *aResult)
{
// First, check if aOther is an about:blank principal. If it is, then we can
// subsume it.
nsCOMPtr<nsIURI> otherOrigin;
aOther->GetURI(getter_AddRefs(otherOrigin));
if (otherOrigin) {
PRBool isAbout = PR_FALSE;
if (NS_SUCCEEDED(otherOrigin->SchemeIs("about", &isAbout)) && isAbout) {
nsCAutoString str;
otherOrigin->GetSpec(str);
// Note: about:blank principals do not necessarily subsume about:blank
// principals (unless aOther == this, which is checked in the Equals call
// below).
if (str.Equals("about:blank")) {
PRBool isEqual = PR_FALSE;
if (NS_SUCCEEDED(otherOrigin->Equals(mCodebase, &isEqual)) && !isEqual) {
*aResult = PR_TRUE;
return NS_OK;
}
}
}
}
return Equals(aOther, aResult);
}