wininet: Fix basic authentication by putting Basic directing into the scheme…

wininet: Fix basic authentication by putting Basic directing into the scheme field, as the pszAuthValue can have an optional realm string appended.

wininet: Fix basic authentication by putting Basic directing into the scheme…
4d1b8b1a · Rob Shearman · Alexandre Julliard · 77440b09 · 4d1b8b1a
Commit 4d1b8b1a authored May 25, 2007 by Rob Shearman Committed by Alexandre Julliard May 29, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 7 deletions

http.c dlls/wininet/http.c +18 -7

No files found.
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -440,12 +440,6 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue 
        if (!pAuthInfo)
            return FALSE;

-        pAuthInfo->scheme = WININET_strdupW(pszAuthValue);
-        if (!pAuthInfo->scheme)
-        {
-            HeapFree(GetProcessHeap(), 0, pAuthInfo);
-            return FALSE;
-        }
        SecInvalidateHandle(&pAuthInfo->cred);
        SecInvalidateHandle(&pAuthInfo->ctx);
        memset(&pAuthInfo->exp, 0, sizeof(pAuthInfo->exp));
@@ -454,12 +448,29 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue 
        pAuthInfo->auth_data_len = 0;
        pAuthInfo->finished = FALSE;

-        if (!is_basic_auth_value(pszAuthValue))
+        if (is_basic_auth_value(pszAuthValue))
+        {
+            static const WCHAR szBasic[] = {'B','a','s','i','c',0};
+            pAuthInfo->scheme = WININET_strdupW(szBasic);
+            if (!pAuthInfo->scheme)
+            {
+                HeapFree(GetProcessHeap(), 0, pAuthInfo);
+                return FALSE;
+            }
+        }
+        else
        {
            SEC_WINNT_AUTH_IDENTITY_W nt_auth_identity;
            WCHAR *user = strchrW(domain_and_username, '\\');
            WCHAR *domain = domain_and_username;

+            pAuthInfo->scheme = WININET_strdupW(pszAuthValue);
+            if (!pAuthInfo->scheme)
+            {
+                HeapFree(GetProcessHeap(), 0, pAuthInfo);
+                return FALSE;
+            }
+
            if (user) user++;
            else
            {