X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Flookups%2Fredis.c;h=9146cba7668135a85883b2d5a68e2f035fde0760;hp=5f677ff067a11829126e632fa3f359c4616e3aca;hb=1e1ddfac79fbcd052f199500a6493c7f79cb8462;hpb=42653575e8539e76698610e2fc36c5ebc653f074 diff --git a/src/src/lookups/redis.c b/src/src/lookups/redis.c index 5f677ff06..9146cba76 100644 --- a/src/src/lookups/redis.c +++ b/src/src/lookups/redis.c @@ -2,12 +2,13 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ +/* Copyright (c) The Exim Maintainers 2020 */ /* See the file NOTICE for conditions of use and distribution. */ #include "../exim.h" -#ifdef EXPERIMENTAL_REDIS +#ifdef LOOKUP_REDIS #include "lf_functions.h" @@ -28,7 +29,7 @@ static redis_connection *redis_connections = NULL; static void * -redis_open(uschar *filename, uschar **errmsg) +redis_open(const uschar * filename, uschar ** errmsg) { return (void *)(1); } @@ -47,7 +48,7 @@ redis_connection *cn; while ((cn = redis_connections)) { redis_connections = cn->next; - DEBUG(D_lookup) debug_printf("close REDIS connection: %s\n", cn->server); + DEBUG(D_lookup) debug_printf_indent("close REDIS connection: %s\n", cn->server); redisFree(cn->handle); } } @@ -63,6 +64,7 @@ single server. errmsg where to point an error message defer_break TRUE if no more servers are to be tried after DEFER do_cache set false if data is changed + opts options The server string is of the form "host/dbnumber/password". The host can be host:port. This string is in a nextinlist temporary buffer, so can be @@ -73,20 +75,17 @@ single server. static int perform_redis_search(const uschar *command, uschar *server, uschar **resultptr, - uschar **errmsg, BOOL *defer_break, uint *do_cache) + uschar **errmsg, BOOL *defer_break, uint *do_cache, const uschar * opts) { redisContext *redis_handle = NULL; /* Keep compilers happy */ redisReply *redis_reply = NULL; redisReply *entry = NULL; redisReply *tentry = NULL; redis_connection *cn; -int ssize = 0; -int offset = 0; int yield = DEFER; int i, j; -uschar *result = NULL; +gstring * result = NULL; uschar *server_copy = NULL; -uschar *tmp, *ttmp; uschar *sdata[3]; /* Disaggregate the parameters from the server argument. @@ -95,7 +94,7 @@ We can write to the string, since it is in a nextinlist temporary buffer. This copy is also used for debugging output. */ memset(sdata, 0, sizeof(sdata)) /* Set all to NULL */; -for (i = 2; i > 0; i--) +for (int i = 2; i > 0; i--) { uschar *pp = Ustrrchr(server, '/'); @@ -118,7 +117,7 @@ if (sdata[2][0] == 0) sdata[2] = NULL; /* See if we have a cached connection to the server */ -for (cn = redis_connections; cn != NULL; cn = cn->next) +for (cn = redis_connections; cn; cn = cn->next) if (Ustrcmp(cn->server, server_copy) == 0) { redis_handle = cn->handle; @@ -157,7 +156,7 @@ if (!cn) } DEBUG(D_lookup) - debug_printf("REDIS new connection: host=%s port=%d socket=%s database=%s\n", + debug_printf_indent("REDIS new connection: host=%s port=%d socket=%s database=%s\n", sdata[0], port, socket, sdata[1]); /* Get store for a new handle, initialize it, and connect to the server */ @@ -166,13 +165,13 @@ if (!cn) socket ? redisConnectUnix(CCS socket) : redisConnect(CCS server, port); if (!redis_handle) { - *errmsg = string_sprintf("REDIS connection failed"); + *errmsg = US"REDIS connection failed"; *defer_break = FALSE; goto REDIS_EXIT; } /* Add the connection to the cache */ - cn = store_get(sizeof(redis_connection)); + cn = store_get(sizeof(redis_connection), FALSE); cn->server = server_copy; cn->handle = redis_handle; cn->next = redis_connections; @@ -181,7 +180,7 @@ if (!cn) else { DEBUG(D_lookup) - debug_printf("REDIS using cached connection for %s\n", server_copy); + debug_printf_indent("REDIS using cached connection for %s\n", server_copy); } /* Authenticate if there is a password */ @@ -202,34 +201,35 @@ if(sdata[1]) *defer_break = FALSE; goto REDIS_EXIT; } - DEBUG(D_lookup) debug_printf("REDIS: Selecting database=%s\n", sdata[1]); + DEBUG(D_lookup) debug_printf_indent("REDIS: Selecting database=%s\n", sdata[1]); } /* split string on whitespace into argv */ { uschar * argv[32]; - int i; const uschar * s = command; - int siz, ptr; + int siz, ptr, i; uschar c; while (isspace(*s)) s++; for (i = 0; *s && i < nele(argv); i++) { - for (argv[i] = NULL, siz = ptr = 0; (c = *s) && !isspace(c); s++) + gstring * g; + + for (g = NULL; (c = *s) && !isspace(c); s++) if (c != '\\' || *++s) /* backslash protects next char */ - argv[i] = string_cat(argv[i], &siz, &ptr, s, 1); - *(argv[i]+ptr) = '\0'; - DEBUG(D_lookup) debug_printf("REDIS: argv[%d] '%s'\n", i, argv[i]); + g = string_catn(g, s, 1); + argv[i] = string_from_gstring(g); + + DEBUG(D_lookup) debug_printf_indent("REDIS: argv[%d] '%s'\n", i, argv[i]); while (isspace(*s)) s++; } /* Run the command. We use the argv form rather than plain as that parses into args by whitespace yet has no escaping mechanism. */ - redis_reply = redisCommandArgv(redis_handle, i, (const char **) argv, NULL); - if (!redis_reply) + if (!(redis_reply = redisCommandArgv(redis_handle, i, CCSS argv, NULL))) { *errmsg = string_sprintf("REDIS: query failed: %s\n", redis_handle->errstr); *defer_break = FALSE; @@ -241,28 +241,39 @@ switch (redis_reply->type) { case REDIS_REPLY_ERROR: *errmsg = string_sprintf("REDIS: lookup result failed: %s\n", redis_reply->str); - *defer_break = FALSE; + + /* trap MOVED cluster responses and follow them */ + if (Ustrncmp(redis_reply->str, "MOVED", 5) == 0) + { + DEBUG(D_lookup) + debug_printf_indent("REDIS: cluster redirect %s\n", redis_reply->str); + /* follow redirect + This is cheating, we simply set defer_break = FALSE to move on to + the next server in the redis_servers list */ + *defer_break = FALSE; + return DEFER; + } else { + *defer_break = TRUE; + } *do_cache = 0; goto REDIS_EXIT; /* NOTREACHED */ case REDIS_REPLY_NIL: DEBUG(D_lookup) - debug_printf("REDIS: query was not one that returned any data\n"); - result = string_sprintf(""); + debug_printf_indent("REDIS: query was not one that returned any data\n"); + result = string_catn(result, US"", 1); *do_cache = 0; goto REDIS_EXIT; /* NOTREACHED */ case REDIS_REPLY_INTEGER: - ttmp = (redis_reply->integer != 0) ? US"true" : US"false"; - result = string_cat(result, &ssize, &offset, US ttmp, Ustrlen(ttmp)); + result = string_cat(result, redis_reply->integer != 0 ? US"true" : US"false"); break; case REDIS_REPLY_STRING: case REDIS_REPLY_STATUS: - result = string_cat(result, &ssize, &offset, - US redis_reply->str, redis_reply->len); + result = string_catn(result, US redis_reply->str, redis_reply->len); break; case REDIS_REPLY_ARRAY: @@ -270,56 +281,51 @@ switch (redis_reply->type) /* NOTE: For now support 1 nested array result. If needed a limitless result can be parsed */ - for (i = 0; i < redis_reply->elements; i++) + for (int i = 0; i < redis_reply->elements; i++) { entry = redis_reply->element[i]; if (result) - result = string_cat(result, &ssize, &offset, US"\n", 1); + result = string_catn(result, US"\n", 1); switch (entry->type) { case REDIS_REPLY_INTEGER: - tmp = string_sprintf("%d", entry->integer); - result = string_cat(result, &ssize, &offset, US tmp, Ustrlen(tmp)); + result = string_fmt_append(result, "%d", entry->integer); break; case REDIS_REPLY_STRING: - result = string_cat(result, &ssize, &offset, - US entry->str, entry->len); + result = string_catn(result, US entry->str, entry->len); break; case REDIS_REPLY_ARRAY: - for (j = 0; j < entry->elements; j++) + for (int j = 0; j < entry->elements; j++) { tentry = entry->element[j]; if (result) - result = string_cat(result, &ssize, &offset, US"\n", 1); + result = string_catn(result, US"\n", 1); switch (tentry->type) { case REDIS_REPLY_INTEGER: - ttmp = string_sprintf("%d", tentry->integer); - result = string_cat(result, &ssize, &offset, - US ttmp, Ustrlen(ttmp)); + result = string_fmt_append(result, "%d", tentry->integer); break; case REDIS_REPLY_STRING: - result = string_cat(result, &ssize, &offset, - US tentry->str, tentry->len); + result = string_catn(result, US tentry->str, tentry->len); break; case REDIS_REPLY_ARRAY: DEBUG(D_lookup) - debug_printf("REDIS: result has nesting of arrays which" + debug_printf_indent("REDIS: result has nesting of arrays which" " is not supported. Ignoring!\n"); break; default: - DEBUG(D_lookup) debug_printf( + DEBUG(D_lookup) debug_printf_indent( "REDIS: result has unsupported type. Ignoring!\n"); break; } } break; default: - DEBUG(D_lookup) debug_printf("REDIS: query returned unsupported type\n"); + DEBUG(D_lookup) debug_printf_indent("REDIS: query returned unsupported type\n"); break; } } @@ -328,10 +334,7 @@ switch (redis_reply->type) if (result) - { - result[offset] = 0; - store_reset(result + offset + 1); - } + gstring_release_unused(result); else { yield = FAIL; @@ -345,16 +348,16 @@ as it is cached. */ if (redis_reply) freeReplyObject(redis_reply); -/* Non-NULL result indicates a sucessful result */ +/* Non-NULL result indicates a successful result */ if (result) { - *resultptr = result; + *resultptr = string_from_gstring(result); return OK; } else { - DEBUG(D_lookup) debug_printf("%s\n", *errmsg); + DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg); /* NOTE: Required to close connection since it needs to be reopened */ return yield; /* FAIL or DEFER */ } @@ -373,13 +376,13 @@ else */ static int -redis_find(void *handle __attribute__((unused)), - uschar *filename __attribute__((unused)), - const uschar *command, int length, uschar **result, uschar **errmsg, - uint *do_cache) +redis_find(void * handle __attribute__((unused)), + const uschar * filename __attribute__((unused)), + const uschar * command, int length, uschar ** result, uschar ** errmsg, + uint * do_cache, const uschar * opts) { return lf_sqlperform(US"Redis", US"redis_servers", redis_servers, command, - result, errmsg, do_cache, perform_redis_search); + result, errmsg, do_cache, opts, perform_redis_search); } @@ -414,7 +417,7 @@ while ((c = *t++) != 0) if (isspace(c) || c == '\\') count++; if (count == 0) return s; -t = quoted = store_get(Ustrlen(s) + count + 1); +t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s)); while ((c = *s++) != 0) { @@ -446,23 +449,23 @@ fprintf(f, " Exim version %s\n", EXIM_VERSION_STR); /* These are the lookup_info blocks for this driver */ static lookup_info redis_lookup_info = { - US"redis", /* lookup name */ - lookup_querystyle, /* query-style lookup */ - redis_open, /* open function */ - NULL, /* no check function */ - redis_find, /* find function */ - NULL, /* no close function */ - redis_tidy, /* tidy function */ - redis_quote, /* quoting function */ - redis_version_report /* version reporting */ + .name = US"redis", /* lookup name */ + .type = lookup_querystyle, /* query-style lookup */ + .open = redis_open, /* open function */ + .check = NULL, /* no check function */ + .find = redis_find, /* find function */ + .close = NULL, /* no close function */ + .tidy = redis_tidy, /* tidy function */ + .quote = redis_quote, /* quoting function */ + .version_report = redis_version_report /* version reporting */ }; #ifdef DYNLOOKUP -#define redis_lookup_module_info _lookup_module_info +# define redis_lookup_module_info _lookup_module_info #endif /* DYNLOOKUP */ static lookup_info *_lookup_list[] = { &redis_lookup_info }; lookup_module_info redis_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 }; -#endif /* EXPERIMENTAL_REDIS */ +#endif /* LOOKUP_REDIS */ /* End of lookups/redis.c */