mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
a5dd9435ee
In cases where the connection was fast, curl sometimes failed to open a
connection. This fixes a regression of c2d973627b
.
The regression triggered in these steps:
1. Create an smtp connection
2. Use STARTTLS
3. Receive the response
4. We are inside the loop in `smtp_statemachine`, calling
`smtp_state_starttls_resp`
5. In the good flow, we exit the loop, re-enter `smtp_statemachine` and
run `smtp_perform_upgrade_tls` at the start of the function.
In the bad flow, we stay in the while loop, calling
`Curl_pp_readresp`, which reads part of the TLS handshake and things
go wrong.
The reason is that `Curl_pp_moredata` changed behavior and always
returns `true`, so we stay in the loop in `smtp_statemachine`. With a
slow connection `Curl_pp_readresp` cannot read new data and returns
`CURL_AGAIN`, so we leave the loop and re-enter `smtp_statemachine`.
With a fast connection, `Curl_pp_readresp` reads new data from the tcp
connection, which is part of the TLS handshake.
The fix is in `Curl_pp_moredata`, which needs to take the final line
into account and return `false` if only the final line is stored.
Closes #13048
439 lines
12 KiB
C
439 lines
12 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
|
|
*
|
|
* 'pingpong' is for generic back-and-forth support functions used by FTP,
|
|
* IMAP, POP3, SMTP and whatever more that likes them.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include "urldata.h"
|
|
#include "cfilters.h"
|
|
#include "sendf.h"
|
|
#include "select.h"
|
|
#include "progress.h"
|
|
#include "speedcheck.h"
|
|
#include "pingpong.h"
|
|
#include "multiif.h"
|
|
#include "vtls/vtls.h"
|
|
#include "strdup.h"
|
|
|
|
/* The last 3 #include files should be in this order */
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
#ifdef USE_PINGPONG
|
|
|
|
/* Returns timeout in ms. 0 or negative number means the timeout has already
|
|
triggered */
|
|
timediff_t Curl_pp_state_timeout(struct Curl_easy *data,
|
|
struct pingpong *pp, bool disconnecting)
|
|
{
|
|
struct connectdata *conn = data->conn;
|
|
timediff_t timeout_ms; /* in milliseconds */
|
|
timediff_t response_time = (data->set.server_response_timeout)?
|
|
data->set.server_response_timeout: pp->response_time;
|
|
|
|
/* if CURLOPT_SERVER_RESPONSE_TIMEOUT is set, use that to determine
|
|
remaining time, or use pp->response because SERVER_RESPONSE_TIMEOUT is
|
|
supposed to govern the response for any given server response, not for
|
|
the time from connect to the given server response. */
|
|
|
|
/* Without a requested timeout, we only wait 'response_time' seconds for the
|
|
full response to arrive before we bail out */
|
|
timeout_ms = response_time -
|
|
Curl_timediff(Curl_now(), pp->response); /* spent time */
|
|
|
|
if(data->set.timeout && !disconnecting) {
|
|
/* if timeout is requested, find out how much remaining time we have */
|
|
timediff_t timeout2_ms = data->set.timeout - /* timeout time */
|
|
Curl_timediff(Curl_now(), conn->now); /* spent time */
|
|
|
|
/* pick the lowest number */
|
|
timeout_ms = CURLMIN(timeout_ms, timeout2_ms);
|
|
}
|
|
|
|
return timeout_ms;
|
|
}
|
|
|
|
/*
|
|
* Curl_pp_statemach()
|
|
*/
|
|
CURLcode Curl_pp_statemach(struct Curl_easy *data,
|
|
struct pingpong *pp, bool block,
|
|
bool disconnecting)
|
|
{
|
|
struct connectdata *conn = data->conn;
|
|
curl_socket_t sock = conn->sock[FIRSTSOCKET];
|
|
int rc;
|
|
timediff_t interval_ms;
|
|
timediff_t timeout_ms = Curl_pp_state_timeout(data, pp, disconnecting);
|
|
CURLcode result = CURLE_OK;
|
|
|
|
if(timeout_ms <= 0) {
|
|
failf(data, "server response timeout");
|
|
return CURLE_OPERATION_TIMEDOUT; /* already too little time */
|
|
}
|
|
|
|
if(block) {
|
|
interval_ms = 1000; /* use 1 second timeout intervals */
|
|
if(timeout_ms < interval_ms)
|
|
interval_ms = timeout_ms;
|
|
}
|
|
else
|
|
interval_ms = 0; /* immediate */
|
|
|
|
if(Curl_conn_data_pending(data, FIRSTSOCKET))
|
|
rc = 1;
|
|
else if(pp->overflow)
|
|
/* We are receiving and there is data in the cache so just read it */
|
|
rc = 1;
|
|
else if(!pp->sendleft && Curl_conn_data_pending(data, FIRSTSOCKET))
|
|
/* We are receiving and there is data ready in the SSL library */
|
|
rc = 1;
|
|
else
|
|
rc = Curl_socket_check(pp->sendleft?CURL_SOCKET_BAD:sock, /* reading */
|
|
CURL_SOCKET_BAD,
|
|
pp->sendleft?sock:CURL_SOCKET_BAD, /* writing */
|
|
interval_ms);
|
|
|
|
if(block) {
|
|
/* if we didn't wait, we don't have to spend time on this now */
|
|
if(Curl_pgrsUpdate(data))
|
|
result = CURLE_ABORTED_BY_CALLBACK;
|
|
else
|
|
result = Curl_speedcheck(data, Curl_now());
|
|
|
|
if(result)
|
|
return result;
|
|
}
|
|
|
|
if(rc == -1) {
|
|
failf(data, "select/poll error");
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
}
|
|
else if(rc)
|
|
result = pp->statemachine(data, data->conn);
|
|
|
|
return result;
|
|
}
|
|
|
|
/* initialize stuff to prepare for reading a fresh new response */
|
|
void Curl_pp_init(struct pingpong *pp)
|
|
{
|
|
pp->nread_resp = 0;
|
|
pp->response = Curl_now(); /* start response time-out now! */
|
|
pp->pending_resp = TRUE;
|
|
Curl_dyn_init(&pp->sendbuf, DYN_PINGPPONG_CMD);
|
|
Curl_dyn_init(&pp->recvbuf, DYN_PINGPPONG_CMD);
|
|
}
|
|
|
|
/***********************************************************************
|
|
*
|
|
* Curl_pp_vsendf()
|
|
*
|
|
* Send the formatted string as a command to a pingpong server. Note that
|
|
* the string should not have any CRLF appended, as this function will
|
|
* append the necessary things itself.
|
|
*
|
|
* made to never block
|
|
*/
|
|
CURLcode Curl_pp_vsendf(struct Curl_easy *data,
|
|
struct pingpong *pp,
|
|
const char *fmt,
|
|
va_list args)
|
|
{
|
|
size_t bytes_written = 0;
|
|
size_t write_len;
|
|
char *s;
|
|
CURLcode result;
|
|
struct connectdata *conn = data->conn;
|
|
|
|
#ifdef HAVE_GSSAPI
|
|
enum protection_level data_sec;
|
|
#endif
|
|
|
|
DEBUGASSERT(pp->sendleft == 0);
|
|
DEBUGASSERT(pp->sendsize == 0);
|
|
DEBUGASSERT(pp->sendthis == NULL);
|
|
|
|
if(!conn)
|
|
/* can't send without a connection! */
|
|
return CURLE_SEND_ERROR;
|
|
|
|
Curl_dyn_reset(&pp->sendbuf);
|
|
result = Curl_dyn_vaddf(&pp->sendbuf, fmt, args);
|
|
if(result)
|
|
return result;
|
|
|
|
/* append CRLF */
|
|
result = Curl_dyn_addn(&pp->sendbuf, "\r\n", 2);
|
|
if(result)
|
|
return result;
|
|
|
|
pp->pending_resp = TRUE;
|
|
write_len = Curl_dyn_len(&pp->sendbuf);
|
|
s = Curl_dyn_ptr(&pp->sendbuf);
|
|
|
|
#ifdef HAVE_GSSAPI
|
|
conn->data_prot = PROT_CMD;
|
|
#endif
|
|
result = Curl_conn_send(data, FIRSTSOCKET, s, write_len, &bytes_written);
|
|
if(result == CURLE_AGAIN) {
|
|
bytes_written = 0;
|
|
}
|
|
else if(result)
|
|
return result;
|
|
#ifdef HAVE_GSSAPI
|
|
data_sec = conn->data_prot;
|
|
DEBUGASSERT(data_sec > PROT_NONE && data_sec < PROT_LAST);
|
|
conn->data_prot = (unsigned char)data_sec;
|
|
#endif
|
|
|
|
Curl_debug(data, CURLINFO_HEADER_OUT, s, bytes_written);
|
|
|
|
if(bytes_written != write_len) {
|
|
/* the whole chunk was not sent, keep it around and adjust sizes */
|
|
pp->sendthis = s;
|
|
pp->sendsize = write_len;
|
|
pp->sendleft = write_len - bytes_written;
|
|
}
|
|
else {
|
|
pp->sendthis = NULL;
|
|
pp->sendleft = pp->sendsize = 0;
|
|
pp->response = Curl_now();
|
|
}
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
*
|
|
* Curl_pp_sendf()
|
|
*
|
|
* Send the formatted string as a command to a pingpong server. Note that
|
|
* the string should not have any CRLF appended, as this function will
|
|
* append the necessary things itself.
|
|
*
|
|
* made to never block
|
|
*/
|
|
CURLcode Curl_pp_sendf(struct Curl_easy *data, struct pingpong *pp,
|
|
const char *fmt, ...)
|
|
{
|
|
CURLcode result;
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
|
|
result = Curl_pp_vsendf(data, pp, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
return result;
|
|
}
|
|
|
|
static CURLcode pingpong_read(struct Curl_easy *data,
|
|
int sockindex,
|
|
char *buffer,
|
|
size_t buflen,
|
|
ssize_t *nread)
|
|
{
|
|
CURLcode result;
|
|
#ifdef HAVE_GSSAPI
|
|
enum protection_level prot = data->conn->data_prot;
|
|
data->conn->data_prot = PROT_CLEAR;
|
|
#endif
|
|
result = Curl_conn_recv(data, sockindex, buffer, buflen, nread);
|
|
#ifdef HAVE_GSSAPI
|
|
DEBUGASSERT(prot > PROT_NONE && prot < PROT_LAST);
|
|
data->conn->data_prot = (unsigned char)prot;
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* Curl_pp_readresp()
|
|
*
|
|
* Reads a piece of a server response.
|
|
*/
|
|
CURLcode Curl_pp_readresp(struct Curl_easy *data,
|
|
int sockindex,
|
|
struct pingpong *pp,
|
|
int *code, /* return the server code if done */
|
|
size_t *size) /* size of the response */
|
|
{
|
|
struct connectdata *conn = data->conn;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
*code = 0; /* 0 for errors or not done */
|
|
*size = 0;
|
|
|
|
if(pp->nfinal) {
|
|
/* a previous call left this many bytes in the beginning of the buffer as
|
|
that was the final line; now ditch that */
|
|
size_t full = Curl_dyn_len(&pp->recvbuf);
|
|
|
|
/* trim off the "final" leading part */
|
|
Curl_dyn_tail(&pp->recvbuf, full - pp->nfinal);
|
|
|
|
pp->nfinal = 0; /* now gone */
|
|
}
|
|
if(!pp->overflow) {
|
|
ssize_t gotbytes = 0;
|
|
char buffer[900];
|
|
|
|
result = pingpong_read(data, sockindex, buffer, sizeof(buffer), &gotbytes);
|
|
if(result == CURLE_AGAIN)
|
|
return CURLE_OK;
|
|
|
|
if(result)
|
|
return result;
|
|
|
|
if(gotbytes <= 0) {
|
|
failf(data, "response reading failed (errno: %d)", SOCKERRNO);
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
|
|
result = Curl_dyn_addn(&pp->recvbuf, buffer, gotbytes);
|
|
if(result)
|
|
return result;
|
|
|
|
data->req.headerbytecount += (unsigned int)gotbytes;
|
|
|
|
pp->nread_resp += gotbytes;
|
|
}
|
|
|
|
do {
|
|
char *line = Curl_dyn_ptr(&pp->recvbuf);
|
|
char *nl = memchr(line, '\n', Curl_dyn_len(&pp->recvbuf));
|
|
if(nl) {
|
|
/* a newline is CRLF in pp-talk, so the CR is ignored as
|
|
the line isn't really terminated until the LF comes */
|
|
size_t length = nl - line + 1;
|
|
|
|
/* output debug output if that is requested */
|
|
#ifdef HAVE_GSSAPI
|
|
if(!conn->sec_complete)
|
|
#endif
|
|
Curl_debug(data, CURLINFO_HEADER_IN, line, length);
|
|
|
|
/*
|
|
* Pass all response-lines to the callback function registered for
|
|
* "headers". The response lines can be seen as a kind of headers.
|
|
*/
|
|
result = Curl_client_write(data, CLIENTWRITE_INFO, line, length);
|
|
if(result)
|
|
return result;
|
|
|
|
if(pp->endofresp(data, conn, line, length, code)) {
|
|
/* When at "end of response", keep the endofresp line first in the
|
|
buffer since it will be accessed outside (by pingpong
|
|
parsers). Store the overflow counter to inform about additional
|
|
data in this buffer after the endofresp line. */
|
|
pp->nfinal = length;
|
|
if(Curl_dyn_len(&pp->recvbuf) > length)
|
|
pp->overflow = Curl_dyn_len(&pp->recvbuf) - length;
|
|
else
|
|
pp->overflow = 0;
|
|
*size = pp->nread_resp; /* size of the response */
|
|
pp->nread_resp = 0; /* restart */
|
|
break;
|
|
}
|
|
if(Curl_dyn_len(&pp->recvbuf) > length)
|
|
/* keep the remaining piece */
|
|
Curl_dyn_tail((&pp->recvbuf), Curl_dyn_len(&pp->recvbuf) - length);
|
|
else
|
|
Curl_dyn_reset(&pp->recvbuf);
|
|
}
|
|
else {
|
|
/* without a newline, there is no overflow */
|
|
pp->overflow = 0;
|
|
break;
|
|
}
|
|
|
|
} while(1); /* while there's buffer left to scan */
|
|
|
|
pp->pending_resp = FALSE;
|
|
|
|
return result;
|
|
}
|
|
|
|
int Curl_pp_getsock(struct Curl_easy *data,
|
|
struct pingpong *pp, curl_socket_t *socks)
|
|
{
|
|
struct connectdata *conn = data->conn;
|
|
socks[0] = conn->sock[FIRSTSOCKET];
|
|
|
|
if(pp->sendleft) {
|
|
/* write mode */
|
|
return GETSOCK_WRITESOCK(0);
|
|
}
|
|
|
|
/* read mode */
|
|
return GETSOCK_READSOCK(0);
|
|
}
|
|
|
|
CURLcode Curl_pp_flushsend(struct Curl_easy *data,
|
|
struct pingpong *pp)
|
|
{
|
|
/* we have a piece of a command still left to send */
|
|
size_t written;
|
|
CURLcode result;
|
|
|
|
result = Curl_conn_send(data, FIRSTSOCKET,
|
|
pp->sendthis + pp->sendsize - pp->sendleft,
|
|
pp->sendleft, &written);
|
|
if(result == CURLE_AGAIN) {
|
|
result = CURLE_OK;
|
|
written = 0;
|
|
}
|
|
if(result)
|
|
return result;
|
|
|
|
if(written != pp->sendleft) {
|
|
/* only a fraction was sent */
|
|
pp->sendleft -= written;
|
|
}
|
|
else {
|
|
pp->sendthis = NULL;
|
|
pp->sendleft = pp->sendsize = 0;
|
|
pp->response = Curl_now();
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
|
|
CURLcode Curl_pp_disconnect(struct pingpong *pp)
|
|
{
|
|
Curl_dyn_free(&pp->sendbuf);
|
|
Curl_dyn_free(&pp->recvbuf);
|
|
return CURLE_OK;
|
|
}
|
|
|
|
bool Curl_pp_moredata(struct pingpong *pp)
|
|
{
|
|
return (!pp->sendleft && Curl_dyn_len(&pp->recvbuf) > pp->nfinal);
|
|
}
|
|
|
|
#endif
|