romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-18 19:45:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "url: remove ssh_config_matches"

Browse source 
This reverts commit 3e9817cd1b.

The change was incorrect as the check was not for the options the commit
message mentions.

Reported-by: ByteRay on hackerone
Closes #21899
This commit is contained in:
Daniel Stenberg 2026-06-08 07:54:50 +02:00
parent 7c34365cce
commit 0618ffe50d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/url.c
View file

@ -671,6 +671,19 @@ CURLcode Curl_conn_upkeep(struct Curl_easy *data,
return result;
}
#ifdef USE_SSH
static bool ssh_config_matches(struct connectdata *one,
struct connectdata *two)
{
struct ssh_conn *sshc1, *sshc2;
sshc1 = Curl_conn_meta_get(one, CURL_META_SSH_CONN);
sshc2 = Curl_conn_meta_get(two, CURL_META_SSH_CONN);
return sshc1 && sshc2 && Curl_safecmp(sshc1->rsa, sshc2->rsa) &&
Curl_safecmp(sshc1->rsa_pub, sshc2->rsa_pub);
}
#endif
struct url_conn_match {
struct connectdata *found;
struct Curl_easy *data;
@ -927,6 +940,12 @@ static bool url_match_proto_config(struct connectdata *conn,
if(!url_match_http_version(conn, m))
return FALSE;
#ifdef USE_SSH
if(get_protocol_family(m->needle->scheme) & PROTO_FAMILY_SSH) {
if(!ssh_config_matches(m->needle, conn))
return FALSE;
}
#endif
#ifndef CURL_DISABLE_FTP
else if(get_protocol_family(m->needle->scheme) & PROTO_FAMILY_FTP) {
if(!ftp_conns_match(m->needle, conn))