luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tool_cb_hdr: only parse etag + content-disposition for 2xx

Browse Source 
... and ignore them for other response codes.

Reported-by: Harry Sintonen
Closes #12866
This commit is contained in:
Daniel Stenberg 2024-02-05 19:24:50 +01:00
parent 5cc2b016c3
commit 75d79a4486
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/tool_cb_hdr.c
View File

@ -105,12 +105,21 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
(void)fflush(heads->stream); (void)fflush(heads->stream);
} }
curl_easy_getinfo(per->curl, CURLINFO_SCHEME, &scheme);
scheme = proto_token(scheme);
if((scheme == proto_http || scheme == proto_https)) {
long response = 0;
curl_easy_getinfo(per->curl, CURLINFO_RESPONSE_CODE, &response);
if(response/100 != 2)
/* only care about these headers in 2xx responses */
;
/* /*
* Write etag to file when --etag-save option is given. * Write etag to file when --etag-save option is given.
*/ */
if(per->config->etag_save_file && etag_save->stream) { else if(per->config->etag_save_file && etag_save->stream &&
/* match only header that start with etag (case insensitive) */ /* match only header that start with etag (case insensitive) */
if(curl_strnequal(str, "etag:", 5)) { checkprefix("etag:", str)) {
const char *etag_h = &str[5]; const char *etag_h = &str[5];
const char *eot = end - 1; const char *eot = end - 1;
if(*eot == '\n') { if(*eot == '\n') {
@ -128,7 +137,6 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
} }
} }
} }
}
/* /*
* This callback sets the filename where output shall be written when * This callback sets the filename where output shall be written when
@ -137,11 +145,8 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
* Content-Disposition header specifying a filename property. * Content-Disposition header specifying a filename property.
*/ */
curl_easy_getinfo(per->curl, CURLINFO_SCHEME, &scheme); else if(hdrcbdata->honor_cd_filename &&
scheme = proto_token(scheme); (cb > 20) && checkprefix("Content-disposition:", str)) {
if(hdrcbdata->honor_cd_filename &&
(cb > 20) && checkprefix("Content-disposition:", str) &&
(scheme == proto_http || scheme == proto_https)) {
const char *p = str + 20; const char *p = str + 20;
/* look for the 'filename=' parameter /* look for the 'filename=' parameter
@ -179,7 +184,8 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
} }
if(per->config->output_dir) { if(per->config->output_dir) {
outs->filename = aprintf("%s/%s", per->config->output_dir, filename); outs->filename = aprintf("%s/%s", per->config->output_dir,
filename);
free(filename); free(filename);
if(!outs->filename) if(!outs->filename)
return CURL_WRITEFUNC_ERROR; return CURL_WRITEFUNC_ERROR;
@ -200,6 +206,7 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
if(!outs->stream && !tool_create_output_file(outs, per->config)) if(!outs->stream && !tool_create_output_file(outs, per->config))
return CURL_WRITEFUNC_ERROR; return CURL_WRITEFUNC_ERROR;
} }
}
if(hdrcbdata->config->writeout) { if(hdrcbdata->config->writeout) {
char *value = memchr(ptr, ':', cb); char *value = memchr(ptr, ':', cb);
if(value) { if(value) {