Skip to content

feat(imhiredis): Add support for TLS in imhiredis #21

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 3 commits into
base: dev
Choose a base branch
from
Open

feat(imhiredis): Add support for TLS in imhiredis #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05612ca
feat(imhiredis): Add support for TLS in imhiredis
Oct 15, 2025
b018023
fix(imhiredis): Ensure both client_cert and client_key are specified …
Oct 21, 2025
edf38a5
fix(imhiredis): fix SSL initialization for thread safety
Oct 21, 2025
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
44 changes: 43 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2638,6 +2638,16 @@ AC_ARG_ENABLE(redis_tests,
)
AM_CONDITIONAL(ENABLE_REDIS_TESTS, test x$enable_redis_tests = xyes)

AC_ARG_ENABLE(redis_ssl,
[AS_HELP_STRING([--enable-redis-ssl],[Enable redis ssl support @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_redis_ssl="yes" ;;
no) enable_redis_ssl="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-redis-ssl) ;;
esac],
[enable_redis_ssl=no]
)

if test "x$enable_omhiredis" = "xyes" -o "x$enable_imhiredis" = "xyes" ; then
PKG_CHECK_MODULES(HIREDIS, hiredis >= 0.10.1, [],
[AC_SEARCH_LIBS(redisConnectWithTimeout, hiredis,
Expand All @@ -2662,13 +2672,44 @@ if test "x$enable_omhiredis" = "xyes" -o "x$enable_imhiredis" = "xyes" ; then
[AC_MSG_ERROR([hiredis not found])]
)]
)
if test "x$enable_redis_ssl" = "xyes"; then
PKG_CHECK_MODULES(HIREDIS_SSL, hiredis_ssl >= 0.10.1,
# hiredis_ssl found
[
AC_DEFINE(HIREDIS_SSL, 1, [TLS support enabled in hiredis])
],
[AC_SEARCH_LIBS(redisCreateSSLContext, hiredis_ssl,
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[ #include <hiredis/hiredis.h>
#include <hiredis/hiredis_ssl.h>
]],
[[ #define major 0
#define minor 10
#define patch 1
#if (( HIREDIS_MAJOR > major ) || \
(( HIREDIS_MAJOR == major ) && ( HIREDIS_MINOR > minor )) || \
(( HIREDIS_MAJOR == major ) && ( HIREDIS_MINOR == minor ) && ( HIREDIS_PATCH >= patch ))) \
/* OK */
#else
# error Hiredis_ssl version must be >= major.minor.path
#endif
]]
)],
[],
[AC_MSG_ERROR([hiredis_ssl version must be >= 0.10.1])]
)],
[AC_MSG_WARN([hiredis_ssl not found, no TLS support in hiredis])]
)]
)
fi
fi

if test "x$enable_imhiredis" = "xyes" ; then
PKG_CHECK_MODULES(LIBEVENT, [libevent >= 2.0, libevent_pthreads],
# libevent found
[
HIREDIS_LIBS="$HIREDIS_LIBS -levent -levent_pthreads"
HIREDIS_LIBS="$HIREDIS_LIBS $HIREDIS_SSL_LIBS -levent -levent_pthreads"
],
# libevent not found
[AC_MSG_ERROR([no libevent >= 2.0 found with pthreads support, imhiredis cannot use pub/sub])])
Expand Down Expand Up @@ -2982,6 +3023,7 @@ echo " kafka static linking enabled: $enable_kafka_static"
echo " qpid proton static linking enabled: $enable_qpidproton_static"
echo " atomic operations enabled: $enable_atomic_operations"
echo " libcap-ng support enabled: $enable_libcapng"
echo " redis ssl support enabled: $enable_redis_ssl"

echo
echo "---{ input plugins }---"
Expand Down
4 changes: 2 additions & 2 deletions contrib/imhiredis/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkglib_LTLIBRARIES = imhiredis.la
imhiredis_la_SOURCES = imhiredis.c
imhiredis_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(HIREDIS_CFLAGS)
imhiredis_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(HIREDIS_CFLAGS) $(HIREDIS_SSL_CFLAGS)
imhiredis_la_LDFLAGS = -module -avoid-version
imhiredis_la_LIBADD = $(HIREDIS_LIBS)
imhiredis_la_LIBADD = $(HIREDIS_LIBS) $(HIREDIS_SSL_LIBS)

EXTRA_DIST =
Loading