git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-12 12:21:42 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

cookie: avoid saving a cookie file if no transfer was done

Browse Source 
Because parts of the cookie loading happens on transfer start the
in-memory cookie jar risks being incomplete and then a save might
wrongly truncate the target file.

Added test 1902 to verify.

Reported-by: divinity76 on github
Fixes #18621
Closes #18622
This commit is contained in:
Daniel Stenberg 2025-09-19 15:59:57 +02:00
parent 1055864b03
commit fd6eb8d6e7
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
5 changed files with 99 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cookie.c
View File

@ -1658,18 +1658,18 @@ void Curl_flush_cookies(struct Curl_easy *data, bool cleanup)
{
CURLcode res;
if(data->set.str[STRING_COOKIEJAR]) {
Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
/* only save the cookie file if a transfer was started (data->state.url is
set), as otherwise the cookies were not completely initialized and there
might be cookie files that weren't loaded so saving the file is the wrong
thing. */
if(data->set.str[STRING_COOKIEJAR] && data->state.url) {
/* if we have a destination file for all the cookies to get dumped to */
res = cookie_output(data, data->cookies, data->set.str[STRING_COOKIEJAR]);
if(res)
infof(data, "WARNING: failed to save cookies in %s: %s",
data->set.str[STRING_COOKIEJAR], curl_easy_strerror(res));
}
else {
Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
}
if(cleanup && (!data->share || (data->cookies != data->share->cookies))) {
Curl_cookie_cleanup(data->cookies);

2
tests/data/Makefile.am
View File

@ -232,7 +232,7 @@ test1708 test1709 test1710 \
\
test1800 test1801 \
\
test1900 test1901 test1903 test1904 test1905 test1906 test1907 \
test1900 test1901 test1902 test1903 test1904 test1905 test1906 test1907 \
test1908 test1909 test1910 test1911 test1912 test1913 test1914 test1915 \
test1916 test1917 test1918 test1919 \
\

43
tests/data/test1902 Normal file
View File

@ -0,0 +1,43 @@
<testcase>
<info>
<keywords>
cookies
</keywords>
</info>
# Client-side
<client>
<name>
set COOKIEFILE and COOKIEJAR but make no transfer
</name>
<features>
cookies
</features>
<tool>
lib%TESTNUMBER
</tool>
<command>
%LOGDIR/cookie%TESTNUMBER
</command>
<file name="%LOGDIR/cookie%TESTNUMBER">
# Netscape HTTP Cookie File
# https://curl.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.
example.com FALSE / FALSE 0 has_js 1
</file>
</client>
# Verify data after the test has been "shot"
<verify>
<file name="%LOGDIR/cookie%TESTNUMBER">
# Netscape HTTP Cookie File
# https://curl.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.
example.com FALSE / FALSE 0 has_js 1
</file>
</verify>
</testcase>

2
tests/libtest/Makefile.inc
View File

@ -90,7 +90,7 @@ TESTS_C = \
lib1591.c lib1592.c lib1593.c lib1594.c lib1597.c \
lib1598.c lib1599.c \
lib1662.c \
lib1900.c lib1901.c lib1903.c lib1905.c lib1906.c lib1907.c \
lib1900.c lib1901.c lib1902.c lib1903.c lib1905.c lib1906.c lib1907.c \
lib1908.c lib1910.c lib1911.c lib1912.c lib1913.c \
lib1915.c lib1916.c lib1918.c lib1919.c \
lib1933.c lib1934.c lib1935.c lib1936.c lib1937.c lib1938.c lib1939.c \

48
tests/libtest/lib1902.c Normal file
View File

@ -0,0 +1,48 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at https://curl.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "first.h"
#include "memdebug.h"
static CURLcode test_lib1902(const char *URL)
{
CURLcode res = CURLE_OK;
CURL *curl;
curl_global_init(CURL_GLOBAL_ALL);
curl = curl_easy_init();
if(curl) {
easy_setopt(curl, CURLOPT_COOKIEFILE, URL);
easy_setopt(curl, CURLOPT_COOKIEJAR, URL);
/* Do not perform any actual network operation,
the issue occur when not calling curl.*perform */
}
test_cleanup:
curl_easy_cleanup(curl);
curl_global_cleanup();
return res;
}