mirror of
https://github.com/curl/curl.git
synced 2024-12-27 06:59:43 +08:00
d7b6ce64ce
This clarifies the handling of server responses by folding the code for the complicated protocols into their protocol handlers. This concerns mainly HTTP and its bastard sibling RTSP. The terms "read" and "write" are often used without clear context if they refer to the connect or the client/application side of a transfer. This PR uses "read/write" for operations on the client side and "send/receive" for the connection, e.g. server side. If this is considered useful, we can revisit renaming of further methods in another PR. Curl's protocol handler `readwrite()` method been changed: ```diff - CURLcode (*readwrite)(struct Curl_easy *data, struct connectdata *conn, - const char *buf, size_t blen, - size_t *pconsumed, bool *readmore); + CURLcode (*write_resp)(struct Curl_easy *data, const char *buf, size_t blen, + bool is_eos, bool *done); ``` The name was changed to clarify that this writes reponse data to the client side. The parameter changes are: * `conn` removed as it always operates on `data->conn` * `pconsumed` removed as the method needs to handle all data on success * `readmore` removed as no longer necessary * `is_eos` as indicator that this is the last call for the transfer response (end-of-stream). * `done` TRUE on return iff the transfer response is to be treated as finished This change affects many files only because of updated comments in handlers that provide no implementation. The real change is that the HTTP protocol handlers now provide an implementation. The HTTP protocol handlers `write_resp()` implementation will get passed **all** raw data of a server response for the transfer. The HTTP/1.x formatted status and headers, as well as the undecoded response body. `Curl_http_write_resp_hds()` is used internally to parse the response headers and pass them on. This method is public as the RTSP protocol handler also uses it. HTTP/1.1 "chunked" transport encoding is now part of the general *content encoding* writer stack, just like other encodings. A new flag `CLIENTWRITE_EOS` was added for the last client write. This allows writers to verify that they are in a valid end state. The chunked decoder will check if it indeed has seen the last chunk. The general response handling in `transfer.c:466` happens in function `readwrite_data()`. This mainly operates now like: ``` static CURLcode readwrite_data(data, ...) { do { Curl_xfer_recv_resp(data, buf) ... Curl_xfer_write_resp(data, buf) ... } while(interested); ... } ``` All the response data handling is implemented in `Curl_xfer_write_resp()`. It calls the protocol handler's `write_resp()` implementation if available, or does the default behaviour. All raw response data needs to pass through this function. Which also means that anyone in possession of such data may call `Curl_xfer_write_resp()`. Closes #12480
243 lines
7.4 KiB
C
243 lines
7.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 "curl_setup.h"
|
|
|
|
#ifndef CURL_DISABLE_GOPHER
|
|
|
|
#include "urldata.h"
|
|
#include <curl/curl.h>
|
|
#include "transfer.h"
|
|
#include "sendf.h"
|
|
#include "cfilters.h"
|
|
#include "connect.h"
|
|
#include "progress.h"
|
|
#include "gopher.h"
|
|
#include "select.h"
|
|
#include "strdup.h"
|
|
#include "vtls/vtls.h"
|
|
#include "url.h"
|
|
#include "escape.h"
|
|
#include "warnless.h"
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/*
|
|
* Forward declarations.
|
|
*/
|
|
|
|
static CURLcode gopher_do(struct Curl_easy *data, bool *done);
|
|
#ifdef USE_SSL
|
|
static CURLcode gopher_connect(struct Curl_easy *data, bool *done);
|
|
static CURLcode gopher_connecting(struct Curl_easy *data, bool *done);
|
|
#endif
|
|
|
|
/*
|
|
* Gopher protocol handler.
|
|
* This is also a nice simple template to build off for simple
|
|
* connect-command-download protocols.
|
|
*/
|
|
|
|
const struct Curl_handler Curl_handler_gopher = {
|
|
"GOPHER", /* scheme */
|
|
ZERO_NULL, /* setup_connection */
|
|
gopher_do, /* do_it */
|
|
ZERO_NULL, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
ZERO_NULL, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
ZERO_NULL, /* disconnect */
|
|
ZERO_NULL, /* write_resp */
|
|
ZERO_NULL, /* connection_check */
|
|
ZERO_NULL, /* attach connection */
|
|
PORT_GOPHER, /* defport */
|
|
CURLPROTO_GOPHER, /* protocol */
|
|
CURLPROTO_GOPHER, /* family */
|
|
PROTOPT_NONE /* flags */
|
|
};
|
|
|
|
#ifdef USE_SSL
|
|
const struct Curl_handler Curl_handler_gophers = {
|
|
"GOPHERS", /* scheme */
|
|
ZERO_NULL, /* setup_connection */
|
|
gopher_do, /* do_it */
|
|
ZERO_NULL, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
gopher_connect, /* connect_it */
|
|
gopher_connecting, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_getsock */
|
|
ZERO_NULL, /* doing_getsock */
|
|
ZERO_NULL, /* domore_getsock */
|
|
ZERO_NULL, /* perform_getsock */
|
|
ZERO_NULL, /* disconnect */
|
|
ZERO_NULL, /* write_resp */
|
|
ZERO_NULL, /* connection_check */
|
|
ZERO_NULL, /* attach connection */
|
|
PORT_GOPHER, /* defport */
|
|
CURLPROTO_GOPHERS, /* protocol */
|
|
CURLPROTO_GOPHER, /* family */
|
|
PROTOPT_SSL /* flags */
|
|
};
|
|
|
|
static CURLcode gopher_connect(struct Curl_easy *data, bool *done)
|
|
{
|
|
(void)data;
|
|
(void)done;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode gopher_connecting(struct Curl_easy *data, bool *done)
|
|
{
|
|
struct connectdata *conn = data->conn;
|
|
CURLcode result;
|
|
|
|
result = Curl_conn_connect(data, FIRSTSOCKET, TRUE, done);
|
|
if(result)
|
|
connclose(conn, "Failed TLS connection");
|
|
*done = TRUE;
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
static CURLcode gopher_do(struct Curl_easy *data, bool *done)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
struct connectdata *conn = data->conn;
|
|
curl_socket_t sockfd = conn->sock[FIRSTSOCKET];
|
|
char *gopherpath;
|
|
char *path = data->state.up.path;
|
|
char *query = data->state.up.query;
|
|
char *sel = NULL;
|
|
char *sel_org = NULL;
|
|
timediff_t timeout_ms;
|
|
ssize_t amount, k;
|
|
size_t len;
|
|
int what;
|
|
|
|
*done = TRUE; /* unconditionally */
|
|
|
|
/* path is guaranteed non-NULL */
|
|
DEBUGASSERT(path);
|
|
|
|
if(query)
|
|
gopherpath = aprintf("%s?%s", path, query);
|
|
else
|
|
gopherpath = strdup(path);
|
|
|
|
if(!gopherpath)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
/* Create selector. Degenerate cases: / and /1 => convert to "" */
|
|
if(strlen(gopherpath) <= 2) {
|
|
sel = (char *)"";
|
|
len = strlen(sel);
|
|
free(gopherpath);
|
|
}
|
|
else {
|
|
char *newp;
|
|
|
|
/* Otherwise, drop / and the first character (i.e., item type) ... */
|
|
newp = gopherpath;
|
|
newp += 2;
|
|
|
|
/* ... and finally unescape */
|
|
result = Curl_urldecode(newp, 0, &sel, &len, REJECT_ZERO);
|
|
free(gopherpath);
|
|
if(result)
|
|
return result;
|
|
sel_org = sel;
|
|
}
|
|
|
|
k = curlx_uztosz(len);
|
|
|
|
for(;;) {
|
|
/* Break out of the loop if the selector is empty because OpenSSL and/or
|
|
LibreSSL fail with errno 0 if this is the case. */
|
|
if(strlen(sel) < 1)
|
|
break;
|
|
|
|
result = Curl_nwrite(data, FIRSTSOCKET, sel, k, &amount);
|
|
if(!result) { /* Which may not have written it all! */
|
|
result = Curl_client_write(data, CLIENTWRITE_HEADER, sel, amount);
|
|
if(result)
|
|
break;
|
|
|
|
k -= amount;
|
|
sel += amount;
|
|
if(k < 1)
|
|
break; /* but it did write it all */
|
|
}
|
|
else
|
|
break;
|
|
|
|
timeout_ms = Curl_timeleft(data, NULL, FALSE);
|
|
if(timeout_ms < 0) {
|
|
result = CURLE_OPERATION_TIMEDOUT;
|
|
break;
|
|
}
|
|
if(!timeout_ms)
|
|
timeout_ms = TIMEDIFF_T_MAX;
|
|
|
|
/* Don't busyloop. The entire loop thing is a work-around as it causes a
|
|
BLOCKING behavior which is a NO-NO. This function should rather be
|
|
split up in a do and a doing piece where the pieces that aren't
|
|
possible to send now will be sent in the doing function repeatedly
|
|
until the entire request is sent.
|
|
*/
|
|
what = SOCKET_WRITABLE(sockfd, timeout_ms);
|
|
if(what < 0) {
|
|
result = CURLE_SEND_ERROR;
|
|
break;
|
|
}
|
|
else if(!what) {
|
|
result = CURLE_OPERATION_TIMEDOUT;
|
|
break;
|
|
}
|
|
}
|
|
|
|
free(sel_org);
|
|
|
|
if(!result)
|
|
result = Curl_nwrite(data, FIRSTSOCKET, "\r\n", 2, &amount);
|
|
if(result) {
|
|
failf(data, "Failed sending Gopher request");
|
|
return result;
|
|
}
|
|
result = Curl_client_write(data, CLIENTWRITE_HEADER, (char *)"\r\n", 2);
|
|
if(result)
|
|
return result;
|
|
|
|
Curl_setup_transfer(data, FIRSTSOCKET, -1, FALSE, -1);
|
|
return CURLE_OK;
|
|
}
|
|
#endif /* CURL_DISABLE_GOPHER */
|