mirror of
https://github.com/curl/curl.git
synced 2026-08-04 12:46:14 +03:00
vtsl: eliminate 'data->state.ssl_scache'
Keeping the relevant 'ssl_scache' in 'data->state' leads to problems when the owner of the cache is cleaned up and this reference is left dangling. Remove the ref entirely and always find the ssl_scache at the current share or multi. Folded in #16260 (test 3208) to verify this fixes the bug with a dangling reference when an easy handle is used with easy_perform first and in a multi_perform after. Ref: #16236 Closes #16261
This commit is contained in:
Stefan Eissing
Daniel Stenberg
parent
f1939fa60d
commit
242a1439e7
8 changed files with 193 additions and 59 deletions
|
|
@ -1584,10 +1584,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option,
|
|||
if(data->share->hsts == data->hsts)
|
||||
data->hsts = NULL;
|
||||
#endif
|
||||
#ifdef USE_SSL
|
||||
if(data->share->ssl_scache == data->state.ssl_scache)
|
||||
data->state.ssl_scache = data->multi ? data->multi->ssl_scache : NULL;
|
||||
#endif
|
||||
#ifdef USE_LIBPSL
|
||||
if(data->psl == &data->share->psl)
|
||||
data->psl = data->multi ? &data->multi->psl : NULL;
|
||||
|
|
@ -1628,10 +1624,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option,
|
|||
data->hsts = data->share->hsts;
|
||||
}
|
||||
#endif
|
||||
#ifdef USE_SSL
|
||||
if(data->share->ssl_scache)
|
||||
data->state.ssl_scache = data->share->ssl_scache;
|
||||
#endif
|
||||
#ifdef USE_LIBPSL
|
||||
if(data->share->specifier & (1 << CURL_LOCK_DATA_PSL))
|
||||
data->psl = &data->share->psl;
|
||||
|
|
|
|||
|
|
@ -567,12 +567,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
|
|||
#endif
|
||||
data->state.httpreq = data->set.method;
|
||||
|
||||
#ifdef USE_SSL
|
||||
if(!data->state.ssl_scache)
|
||||
/* There was no ssl session cache set via a share, use the multi one */
|
||||
data->state.ssl_scache = data->multi->ssl_scache;
|
||||
#endif
|
||||
|
||||
data->state.requests = 0;
|
||||
data->state.followlocation = 0; /* reset the location-follow counter */
|
||||
data->state.this_is_a_follow = FALSE; /* reset this */
|
||||
|
|
|
|||
|
|
@ -1199,7 +1199,6 @@ struct UrlState {
|
|||
curl_prot_t first_remote_protocol;
|
||||
|
||||
int retrycount; /* number of retries on a new connection */
|
||||
struct Curl_ssl_scache *ssl_scache; /* TLS session pool */
|
||||
int os_errno; /* filled in with errno whenever an error occurs */
|
||||
long followlocation; /* redirect counter */
|
||||
int requests; /* request counter: redirects + authentication retakes */
|
||||
|
|
|
|||
|
|
@ -77,17 +77,7 @@ struct Curl_ssl_scache_peer {
|
|||
|
||||
#define CURL_SCACHE_MAGIC 0x000e1551
|
||||
|
||||
#ifdef DEBUGBUILD
|
||||
/* On a debug build, we want to fail hard on scaches that
|
||||
* are not NULL, but no longer have the MAGIC touch. This gives
|
||||
* us early warning on things only discovered by valgrind otherwise. */
|
||||
#define GOOD_SCACHE(x) \
|
||||
(((x) && (x)->magic == CURL_SCACHE_MAGIC)? TRUE: \
|
||||
(DEBUGASSERT(!(x)), FALSE))
|
||||
#else
|
||||
#define GOOD_SCACHE(x) \
|
||||
((x) && (x)->magic == CURL_SCACHE_MAGIC)
|
||||
#endif
|
||||
#define GOOD_SCACHE(x) ((x) && (x)->magic == CURL_SCACHE_MAGIC)
|
||||
|
||||
struct Curl_ssl_scache {
|
||||
unsigned int magic;
|
||||
|
|
@ -97,6 +87,23 @@ struct Curl_ssl_scache {
|
|||
long age;
|
||||
};
|
||||
|
||||
static struct Curl_ssl_scache *cf_ssl_scache_get(struct Curl_easy *data)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = NULL;
|
||||
/* If a share is present, its ssl_scache has preference over the multi */
|
||||
if(data->share && data->share->ssl_scache)
|
||||
scache = data->share->ssl_scache;
|
||||
else if(data->multi && data->multi->ssl_scache)
|
||||
scache = data->multi->ssl_scache;
|
||||
if(scache && !GOOD_SCACHE(scache)) {
|
||||
failf(data, "transfer would use an invalid scache at %p, denied",
|
||||
(void *)scache);
|
||||
DEBUGASSERT(0);
|
||||
return NULL;
|
||||
}
|
||||
return scache;
|
||||
}
|
||||
|
||||
static void cf_ssl_scache_clear_session(struct Curl_ssl_session *s)
|
||||
{
|
||||
if(s->sdata) {
|
||||
|
|
@ -606,7 +613,6 @@ cf_ssl_find_peer_by_key(struct Curl_easy *data,
|
|||
|
||||
*ppeer = NULL;
|
||||
if(!GOOD_SCACHE(scache)) {
|
||||
failf(data, "cf_ssl_find_peer_by_key with BAD sache magic!");
|
||||
return CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
}
|
||||
|
||||
|
|
@ -772,11 +778,6 @@ static CURLcode cf_scache_add_session(struct Curl_cfilter *cf,
|
|||
Curl_ssl_session_destroy(s);
|
||||
return CURLE_OK;
|
||||
}
|
||||
if(!GOOD_SCACHE(scache)) {
|
||||
Curl_ssl_session_destroy(s);
|
||||
failf(data, "cf_scache_add_session with BAD scache magic!");
|
||||
return CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
}
|
||||
|
||||
if(s->valid_until <= 0)
|
||||
s->valid_until = now + scache->default_lifetime_secs;
|
||||
|
|
@ -822,7 +823,7 @@ CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf,
|
|||
const char *ssl_peer_key,
|
||||
struct Curl_ssl_session *s)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = data->state.ssl_scache;
|
||||
struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
|
||||
struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);
|
||||
CURLcode result;
|
||||
DEBUGASSERT(ssl_config);
|
||||
|
|
@ -833,7 +834,6 @@ CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf,
|
|||
}
|
||||
if(!GOOD_SCACHE(scache)) {
|
||||
Curl_ssl_session_destroy(s);
|
||||
failf(data, "Curl_ssl_scache_put with BAD scache magic!");
|
||||
return CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
}
|
||||
|
||||
|
|
@ -861,7 +861,7 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf,
|
|||
const char *ssl_peer_key,
|
||||
struct Curl_ssl_session **ps)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = data->state.ssl_scache;
|
||||
struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
|
||||
struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
|
||||
struct Curl_ssl_scache_peer *peer = NULL;
|
||||
struct Curl_llist_node *n;
|
||||
|
|
@ -871,10 +871,6 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf,
|
|||
*ps = NULL;
|
||||
if(!scache)
|
||||
return CURLE_OK;
|
||||
if(!GOOD_SCACHE(scache)) {
|
||||
failf(data, "Curl_ssl_scache_take with BAD scache magic!");
|
||||
return CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
}
|
||||
|
||||
Curl_ssl_scache_lock(data);
|
||||
result = cf_ssl_find_peer_by_key(data, scache, ssl_peer_key, conn_config,
|
||||
|
|
@ -909,7 +905,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
|
|||
void *sobj,
|
||||
Curl_ssl_scache_obj_dtor *sobj_free)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = data->state.ssl_scache;
|
||||
struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
|
||||
struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
|
||||
struct Curl_ssl_scache_peer *peer = NULL;
|
||||
CURLcode result;
|
||||
|
|
@ -917,8 +913,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
|
|||
DEBUGASSERT(sobj);
|
||||
DEBUGASSERT(sobj_free);
|
||||
|
||||
if(!GOOD_SCACHE(scache)) {
|
||||
failf(data, "Curl_ssl_scache_add_obj with BAD scache magic!");
|
||||
if(!scache) {
|
||||
result = CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -943,7 +938,7 @@ bool Curl_ssl_scache_get_obj(struct Curl_cfilter *cf,
|
|||
const char *ssl_peer_key,
|
||||
void **sobj)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = data->state.ssl_scache;
|
||||
struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
|
||||
struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
|
||||
struct Curl_ssl_scache_peer *peer = NULL;
|
||||
CURLcode result;
|
||||
|
|
@ -951,10 +946,6 @@ bool Curl_ssl_scache_get_obj(struct Curl_cfilter *cf,
|
|||
*sobj = NULL;
|
||||
if(!scache)
|
||||
return FALSE;
|
||||
if(!GOOD_SCACHE(scache)) {
|
||||
failf(data, "Curl_ssl_scache_get_obj with BAD scache magic!");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
result = cf_ssl_find_peer_by_key(data, scache, ssl_peer_key, conn_config,
|
||||
&peer);
|
||||
|
|
@ -973,13 +964,13 @@ void Curl_ssl_scache_remove_all(struct Curl_cfilter *cf,
|
|||
struct Curl_easy *data,
|
||||
const char *ssl_peer_key)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = data->state.ssl_scache;
|
||||
struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
|
||||
struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
|
||||
struct Curl_ssl_scache_peer *peer = NULL;
|
||||
CURLcode result;
|
||||
|
||||
(void)cf;
|
||||
if(!scache || !GOOD_SCACHE(scache))
|
||||
if(!scache)
|
||||
return;
|
||||
|
||||
Curl_ssl_scache_lock(data);
|
||||
|
|
@ -1073,14 +1064,13 @@ CURLcode Curl_ssl_session_import(struct Curl_easy *data,
|
|||
const unsigned char *shmac, size_t shmac_len,
|
||||
const unsigned char *sdata, size_t sdata_len)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = data->state.ssl_scache;
|
||||
struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
|
||||
struct Curl_ssl_scache_peer *peer = NULL;
|
||||
struct Curl_ssl_session *s = NULL;
|
||||
bool locked = FALSE;
|
||||
CURLcode r;
|
||||
|
||||
if(!scache || !GOOD_SCACHE(scache)) {
|
||||
failf(data, "Curl_ssl_session_import with BAD scache magic!");
|
||||
if(!scache) {
|
||||
r = CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1145,7 +1135,7 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data,
|
|||
curl_ssls_export_cb *export_fn,
|
||||
void *userptr)
|
||||
{
|
||||
struct Curl_ssl_scache *scache = data->state.ssl_scache;
|
||||
struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
|
||||
struct Curl_ssl_scache_peer *peer;
|
||||
struct dynbuf sbuf, hbuf;
|
||||
struct Curl_llist_node *n;
|
||||
|
|
@ -1157,10 +1147,6 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data,
|
|||
return CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
if(!scache)
|
||||
return CURLE_OK;
|
||||
if(!GOOD_SCACHE(scache)) {
|
||||
failf(data, "Curl_ssl_session_export with BAD scache magic!");
|
||||
return CURLE_BAD_FUNCTION_ARGUMENT;
|
||||
}
|
||||
|
||||
Curl_ssl_scache_lock(data);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue