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

winhttp: Allow setting NULL username and password for NTLM, Passport and Negotiate.

This commit is contained in:
Hans Leidekker 2013-08-19 15:52:25 +02:00 committed by Alexandre Julliard
parent 368cff7a59
commit 78fc21cdb5
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/winhttp/request.c
View File

@ -1668,7 +1668,8 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla
static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, const WCHAR *username,
const WCHAR *password )
{
if (!username || !password)
if ((scheme == WINHTTP_AUTH_SCHEME_BASIC || scheme == WINHTTP_AUTH_SCHEME_DIGEST) &&
(!username || !password))
{
set_last_error( ERROR_INVALID_PARAMETER );
return FALSE;
@ -1678,17 +1679,23 @@ static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, con
case WINHTTP_AUTH_TARGET_SERVER:
{
heap_free( request->connect->username );
if (!(request->connect->username = strdupW( username ))) return FALSE;
if (!username) request->connect->username = NULL;
else if (!(request->connect->username = strdupW( username ))) return FALSE;
heap_free( request->connect->password );
if (!(request->connect->password = strdupW( password ))) return FALSE;
if (!password) request->connect->password = NULL;
else if (!(request->connect->password = strdupW( password ))) return FALSE;
break;
}
case WINHTTP_AUTH_TARGET_PROXY:
{
heap_free( request->connect->session->proxy_username );
if (!(request->connect->session->proxy_username = strdupW( username ))) return FALSE;
if (!username) request->connect->session->proxy_username = NULL;
else if (!(request->connect->session->proxy_username = strdupW( username ))) return FALSE;
heap_free( request->connect->session->proxy_password );
if (!(request->connect->session->proxy_password = strdupW( password ))) return FALSE;
if (!password) request->connect->session->proxy_password = NULL;
else if (!(request->connect->session->proxy_password = strdupW( password ))) return FALSE;
break;
}
default:

21
dlls/winhttp/tests/winhttp.c
View File

@ -1959,6 +1959,27 @@ static void test_basic_authentication(int port)
ok(ret, "failed to query status code %u\n", GetLastError());
ok(status == 401, "request failed unexpectedly %u\n", status);
ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL);
ok(ret, "failed to set credentials %u\n", GetLastError());
ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_PASSPORT, NULL, NULL, NULL);
ok(ret, "failed to set credentials %u\n", GetLastError());
ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NEGOTIATE, NULL, NULL, NULL);
ok(ret, "failed to set credentials %u\n", GetLastError());
SetLastError(0xdeadbeef);
ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_DIGEST, NULL, NULL, NULL);
error = GetLastError();
ok(!ret, "expected failure\n");
ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error);
SetLastError(0xdeadbeef);
ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, NULL, NULL);
error = GetLastError();
ok(!ret, "expected failure\n");
ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error);
SetLastError(0xdeadbeef);
ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, NULL, NULL);
error = GetLastError();