164 lines
6.2 KiB
Diff
164 lines
6.2 KiB
Diff
From 8f4608468b890dce2dad9f91d5607ee7e9c1aba1 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Thu, 9 Mar 2023 17:47:06 +0100
|
|
Subject: [PATCH] ftp: add more conditions for connection reuse
|
|
|
|
Reported-by: Harry Sintonen
|
|
Closes #10730
|
|
---
|
|
lib/ftp.c | 28 ++++++++++++++++++++++++++--
|
|
lib/ftp.h | 5 +++++
|
|
lib/setopt.c | 2 +-
|
|
lib/url.c | 16 +++++++++++++++-
|
|
lib/urldata.h | 4 ++--
|
|
5 files changed, 49 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/lib/ftp.c b/lib/ftp.c
|
|
index 8e98a5f..82574db 100644
|
|
--- a/lib/ftp.c
|
|
+++ b/lib/ftp.c
|
|
@@ -4077,6 +4077,8 @@ static CURLcode ftp_disconnect(struct connectdata *conn, bool dead_connection)
|
|
}
|
|
|
|
freedirs(ftpc);
|
|
+ Curl_safefree(ftpc->account);
|
|
+ Curl_safefree(ftpc->alternative_to_user);
|
|
free(ftpc->prevpath);
|
|
ftpc->prevpath = NULL;
|
|
free(ftpc->server_os);
|
|
@@ -4344,11 +4346,31 @@ static CURLcode ftp_setup_connection(struct connectdata *conn)
|
|
struct Curl_easy *data = conn->data;
|
|
char *type;
|
|
struct FTP *ftp;
|
|
+ struct ftp_conn *ftpc = &conn->proto.ftpc;
|
|
|
|
- conn->data->req.protop = ftp = calloc(sizeof(struct FTP), 1);
|
|
+ ftp = calloc(sizeof(struct FTP), 1);
|
|
if(NULL == ftp)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
+ /* clone connection related data that is FTP specific */
|
|
+ if(data->set.str[STRING_FTP_ACCOUNT]) {
|
|
+ ftpc->account = strdup(data->set.str[STRING_FTP_ACCOUNT]);
|
|
+ if(!ftpc->account) {
|
|
+ free(ftp);
|
|
+ return CURLE_OUT_OF_MEMORY;
|
|
+ }
|
|
+ }
|
|
+ if(data->set.str[STRING_FTP_ALTERNATIVE_TO_USER]) {
|
|
+ ftpc->alternative_to_user =
|
|
+ strdup(data->set.str[STRING_FTP_ALTERNATIVE_TO_USER]);
|
|
+ if(!ftpc->alternative_to_user) {
|
|
+ Curl_safefree(ftpc->account);
|
|
+ free(ftp);
|
|
+ return CURLE_OUT_OF_MEMORY;
|
|
+ }
|
|
+ }
|
|
+ conn->data->req.protop = ftp;
|
|
+
|
|
ftp->path = &data->state.up.path[1]; /* don't include the initial slash */
|
|
|
|
/* FTP URLs support an extension like ";type=<typecode>" that
|
|
@@ -4383,7 +4405,9 @@ static CURLcode ftp_setup_connection(struct connectdata *conn)
|
|
/* get some initial data into the ftp struct */
|
|
ftp->transfer = FTPTRANSFER_BODY;
|
|
ftp->downloadsize = 0;
|
|
- conn->proto.ftpc.known_filesize = -1; /* unknown size for now */
|
|
+ ftpc->known_filesize = -1; /* unknown size for now */
|
|
+ ftpc->use_ssl = data->set.use_ssl;
|
|
+ ftpc->ccc = data->set.ftp_ccc;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
diff --git a/lib/ftp.h b/lib/ftp.h
|
|
index 06421c6..de2833b 100644
|
|
--- a/lib/ftp.h
|
|
+++ b/lib/ftp.h
|
|
@@ -116,6 +116,8 @@ struct FTP {
|
|
struct */
|
|
struct ftp_conn {
|
|
struct pingpong pp;
|
|
+ char *account;
|
|
+ char *alternative_to_user;
|
|
char *entrypath; /* the PWD reply when we logged on */
|
|
char **dirs; /* realloc()ed array for path components */
|
|
int dirdepth; /* number of entries used in the 'dirs' array */
|
|
@@ -141,6 +143,9 @@ struct ftp_conn {
|
|
ftpstate state; /* always use ftp.c:state() to change state! */
|
|
ftpstate state_saved; /* transfer type saved to be reloaded after
|
|
data connection is established */
|
|
+ unsigned char use_ssl; /* if AUTH TLS is to be attempted etc, for FTP or
|
|
+ IMAP or POP3 or others! (type: curl_usessl)*/
|
|
+ unsigned char ccc; /* ccc level for this connection */
|
|
curl_off_t retr_size_saved; /* Size of retrieved file saved */
|
|
char *server_os; /* The target server operating system. */
|
|
curl_off_t known_filesize; /* file size is different from -1, if wildcard
|
|
diff --git a/lib/setopt.c b/lib/setopt.c
|
|
index ed54481..16e94a6 100644
|
|
--- a/lib/setopt.c
|
|
+++ b/lib/setopt.c
|
|
@@ -2216,7 +2216,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
|
|
arg = va_arg(param, long);
|
|
if((arg < CURLUSESSL_NONE) || (arg >= CURLUSESSL_LAST))
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
- data->set.use_ssl = (curl_usessl)arg;
|
|
+ data->set.use_ssl = (unsigned char)arg;
|
|
break;
|
|
|
|
case CURLOPT_SSL_OPTIONS:
|
|
diff --git a/lib/url.c b/lib/url.c
|
|
index ba4fa7a..6c34924 100644
|
|
--- a/lib/url.c
|
|
+++ b/lib/url.c
|
|
@@ -1267,10 +1267,24 @@ ConnectionExists(struct Curl_easy *data,
|
|
}
|
|
}
|
|
|
|
- if(get_protocol_family(needle->handler) & PROTO_FAMILY_SSH) {
|
|
+#ifdef USE_SSH
|
|
+ else if(get_protocol_family(needle->handler) & PROTO_FAMILY_SSH) {
|
|
if(!ssh_config_matches(needle, check))
|
|
continue;
|
|
}
|
|
+#endif
|
|
+#ifndef CURL_DISABLE_FTP
|
|
+ else if(get_protocol_family(needle->handler) & PROTO_FAMILY_FTP) {
|
|
+ /* Also match ACCOUNT, ALTERNATIVE-TO-USER, USE_SSL and CCC options */
|
|
+ if(Curl_timestrcmp(needle->proto.ftpc.account,
|
|
+ check->proto.ftpc.account) ||
|
|
+ Curl_timestrcmp(needle->proto.ftpc.alternative_to_user,
|
|
+ check->proto.ftpc.alternative_to_user) ||
|
|
+ (needle->proto.ftpc.use_ssl != check->proto.ftpc.use_ssl) ||
|
|
+ (needle->proto.ftpc.ccc != check->proto.ftpc.ccc))
|
|
+ continue;
|
|
+ }
|
|
+#endif
|
|
|
|
if((needle->handler->flags&PROTOPT_SSL)
|
|
#ifndef CURL_DISABLE_PROXY
|
|
diff --git a/lib/urldata.h b/lib/urldata.h
|
|
index 27ee1b5..aca0f39 100644
|
|
--- a/lib/urldata.h
|
|
+++ b/lib/urldata.h
|
|
@@ -1725,8 +1725,6 @@ struct UserDefined {
|
|
void *ssh_keyfunc_userp; /* custom pointer to callback */
|
|
enum CURL_NETRC_OPTION
|
|
use_netrc; /* defined in include/curl.h */
|
|
- curl_usessl use_ssl; /* if AUTH TLS is to be attempted etc, for FTP or
|
|
- IMAP or POP3 or others! */
|
|
long new_file_perms; /* Permissions to use when creating remote files */
|
|
long new_directory_perms; /* Permissions to use when creating remote dirs */
|
|
long ssh_auth_types; /* allowed SSH auth types */
|
|
@@ -1769,6 +1767,8 @@ struct UserDefined {
|
|
CURLU *uh; /* URL handle for the current parsed URL */
|
|
void *trailer_data; /* pointer to pass to trailer data callback */
|
|
curl_trailer_callback trailer_callback; /* trailing data callback */
|
|
+ unsigned char use_ssl; /* if AUTH TLS is to be attempted etc, for FTP or
|
|
+ IMAP or POP3 or others! (type: curl_usessl)*/
|
|
BIT(is_fread_set); /* has read callback been set to non-NULL? */
|
|
BIT(is_fwrite_set); /* has write callback been set to non-NULL? */
|
|
BIT(free_referer); /* set TRUE if 'referer' points to a string we
|
|
--
|
|
2.33.0
|
|
|