mirror of
https://github.com/curl/curl.git
synced 2026-07-24 00:57:16 +03:00
openssl: fix the data race when sharing an SSL session between threads
The SSL_Session object is mutated during connection inside openssl,
and it might not be thread-safe. Besides, according to documentation
of openssl:
```
SSL_SESSION objects keep internal link information about the session
cache list, when being inserted into one SSL_CTX object's session
cache. One SSL_SESSION object, regardless of its reference count,
must therefore only be used with one SSL_CTX object (and the SSL
objects created from this SSL_CTX object).
```
If I understand correctly, it is not safe to share it even in a
single thread.
Instead, serialize the SSL_SESSION before adding it to the cache,
and deserialize it after retrieving it from the cache, so that no
concurrent write to the same object is infeasible.
Also
- add a ci test for thread sanitizer
- add a test for sharing ssl sessions concurrently
- avoid redefining memory functions when not building libcurl, but
including the soruce in libtest
- increase the concurrent connections limit in sws
Notice that there are fix for a global data race for openssl which
is not yet release. The fix is cherry pick for the ci test with
thread sanitizer.
d8def79838
Closes #14751
This commit is contained in:
parent
2c2292ecaf
commit
a2bcec0ee0
9 changed files with 499 additions and 22 deletions
|
|
@ -35,7 +35,9 @@
|
|||
#endif
|
||||
|
||||
#include "curl_threads.h"
|
||||
#ifdef BUILDING_LIBCURL
|
||||
#include "curl_memory.h"
|
||||
#endif
|
||||
/* The last #include file should be: */
|
||||
#include "memdebug.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -2004,7 +2004,7 @@ static void ossl_session_free(void *sessionid, size_t idsize)
|
|||
{
|
||||
/* free the ID */
|
||||
(void)idsize;
|
||||
SSL_SESSION_free(sessionid);
|
||||
free(sessionid);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -2869,6 +2869,9 @@ CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
|
|||
{
|
||||
const struct ssl_config_data *config;
|
||||
CURLcode result = CURLE_OK;
|
||||
size_t der_session_size;
|
||||
unsigned char *der_session_buf;
|
||||
unsigned char *der_session_ptr;
|
||||
|
||||
if(!cf || !data)
|
||||
goto out;
|
||||
|
|
@ -2876,16 +2879,32 @@ CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
|
|||
config = Curl_ssl_cf_get_config(cf, data);
|
||||
if(config->primary.cache_session) {
|
||||
|
||||
der_session_size = i2d_SSL_SESSION(session, NULL);
|
||||
if(der_session_size == 0) {
|
||||
result = CURLE_OUT_OF_MEMORY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
der_session_buf = der_session_ptr = malloc(der_session_size);
|
||||
if(!der_session_buf) {
|
||||
result = CURLE_OUT_OF_MEMORY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
der_session_size = i2d_SSL_SESSION(session, &der_session_ptr);
|
||||
if(der_session_size == 0) {
|
||||
result = CURLE_OUT_OF_MEMORY;
|
||||
free(der_session_buf);
|
||||
goto out;
|
||||
}
|
||||
|
||||
Curl_ssl_sessionid_lock(data);
|
||||
result = Curl_ssl_set_sessionid(cf, data, peer, session, 0,
|
||||
ossl_session_free);
|
||||
session = NULL; /* call has taken ownership */
|
||||
result = Curl_ssl_set_sessionid(cf, data, peer, der_session_buf,
|
||||
der_session_size, ossl_session_free);
|
||||
Curl_ssl_sessionid_unlock(data);
|
||||
}
|
||||
|
||||
out:
|
||||
if(session)
|
||||
ossl_session_free(session, 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -2902,7 +2921,7 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid)
|
|||
connssl = cf? cf->ctx : NULL;
|
||||
data = connssl? CF_DATA_CURRENT(cf) : NULL;
|
||||
Curl_ossl_add_session(cf, data, &connssl->peer, ssl_sessionid);
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static CURLcode load_cacert_from_memory(X509_STORE *store,
|
||||
|
|
@ -3452,7 +3471,9 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
|
|||
const char *ciphers;
|
||||
SSL_METHOD_QUAL SSL_METHOD *req_method = NULL;
|
||||
ctx_option_t ctx_options = 0;
|
||||
void *ssl_sessionid = NULL;
|
||||
SSL_SESSION *ssl_session = NULL;
|
||||
const unsigned char *der_sessionid = NULL;
|
||||
size_t der_sessionid_size = 0;
|
||||
struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
|
||||
struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);
|
||||
const long int ssl_version_min = conn_config->version;
|
||||
|
|
@ -3937,18 +3958,29 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
|
|||
octx->reused_session = FALSE;
|
||||
if(ssl_config->primary.cache_session && transport == TRNSPRT_TCP) {
|
||||
Curl_ssl_sessionid_lock(data);
|
||||
if(!Curl_ssl_getsessionid(cf, data, peer, &ssl_sessionid, NULL)) {
|
||||
if(!Curl_ssl_getsessionid(cf, data, peer, (void **)&der_sessionid,
|
||||
&der_sessionid_size)) {
|
||||
/* we got a session id, use it! */
|
||||
if(!SSL_set_session(octx->ssl, ssl_sessionid)) {
|
||||
Curl_ssl_sessionid_unlock(data);
|
||||
failf(data, "SSL: SSL_set_session failed: %s",
|
||||
ossl_strerror(ERR_get_error(), error_buffer,
|
||||
sizeof(error_buffer)));
|
||||
return CURLE_SSL_CONNECT_ERROR;
|
||||
ssl_session = d2i_SSL_SESSION(NULL, &der_sessionid,
|
||||
(long)der_sessionid_size);
|
||||
if(ssl_session) {
|
||||
if(!SSL_set_session(octx->ssl, ssl_session)) {
|
||||
Curl_ssl_sessionid_unlock(data);
|
||||
SSL_SESSION_free(ssl_session);
|
||||
failf(data, "SSL: SSL_set_session failed: %s",
|
||||
ossl_strerror(ERR_get_error(), error_buffer,
|
||||
sizeof(error_buffer)));
|
||||
return CURLE_SSL_CONNECT_ERROR;
|
||||
}
|
||||
SSL_SESSION_free(ssl_session);
|
||||
/* Informational message */
|
||||
infof(data, "SSL reusing session ID");
|
||||
octx->reused_session = TRUE;
|
||||
}
|
||||
else {
|
||||
Curl_ssl_sessionid_unlock(data);
|
||||
return CURLE_SSL_CONNECT_ERROR;
|
||||
}
|
||||
/* Informational message */
|
||||
infof(data, "SSL reusing session ID");
|
||||
octx->reused_session = TRUE;
|
||||
}
|
||||
Curl_ssl_sessionid_unlock(data);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue