Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-30 01:59:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes bug 286803 "Automatic NTLM auth fails if SSPI 'negotiate' package not found" r=biesi

Browse Source
This commit is contained in:
darin%meer.net 2005-08-09 23:06:58 +00:00
parent 8491ae3ac5
commit a941f5eca5
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/auth/nsAuthSSPI.cpp
View File

@ -84,7 +84,6 @@ static const char *MapErrorCode(int rc)
//-----------------------------------------------------------------------------
static HINSTANCE sspi_lib;
static ULONG sspi_maxTokenLen;
static PSecurityFunctionTable sspi;
static nsresult
@ -114,14 +113,6 @@ InitSSPI()
return NS_ERROR_UNEXPECTED;
}
PSecPkgInfo pinfo;
int rc = (sspi->QuerySecurityPackageInfo)("Negotiate", &pinfo);
if (rc != SEC_E_OK) {
LOG(("Negotiate package not found"));
return NS_ERROR_UNEXPECTED;
}
sspi_maxTokenLen = pinfo->cbMaxToken;
return NS_OK;
}
@ -145,7 +136,14 @@ MakeSN(const char *principal, nsCString &result)
if (NS_FAILED(rv))
return rv;
// This should always hit our DNS cache
// This could be expensive if our DNS cache cannot satisfy the request.
// However, we should have at least hit the OS resolver once prior to
// reaching this code, so provided the OS resolver has this information
// cached, we should not have to worry about blocking on this function call
// for very long. NOTE: because we ask for the canonical hostname, we
// might end up requiring extra network activity in cases where the OS
// resolver might not have enough information to satisfy the request from
// its cache. This is not an issue in versions of Windows up to WinXP.
nsCOMPtr<nsIDNSRecord> record;
rv = dns->Resolve(Substring(buf, index + 1),
nsIDNSService::RESOLVE_CANONICAL_NAME,
@ -166,6 +164,7 @@ MakeSN(const char *principal, nsCString &result)
nsNegotiateAuth::nsNegotiateAuth(PRBool useNTLM)
: mServiceFlags(REQ_DEFAULT)
, mMaxTokenLen(0)
, mUseNTLM(useNTLM)
{
memset(&mCred, 0, sizeof(mCred));
@ -233,9 +232,19 @@ nsNegotiateAuth::Init(const char *serviceName,
mServiceFlags = serviceFlags;
}
TimeStamp useBefore;
SECURITY_STATUS rc;
PSecPkgInfo pinfo;
rc = (sspi->QuerySecurityPackageInfo)(package, &pinfo);
if (rc != SEC_E_OK) {
LOG(("%s package not found\n", package));
return NS_ERROR_UNEXPECTED;
}
mMaxTokenLen = pinfo->cbMaxToken;
(sspi->FreeContextBuffer)(pinfo);
TimeStamp useBefore;
rc = (sspi->AcquireCredentialsHandle)(NULL,
package,
SECPKG_CRED_OUTBOUND,
@ -298,7 +307,7 @@ nsNegotiateAuth::GetNextToken(const void *inToken,
obd.cBuffers = 1;
obd.pBuffers = &ob;
ob.BufferType = SECBUFFER_TOKEN;
ob.cbBuffer = sspi_maxTokenLen;
ob.cbBuffer = mMaxTokenLen;
ob.pvBuffer = nsMemory::Alloc(ob.cbBuffer);
if (!ob.pvBuffer)
return NS_ERROR_OUT_OF_MEMORY;

1
extensions/auth/nsAuthSSPI.h
View File

@ -74,6 +74,7 @@ private:
CtxtHandle mCtxt;
nsCString mServiceName;
PRUint32 mServiceFlags;
PRUint32 mMaxTokenLen;
PRBool mUseNTLM;
};