
b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
164 lines
5.9 KiB
C
164 lines
5.9 KiB
C
|
|
/*
|
|
* Copyright (c) 2019, Redis Labs
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
* to endorse or promote products derived from this software without
|
|
* specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef __HIREDIS_SSL_H
|
|
#define __HIREDIS_SSL_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* This is the underlying struct for SSL in ssl.h, which is not included to
|
|
* keep build dependencies short here.
|
|
*/
|
|
struct ssl_st;
|
|
|
|
/* A wrapper around OpenSSL SSL_CTX to allow easy SSL use without directly
|
|
* calling OpenSSL.
|
|
*/
|
|
typedef struct redisSSLContext redisSSLContext;
|
|
|
|
/**
|
|
* Initialization errors that redisCreateSSLContext() may return.
|
|
*/
|
|
|
|
typedef enum {
|
|
REDIS_SSL_CTX_NONE = 0, /* No Error */
|
|
REDIS_SSL_CTX_CREATE_FAILED, /* Failed to create OpenSSL SSL_CTX */
|
|
REDIS_SSL_CTX_CERT_KEY_REQUIRED, /* Client cert and key must both be specified or skipped */
|
|
REDIS_SSL_CTX_CA_CERT_LOAD_FAILED, /* Failed to load CA Certificate or CA Path */
|
|
REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED, /* Failed to load client certificate */
|
|
REDIS_SSL_CTX_CLIENT_DEFAULT_CERT_FAILED, /* Failed to set client default certificate directory */
|
|
REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED, /* Failed to load private key */
|
|
REDIS_SSL_CTX_OS_CERTSTORE_OPEN_FAILED, /* Failed to open system certificate store */
|
|
REDIS_SSL_CTX_OS_CERT_ADD_FAILED /* Failed to add CA certificates obtained from system to the SSL context */
|
|
} redisSSLContextError;
|
|
|
|
/* Constants that mirror OpenSSL's verify modes. By default,
|
|
* REDIS_SSL_VERIFY_PEER is used with redisCreateSSLContext().
|
|
* Some Redis clients disable peer verification if there are no
|
|
* certificates specified.
|
|
*/
|
|
#define REDIS_SSL_VERIFY_NONE 0x00
|
|
#define REDIS_SSL_VERIFY_PEER 0x01
|
|
#define REDIS_SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
|
|
#define REDIS_SSL_VERIFY_CLIENT_ONCE 0x04
|
|
#define REDIS_SSL_VERIFY_POST_HANDSHAKE 0x08
|
|
|
|
/* Options to create an OpenSSL context. */
|
|
typedef struct {
|
|
const char *cacert_filename;
|
|
const char *capath;
|
|
const char *cert_filename;
|
|
const char *private_key_filename;
|
|
const char *server_name;
|
|
int verify_mode;
|
|
} redisSSLOptions;
|
|
|
|
/**
|
|
* Return the error message corresponding with the specified error code.
|
|
*/
|
|
|
|
const char *redisSSLContextGetError(redisSSLContextError error);
|
|
|
|
/**
|
|
* Helper function to initialize the OpenSSL library.
|
|
*
|
|
* OpenSSL requires one-time initialization before it can be used. Callers should
|
|
* call this function only once, and only if OpenSSL is not directly initialized
|
|
* elsewhere.
|
|
*/
|
|
int redisInitOpenSSL(void);
|
|
|
|
/**
|
|
* Helper function to initialize an OpenSSL context that can be used
|
|
* to initiate SSL connections.
|
|
*
|
|
* cacert_filename is an optional name of a CA certificate/bundle file to load
|
|
* and use for validation.
|
|
*
|
|
* capath is an optional directory path where trusted CA certificate files are
|
|
* stored in an OpenSSL-compatible structure.
|
|
*
|
|
* cert_filename and private_key_filename are optional names of a client side
|
|
* 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.
|
|
*
|
|
* If error is non-null, it will be populated in case the context creation fails
|
|
* (returning a NULL).
|
|
*/
|
|
|
|
redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
|
|
const char *cert_filename, const char *private_key_filename,
|
|
const char *server_name, redisSSLContextError *error);
|
|
|
|
/**
|
|
* Helper function to initialize an OpenSSL context that can be used
|
|
* to initiate SSL connections. This is a more extensible version of redisCreateSSLContext().
|
|
*
|
|
* options contains a structure of SSL options to use.
|
|
*
|
|
* If error is non-null, it will be populated in case the context creation fails
|
|
* (returning a NULL).
|
|
*/
|
|
redisSSLContext *redisCreateSSLContextWithOptions(redisSSLOptions *options,
|
|
redisSSLContextError *error);
|
|
|
|
/**
|
|
* Free a previously created OpenSSL context.
|
|
*/
|
|
void redisFreeSSLContext(redisSSLContext *redis_ssl_ctx);
|
|
|
|
/**
|
|
* Initiate SSL on an existing redisContext.
|
|
*
|
|
* This is similar to redisInitiateSSL() but does not require the caller
|
|
* to directly interact with OpenSSL, and instead uses a redisSSLContext
|
|
* previously created using redisCreateSSLContext().
|
|
*/
|
|
|
|
int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx);
|
|
|
|
/**
|
|
* Initiate SSL/TLS negotiation on a provided OpenSSL SSL object.
|
|
*/
|
|
|
|
int redisInitiateSSL(redisContext *c, struct ssl_st *ssl);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* __HIREDIS_SSL_H */
|