fixes bug 277322 "XMLHttpRequest from chrome fails to prompt when auth needed" r+sr=bzbarsky

This commit is contained in:
darin%meer.net 2005-01-12 03:27:54 +00:00
Родитель 220748d802
Коммит 7360e8f357
1 изменённых файлов: 26 добавлений и 14 удалений

Просмотреть файл

@ -2018,6 +2018,27 @@ SetIdent(nsHttpAuthIdentity &ident,
ident.Set(domain, user, passBuf);
}
// helper function for getting an auth prompt from an interface requestor
static void
GetAuthPrompt(nsIInterfaceRequestor *ifreq, PRBool proxyAuth,
nsIAuthPrompt **result)
{
if (!ifreq)
return;
PRUint32 promptReason;
if (proxyAuth)
promptReason = nsIAuthPromptProvider::PROMPT_PROXY;
else
promptReason = nsIAuthPromptProvider::PROMPT_NORMAL;
nsCOMPtr<nsIAuthPromptProvider> promptProvider = do_GetInterface(ifreq);
if (promptProvider)
promptProvider->GetAuthPrompt(promptReason, result);
else
CallGetInterface(ifreq, result);
}
// generate credentials for the given challenge, and update the auth cache.
nsresult
nsHttpChannel::GenCredsAndSetEntry(nsIHttpAuthenticator *auth,
@ -2465,22 +2486,13 @@ nsHttpChannel::PromptForIdentity(const char *scheme,
// XXX i18n: IDN not supported.
nsCOMPtr<nsIAuthPromptProvider> authPromptProvider;
nsCOMPtr<nsIAuthPrompt> authPrompt;
GetCallback(authPromptProvider);
if (authPromptProvider) {
PRUint32 promptReason;
if (proxyAuth)
promptReason = nsIAuthPromptProvider::PROMPT_PROXY;
else
promptReason = nsIAuthPromptProvider::PROMPT_NORMAL;
authPromptProvider->GetAuthPrompt(promptReason,
getter_AddRefs(authPrompt));
GetAuthPrompt(mCallbacks, proxyAuth, getter_AddRefs(authPrompt));
if (!authPrompt && mLoadGroup) {
nsCOMPtr<nsIInterfaceRequestor> cbs;
mLoadGroup->GetNotificationCallbacks(getter_AddRefs(cbs));
GetAuthPrompt(cbs, proxyAuth, getter_AddRefs(authPrompt));
}
else
GetCallback(authPrompt);
if (!authPrompt)
return NS_ERROR_NO_INTERFACE;