vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-16 19:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Implements Redis-authentication

Browse source 
Implements #685
This commit is contained in:
Simone Mainardi 2016-08-11 11:34:36 +02:00
parent bd45142fa9
commit f1c25e7d77
5 changed files with 59 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Redis.cpp
View file

@ -29,8 +29,9 @@
/* **************************************** */
Redis::Redis(char *_redis_host, u_int16_t _redis_port, u_int8_t _redis_db_id) {
redis_host = _redis_host, redis_port= _redis_port, redis_db_id = _redis_db_id;
Redis::Redis(char *_redis_host, char *_redis_password, u_int16_t _redis_port, u_int8_t _redis_db_id) {
redis_host = _redis_host, redis_password = _redis_password;
redis_port = _redis_port, redis_db_id = _redis_db_id;
redis = NULL, operational = false;
reconnectRedis();
@ -63,8 +64,17 @@ void Redis::reconnectRedis() {
redis = redisConnectWithTimeout(redis_host, redis_port, timeout);
while(num_attemps > 0) {
if(redis) reply = (redisReply*)redisCommand(redis, "PING"); else reply = NULL;
if(redis_password) {
reply = (redisReply*)redisCommand(redis, "AUTH %s", redis_password);
if(reply && (reply->type == REDIS_REPLY_ERROR)) {
ntop->getTrace()->traceEvent(TRACE_ERROR,
"Redis authentication failed: %s", reply->str ? reply->str : "???");
goto redis_error_handler;
}
}
while(redis && num_attemps > 0) {
reply = (redisReply*)redisCommand(redis, "PING");
if(reply && (reply->type == REDIS_REPLY_ERROR)) {
ntop->getTrace()->traceEvent(TRACE_ERROR, "%s", reply->str ? reply->str : "???");
sleep(1);
@ -83,6 +93,7 @@ void Redis::reconnectRedis() {
} else {
freeReplyObject(reply);
reply = (redisReply*)redisCommand(redis, "SELECT %u", redis_db_id);
if(reply && (reply->type == REDIS_REPLY_ERROR)) {
ntop->getTrace()->traceEvent(TRACE_ERROR, "%s", reply->str ? reply->str : "???");