ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Make sure not to overwrite any caller supplied authorization header.

This commit is contained in:
Hans Leidekker 2008-02-01 14:40:15 +01:00 committed by Alexandre Julliard
parent 9bf3355a11
commit b069ef4268
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/wininet/http.c
View File

@ -1187,9 +1187,11 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin )
* *
* Insert or delete the authorization field in the request header. * Insert or delete the authorization field in the request header.
*/ */
static BOOL HTTP_InsertAuthorizationForHeader( LPWININETHTTPREQW lpwhr, struct HttpAuthInfo *pAuthInfo, LPCWSTR header ) static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR header, BOOL first )
{ {
WCHAR *authorization = NULL; WCHAR *authorization = NULL;
struct HttpAuthInfo *pAuthInfo = lpwhr->pAuthInfo;
DWORD flags;
if (pAuthInfo && pAuthInfo->auth_data_len) if (pAuthInfo && pAuthInfo->auth_data_len)
{ {
@ -1222,34 +1224,16 @@ static BOOL HTTP_InsertAuthorizationForHeader( LPWININETHTTPREQW lpwhr, struct H
TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); TRACE("Inserting authorization: %s\n", debugstr_w(authorization));
HTTP_ProcessHeader(lpwhr, header, authorization, /* make sure not to overwrite any caller supplied authorization header */
HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); flags = HTTP_ADDHDR_FLAG_REQ;
flags |= first ? HTTP_ADDHDR_FLAG_ADD_IF_NEW : HTTP_ADDHDR_FLAG_REPLACE;
HTTP_ProcessHeader(lpwhr, header, authorization, flags);
HeapFree(GetProcessHeap(), 0, authorization); HeapFree(GetProcessHeap(), 0, authorization);
return TRUE; return TRUE;
} }
/***********************************************************************
* HTTP_InsertAuthorization
*
* Insert the authorization field in the request header
*/
static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr )
{
return HTTP_InsertAuthorizationForHeader(lpwhr, lpwhr->pAuthInfo, szAuthorization);
}
/***********************************************************************
* HTTP_InsertProxyAuthorization
*
* Insert the proxy authorization field in the request header
*/
static BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr )
{
return HTTP_InsertAuthorizationForHeader(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization);
}
/*********************************************************************** /***********************************************************************
* HTTP_DealWithProxy * HTTP_DealWithProxy
*/ */
@ -2621,8 +2605,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose,
HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE);
HTTP_InsertAuthorization(lpwhr); HTTP_InsertAuthorization(lpwhr, szAuthorization, !loop_next);
HTTP_InsertProxyAuthorization(lpwhr); HTTP_InsertAuthorization(lpwhr, szProxy_Authorization, !loop_next);
/* add the headers the caller supplied */ /* add the headers the caller supplied */
if( lpszHeaders && dwHeaderLength ) if( lpszHeaders && dwHeaderLength )

5
dlls/wininet/tests/http.c
View File

@ -1502,7 +1502,10 @@ static void test_header_handling_order(int port)
request = HttpOpenRequest(connect, NULL, "/test3", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); request = HttpOpenRequest(connect, NULL, "/test3", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0);
ok(request != NULL, "HttpOpenRequest failed\n"); ok(request != NULL, "HttpOpenRequest failed\n");
ret = HttpSendRequest(request, authorization, ~0UL, NULL, 0); ret = HttpAddRequestHeaders(request, authorization, ~0UL, HTTP_ADDREQ_FLAG_ADD);
ok(ret, "HttpAddRequestHeaders failed\n");
ret = HttpSendRequest(request, NULL, 0, NULL, 0);
ok(ret, "HttpSendRequest failed\n"); ok(ret, "HttpSendRequest failed\n");
status = 0; status = 0;