Jacek Caban : wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetSetCookieEx.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 4 14:07:33 CDT 2014
Module: wine
Branch: master
Commit: 314e295820660a2aa325e0dbc244dc7990514b86
URL: http://source.winehq.org/git/wine.git/?a=commit;h=314e295820660a2aa325e0dbc244dc7990514b86
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Jul 4 14:45:26 2014 +0200
wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetSetCookieEx.
---
dlls/wininet/cookie.c | 24 ++++++++++++++++--------
dlls/wininet/http.c | 2 +-
dlls/wininet/internet.h | 2 +-
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c
index 015f99d..36e0f60 100644
--- a/dlls/wininet/cookie.c
+++ b/dlls/wininet/cookie.c
@@ -810,7 +810,7 @@ BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 )
return TRUE;
}
-DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data)
+DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_name, const WCHAR *cookie_data, DWORD flags)
{
cookie_domain *thisCookieDomain = NULL;
cookie *thisCookie;
@@ -819,7 +819,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook
WCHAR *ptr;
FILETIME expiry, create;
BOOL expired = FALSE, update_persistent = FALSE;
- DWORD flags = 0;
+ DWORD cookie_flags = 0;
value = data = heap_strdupW(cookie_data);
if (!data)
@@ -910,7 +910,15 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook
}
else if (strncmpiW(ptr, szHttpOnly, 8) == 0)
{
- FIXME("httponly not handled (%s)\n",debugstr_w(ptr));
+ if(!(flags & INTERNET_COOKIE_HTTPONLY)) {
+ WARN("HTTP only cookie added without INTERNET_COOKIE_HTTPONLY flag\n");
+ heap_free(data);
+ if (value != data) heap_free(value);
+ SetLastError(ERROR_INVALID_OPERATION);
+ return COOKIE_STATE_REJECT;
+ }
+
+ cookie_flags |= INTERNET_COOKIE_HTTPONLY;
ptr += strlenW(szHttpOnly);
}
else if (*ptr)
@@ -946,7 +954,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook
}
if(!expiry.dwLowDateTime && !expiry.dwHighDateTime)
- flags |= INTERNET_COOKIE_IS_SESSION;
+ cookie_flags |= INTERNET_COOKIE_IS_SESSION;
else
update_persistent = TRUE;
@@ -960,7 +968,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook
TRACE("setting cookie %s=%s for domain %s path %s\n", debugstr_w(cookie_name),
debugstr_w(value), debugstr_w(thisCookieDomain->lpCookieDomain),debugstr_w(thisCookieDomain->lpCookiePath));
- if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name, value, expiry, create, flags))
+ if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name, value, expiry, create, cookie_flags))
{
heap_free(data);
if (value != data) heap_free(value);
@@ -993,7 +1001,7 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName),
debugstr_w(lpCookieData), flags, reserved);
- if (flags)
+ if (flags & ~INTERNET_COOKIE_HTTPONLY)
FIXME("flags %x not supported\n", flags);
if (!lpszUrl || !lpCookieData)
@@ -1024,12 +1032,12 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
if (!(data = strchrW(cookie, '='))) data = cookie + strlenW(cookie);
else *data++ = 0;
- res = set_cookie(hostName, path, cookie, data);
+ res = set_cookie(hostName, path, cookie, data, flags);
heap_free(cookie);
return res;
}
- return set_cookie(hostName, path, lpszCookieName, lpCookieData);
+ return set_cookie(hostName, path, lpszCookieName, lpCookieData, flags);
}
/***********************************************************************
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index bb53a03..af57d9e 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -767,7 +767,7 @@ static void HTTP_ProcessCookies( http_request_t *request )
continue;
data++;
- set_cookie(host->lpszValue, request->path, name, data);
+ set_cookie(host->lpszValue, request->path, name, data, INTERNET_COOKIE_HTTPONLY);
heap_free(name);
}
}
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 45a13ca..233c40c 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -421,7 +421,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort,
struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN;
DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*) DECLSPEC_HIDDEN;
-DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN;
+DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN;
void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;
DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list