Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the less powerful of the available principals when compiling and running code passed into setTimeout. With this fix, chrome that attempts to setTimeout("code that requires chrome privs") on a content window will find that its code is run in the window's principals. bug 330773, r=jst sr=bzbarsky

Browse Source
This commit is contained in:
mrbkap%gmail.com 2006-03-24 18:49:18 +00:00
parent 4a0fe1ed17
commit c9160b7855
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom/src/base/nsGlobalWindow.cpp
View File

@ -5866,16 +5866,38 @@ nsGlobalWindow::SetTimeoutOrInterval(PRBool aIsInterval, PRInt32 *aReturn)
timeout->mVersion = ::JS_VersionToString(::JS_GetVersion(cx));
// Get principal of currently executing code, save for execution of timeout
rv = sSecMan->GetSubjectPrincipal(getter_AddRefs(timeout->mPrincipal));
// Get principal of currently executing code, save for execution of timeout.
// If either our principals subsume the subject principal, or we're from the
// same origin, then use the subject principal. Otherwise, use our principal
// to avoid running script in elevated principals.
nsCOMPtr<nsIPrincipal> subjectPrincipal;
rv = sSecMan->GetSubjectPrincipal(getter_AddRefs(subjectPrincipal));
if (NS_FAILED(rv)) {
timeout->Release(scx);
return NS_ERROR_FAILURE;
}
PRBool subsumes = PR_FALSE;
nsCOMPtr<nsIPrincipal> ourPrincipal = GetPrincipal();
// Note the direction of this test: We don't allow chrome setTimeouts on
// content windows, but we do allow content setTimeouts on chrome windows.
rv = ourPrincipal->Subsumes(subjectPrincipal, &subsumes);
NS_ENSURE_SUCCESS(rv, rv);
if (subsumes) {
timeout->mPrincipal = subjectPrincipal;
} else {
// Subsumes does a very strict equality test. Allow sites of the same origin
// to set timeouts on each other.
rv = sSecMan->CheckSameOriginPrincipal(subjectPrincipal, ourPrincipal);
timeout->mPrincipal = NS_SUCCEEDED(rv) ? subjectPrincipal : ourPrincipal;
rv = NS_OK;
}
PRTime delta = (PRTime)interval * PR_USEC_PER_MSEC;
if (!IsFrozen()) {