Review comments

master
Jessie Murray 3 years ago
parent 8e9dcda928
commit 863d003531
No known key found for this signature in database
GPG Key ID: E7E4D57EDDA744C5

@ -199,7 +199,7 @@ Follow this table to diagnose issues with SSL connections to Redis.
* Multi-threaded server, configurable number of worker threads. * Multi-threaded server, configurable number of worker threads.
* [WebSocket support](#websockets) (Currently using the specification from [RFC 6455](https://datatracker.ietf.org/doc/html/rfc6455)). * [WebSocket support](#websockets) (Currently using the specification from [RFC 6455](https://datatracker.ietf.org/doc/html/rfc6455)).
* Connects to Redis using a TCP or UNIX socket. * Connects to Redis using a TCP or UNIX socket.
* Support for [secure connections to Redis](https://redis.io/topics/encryption) (requires Redis 6 or newer). * Support for [secure connections to Redis](#configuring-webdis-with-ssl) (requires [Redis 6 or newer](https://redis.io/topics/encryption)).
* Restricted commands by IP range (CIDR subnet + mask) or HTTP Basic Auth, returning 403 errors. * Restricted commands by IP range (CIDR subnet + mask) or HTTP Basic Auth, returning 403 errors.
* Support for Redis authentication in the config file: set `redis_auth` to a single string to use a password value, or to an array of two strings to use username+password auth ([new in Redis 6.0](https://redis.io/commands/auth)). * Support for Redis authentication in the config file: set `redis_auth` to a single string to use a password value, or to an array of two strings to use username+password auth ([new in Redis 6.0](https://redis.io/commands/auth)).
* Environment variables can be used as values in the config file, starting with `$` and in all caps (e.g. `$REDIS_HOST`). * Environment variables can be used as values in the config file, starting with `$` and in all caps (e.g. `$REDIS_HOST`).

@ -17,7 +17,8 @@ static struct acl *
conf_parse_acls(json_t *jtab); conf_parse_acls(json_t *jtab);
#if HAVE_SSL #if HAVE_SSL
void conf_parse_ssl(struct conf *conf, json_t *jssl, const char *filename); void
conf_parse_ssl(struct conf *conf, json_t *jssl, const char *filename);
#endif #endif
#define ACL_ERROR_PREFIX "Config error with 'redis_auth': " #define ACL_ERROR_PREFIX "Config error with 'redis_auth': "

@ -196,7 +196,7 @@ pool_connect(struct pool *p, int db_num, int attach) {
#ifdef HAVE_SSL #ifdef HAVE_SSL
/* Negotiate SSL/TLS */ /* Negotiate SSL/TLS */
if(p->w->s->cfg->ssl.enabled) { if(p->w->s->cfg->ssl.enabled) {
if (redisInitiateSSLWithContext((redisContext*)&ac->c, p->w->s->ssl_context) != REDIS_OK) { if(redisInitiateSSLWithContext((redisContext*)&ac->c, p->w->s->ssl_context) != REDIS_OK) {
/* Handle error, in c->err / c->errstr */ /* Handle error, in c->err / c->errstr */
slog(p->w->s, WEBDIS_ERROR, "SSL negotiation failed", 0); slog(p->w->s, WEBDIS_ERROR, "SSL negotiation failed", 0);
if(ac->c.err) { /* non-zero on error */ if(ac->c.err) { /* non-zero on error */

Loading…
Cancel
Save