Skip to content

Commit a232a56

Browse files
monneratmonnerat
committed
mime: explicitly rewind subparts at attachment time.
Subparts may have been previously used as a top-level mime structure and thus not rewound. New test 695 checks the proper functioning in these particular conditions. Reported-by: Qriist on github Fixes curl#15842
1 parent f62be9c commit a232a56

File tree

5 files changed

+205
-2
lines changed

5 files changed

+205
-2
lines changed

‎lib/mime.c

+8
Original file line numberDiff line numberDiff line change
@@ -1561,6 +1561,14 @@ CURLcode Curl_mime_set_subparts(curl_mimepart *part,
15611561
}
15621562
}
15631563

1564+
/* If subparts have already been used as a top-level MIMEPOST,
1565+
they might not be positioned at start. Rewind them now, as
1566+
a future check while rewinding the parent may cause this
1567+
content to be skipped. */
1568+
if(mime_subparts_seek(subparts, (curl_off_t) 0, SEEK_SET) !=
1569+
CURL_SEEKFUNC_OK)
1570+
return CURLE_SEND_FAIL_REWIND;
1571+
15641572
subparts->parent = part;
15651573
/* Subparts are processed internally: no read callback. */
15661574
part->seekfunc = mime_subparts_seek;

‎tests/data/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ test652 test653 test654 test655 test656 test658 test659 test660 test661 \
101101
test662 test663 test664 test665 test666 test667 test668 test669 test670 \
102102
test671 test672 test673 test674 test675 test676 test677 test678 test679 \
103103
test680 test681 test682 test683 test684 test685 test686 test687 test688 \
104-
test689 test690 test691 test692 test693 test694 \
104+
test689 test690 test691 test692 test693 test694 test695 \
105105
\
106106
test700 test701 test702 test703 test704 test705 test706 test707 test708 \
107107
test709 test710 test711 test712 test713 test714 test715 test716 test717 \

‎tests/data/test695

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<testcase>
2+
<info>
3+
<keywords>
4+
MIME
5+
</keywords>
6+
</info>
7+
# Server-side
8+
<reply>
9+
<data nocheck="yes">
10+
HTTP/1.0 200 OK swsclose
11+
Date: Tue, 09 Nov 2010 14:49:00 GMT
12+
Server: test-server/fake
13+
14+
blablabla
15+
16+
</data>
17+
</reply>
18+
19+
# Client-side
20+
<client>
21+
<features>
22+
Mime
23+
</features>
24+
<server>
25+
http
26+
</server>
27+
<tool>
28+
lib%TESTNUMBER
29+
</tool>
30+
31+
<name>
32+
MIME parts reuse as a child part
33+
</name>
34+
<command>
35+
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
36+
</command>
37+
</client>
38+
39+
# Verify data after the test has been "shot"
40+
<verify>
41+
<strippart>
42+
s/^--------------------------[A-Za-z0-9]*/------------------------------/
43+
s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
44+
</strippart>
45+
<protocol>
46+
POST /we/want/%TESTNUMBER HTTP/1.1
47+
Host: %HOSTIP:%HTTPPORT
48+
Accept: */*
49+
Content-Length: 196
50+
Content-Type: multipart/form-data; boundary=----------------------------
51+
52+
------------------------------
53+
Content-Disposition: form-data; name="data"
54+
Content-Type: text/html
55+
56+
<title>hello</title>
57+
--------------------------------
58+
POST /we/want/%TESTNUMBER HTTP/1.1
59+
Host: %HOSTIP:%HTTPPORT
60+
Accept: */*
61+
Content-Length: 423
62+
Content-Type: multipart/form-data; boundary=----------------------------
63+
64+
------------------------------
65+
Content-Disposition: form-data
66+
Content-Type: multipart/mixed; boundary=----------------------------
67+
68+
------------------------------
69+
Content-Disposition: attachment; name="data"
70+
Content-Type: text/html
71+
72+
<title>hello</title>
73+
--------------------------------
74+
75+
--------------------------------
76+
</protocol>
77+
</verify>
78+
</testcase>

‎tests/libtest/Makefile.inc

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq \
4848
lib599 \
4949
lib643 lib645 lib650 lib651 lib652 lib653 lib654 lib655 lib658 \
5050
lib659 lib661 lib666 lib667 lib668 \
51-
lib670 lib671 lib672 lib673 lib674 lib676 lib677 lib678 lib694 \
51+
lib670 lib671 lib672 lib673 lib674 lib676 lib677 lib678 lib694 lib695 \
5252
lib1156 \
5353
lib1301 \
5454
lib1485 \
@@ -340,6 +340,8 @@ lib678_LDADD = $(TESTUTIL_LIBS)
340340

