Skip to content

TLS: Validate the hostname of the server certificate #864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TLS: Validate the hostname of the server certificate #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions hiredis_ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ int redisInitOpenSSL(void);
* certificate and private key files to use for authentication. They need to
* be both specified or omitted.
*
* server_name is an optional and will be used as a server name indication
* (SNI) TLS extension.
* server_name is optional and will be used as a server name indication (SNI)
* TLS extension and to validate the hostname of the server's certificate
* (this requires OpenSSL 1.1.0 or newer).
*
* If error is non-null, it will be populated in case the context creation fails
* (returning a NULL).
Expand Down
20 changes: 19 additions & 1 deletion ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/x509v3.h>

#include "win32.h"
#include "async_private.h"
Expand Down Expand Up @@ -85,6 +86,14 @@ typedef struct redisSSL {
/* Forward declaration */
redisContextFuncs redisContextSSLFuncs;

/**
* OpenSSL hostname validation for OpenSSL >= 1.1.0
* Reference: https://wiki.openssl.org/index.php/Hostname_validation
*/
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
#define HIREDIS_CHECK_SSL_SERVER_NAME
#endif

/**
* OpenSSL global initialization and locking handling callbacks.
* Note that this is only required for OpenSSL < 1.1.0.
Expand Down Expand Up @@ -348,9 +357,18 @@ int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx)

if (redis_ssl_ctx->server_name) {
if (!SSL_set_tlsext_host_name(ssl, redis_ssl_ctx->server_name)) {
__redisSetError(c, REDIS_ERR_OTHER, "Failed to set server_name/SNI");
__redisSetError(c, REDIS_ERR_OTHER,
"Failed to set server name for SNI");
goto error;
}
#ifdef HIREDIS_CHECK_SSL_SERVER_NAME
SSL_set_hostflags(ssl, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
if (!SSL_set1_host(ssl, redis_ssl_ctx->server_name)) {
__redisSetError(c, REDIS_ERR_OTHER,
"Failed to set server name for certificate validation");
goto error;
}
#endif
}

return redisSSLConnect(c, ssl);
Expand Down