RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-19 21:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: ssl: Fix check against SNI during server certificate verification

Browse Source 
This patch fixes the commit 2ab8867 ("MINOR: ssl: compare server certificate
names to the SNI on outgoing connections")

When we check the certificate sent by a server, in the verify callback, we get
the SNI from the session (SSL_SESSION object). In OpenSSL, tlsext_hostname value
for this session is copied from the ssl connection (SSL object). But the copy is
done only if the "server_name" extension is found in the server hello
message. This means the server has found a certificate matching the client's
SNI.

When the server returns a default certificate not matching the client's SNI, it
doesn't set any "server_name" extension in the server hello message. So no SNI
is set on the SSL session and SSL_SESSION_get0_hostname always returns NULL.

To fix the problemn, we get the SNI directly from the SSL connection. It is
always defined with the value set by the client.

If the commit 2ab8867 is backported in 1.7 and/or 1.6, this one must be
backported too.

Note: it's worth mentionning that by making the SNI check work, we
      introduce another problem by which failed SNI checks can cause
      long connection retries on the server, and in certain cases the
      SNI value used comes from the client. So this patch series must
      not be backported until this issue is resolved.
This commit is contained in:
Christopher Faulet 2017-07-26 11:50:01 +02:00 committed by Willy Tarreau
parent 9b82a588cd
commit 96c7b8dbd2
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/proto/openssl-compat.h
View File

@ -94,11 +94,6 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned cha
* Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL
*/ */
static inline const char *SSL_SESSION_get0_hostname(const SSL_SESSION *sess)
{
return sess->tlsext_hostname;
}
static inline const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *sess, unsigned int *sid_ctx_length) static inline const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *sess, unsigned int *sid_ctx_length)
{ {
*sid_ctx_length = sess->sid_ctx_length; *sid_ctx_length = sess->sid_ctx_length;

6
src/ssl_sock.c
View File

@ -3951,11 +3951,7 @@ static int ssl_sock_srv_verifycbk(int ok, X509_STORE_CTX *ctx)
*/ */
servername = objt_server(conn->target)->ssl_ctx.verify_host; servername = objt_server(conn->target)->ssl_ctx.verify_host;
if (!servername) { if (!servername) {
SSL_SESSION *ssl_sess = SSL_get_session(conn->xprt_ctx); servername = SSL_get_servername(conn->xprt_ctx, TLSEXT_NAMETYPE_host_name);
if (!ssl_sess)
return ok;
servername = SSL_SESSION_get0_hostname(ssl_sess);
if (!servername) if (!servername)
return ok; return ok;
} }