341341
lib694_SOURCES = lib694.c $(SUPPORTFILES)
342342

343+
lib695_SOURCES = lib695.c $(SUPPORTFILES)
344+
343345
lib1301_SOURCES = lib1301.c $(SUPPORTFILES) $(TESTUTIL)
344346
lib1301_LDADD = $(TESTUTIL_LIBS)
345347

‎tests/libtest/lib695.c

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/***************************************************************************
2+
* _ _ ____ _
3+
* Project ___| | | | _ \| |
4+
* / __| | | | |_) | |
5+
* | (__| |_| | _ <| |___
6+
* \___|\___/|_| \_\_____|
7+
*
8+
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
9+
*
10+
* This software is licensed as described in the file COPYING, which
11+
* you should have received as part of this distribution. The terms
12+
* are also available at https://curl.se/docs/copyright.html.
13+
*
14+
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
15+
* copies of the Software, and permit persons to whom the Software is
16+
* furnished to do so, under the terms of the COPYING file.
17+
*
18+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19+
* KIND, either express or implied.
20+
*
21+
* SPDX-License-Identifier: curl
22+
*
23+
***************************************************************************/
24+
#include "test.h"
25+
26+
#include "memdebug.h"
27+
28+
29+
/* write callback that does nothing */
30+
static size_t write_it(char *ptr, size_t size, size_t nmemb, void *userdata)
31+
{
32+
(void) ptr;
33+
(void) userdata;
34+
return size * nmemb;
35+
}
36+
37+
CURLcode test(char *URL)
38+
{
39+
CURL *curl = NULL;
40+
curl_mime *mime1 = NULL;
41+
curl_mime *mime2 = NULL;
42+
curl_mimepart *part;
43+
CURLcode res = TEST_ERR_FAILURE;
44+
45+
/*
46+
* Check proper rewind when reusing a mime structure.
47+
*/
48+
49+
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
50+
fprintf(stderr, "curl_global_init() failed\n");
51+
return TEST_ERR_MAJOR_BAD;
52+
}
53+
54+
curl = curl_easy_init();
55+
56+
/* First set the URL that is about to receive our POST. */
57+
test_setopt(curl, CURLOPT_URL, URL);
58+
59+
/* get verbose debug output please */
60+
test_setopt(curl, CURLOPT_VERBOSE, 1L);
61+
62+
/* Do not write anything. */
63+
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_it);
64+
65+
/* Build the first mime structure. */
66+
mime1 = curl_mime_init(curl);
67+
part = curl_mime_addpart(mime1);
68+
curl_mime_data(part, "<title>hello</title>", CURL_ZERO_TERMINATED);
69+
curl_mime_type(part, "text/html");
70+
curl_mime_name(part, "data");
71+
72+
/* Use first mime structure as top level MIME POST. */
73+
curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime1);
74+
75+
/* Perform the request, res gets the return code */
76+
res = curl_easy_perform(curl);
77+
78+
/* Check for errors */
79+
if(res != CURLE_OK)
80+
fprintf(stderr, "curl_easy_perform() 1 failed: %s\n",
81+
curl_easy_strerror(res));
82+
else {
83+
/* phase two, create a mime struct using the mime1 handle */
84+
mime2 = curl_mime_init(curl);
85+
part = curl_mime_addpart(mime2);
86+
87+
/* use the new mime setup */
88+
curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime2);
89+
90+
/* Reuse previous mime structure as a child. */
91+
res = curl_mime_subparts(part, mime1);
92+
93+
if(res != CURLE_OK)
94+
fprintf(stderr, "curl_mime_subparts() failed: %sn",
95+
curl_easy_strerror(res));
96+
else {
97+
mime1 = NULL;
98+
99+
/* Perform the request, res gets the return code */
100+
res = curl_easy_perform(curl);
101+
102+
/* Check for errors */
103+
if(res != CURLE_OK)
104+
fprintf(stderr, "curl_easy_perform() 2 failed: %s\n",
105+
curl_easy_strerror(res));
106+
}
107+
}
108+
109+
test_cleanup:
110+
curl_easy_cleanup(curl);
111+
curl_mime_free(mime1);
112+
curl_mime_free(mime2);
113+
curl_global_cleanup();
114+
return res;
115+
}

0 commit comments

Comments
 (0)