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

Bug 769283 - Add a separate HTTP auth cache for private channels. r=mayhemer

Browse Source
This commit is contained in:
Josh Matthews
2012-10-29 16:20:03 -04:00
parent 74736c6026
commit c5acc3845e
11 changed files with 115 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -655,6 +655,20 @@ GetJSContextFromNPP(NPP npp)
return GetJSContextFromDoc(doc);
}
static nsresult
GetPrivacyFromNPP(NPP npp, bool* aPrivate)
{
nsCOMPtr<nsIDocument> doc = GetDocumentFromNPP(npp);
NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
nsCOMPtr<nsPIDOMWindow> domwindow = doc->GetWindow();
NS_ENSURE_TRUE(domwindow, NS_ERROR_FAILURE);
nsCOMPtr<nsIDocShell> docShell = domwindow->GetDocShell();
nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
*aPrivate = loadContext && loadContext->UsePrivateBrowsing();
return NS_OK;
}
static NPIdentifier
doGetIdentifier(JSContext *cx, const NPUTF8* name)
{
@@ -2030,16 +2044,12 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
}
case NPNVprivateModeBool: {
nsCOMPtr<nsIDocument> doc = GetDocumentFromNPP(npp);
NS_ENSURE_TRUE(doc, NPERR_GENERIC_ERROR);
nsCOMPtr<nsPIDOMWindow> domwindow = doc->GetWindow();
if (domwindow) {
nsCOMPtr<nsIDocShell> docShell = domwindow->GetDocShell();
nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
*(NPBool*)result = (NPBool)(loadContext && loadContext->UsePrivateBrowsing());
return NPERR_NO_ERROR;
}
return NPERR_GENERIC_ERROR;
bool privacy;
nsresult rv = GetPrivacyFromNPP(npp, &privacy);
if (NS_FAILED(rv))
return NPERR_GENERIC_ERROR;
*(NPBool*)result = (NPBool)privacy;
return NPERR_NO_ERROR;
}
case NPNVdocumentOrigin: {
@@ -2729,12 +2739,15 @@ _getauthenticationinfo(NPP instance, const char *protocol, const char *host,
if (!authManager)
return NPERR_GENERIC_ERROR;
bool authPrivate = false;
GetPrivacyFromNPP(instance, &authPrivate);
nsAutoString unused, uname16, pwd16;
if (NS_FAILED(authManager->GetAuthIdentity(proto, nsDependentCString(host),
port, nsDependentCString(scheme),
nsDependentCString(realm),
EmptyCString(), unused, uname16,
pwd16))) {
pwd16, authPrivate))) {
return NPERR_GENERIC_ERROR;
}