fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1545 from mattsta/fix-redis-cli-sync

Browse Source 
Deny SYNC and PSYNC in redis-cli
This commit is contained in:
Salvatore Sanfilippo 2014-02-23 17:47:28 +01:00
commit e163332858
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/redis-cli.c
View File

@ -94,6 +94,7 @@ static struct config {
} config; } config;
static void usage(); static void usage();
static void slaveMode(void);
char *redisGitSHA1(void); char *redisGitSHA1(void);
char *redisGitDirty(void); char *redisGitDirty(void);
@ -600,6 +601,8 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
if (!strcasecmp(command,"monitor")) config.monitor_mode = 1; if (!strcasecmp(command,"monitor")) config.monitor_mode = 1;
if (!strcasecmp(command,"subscribe") || if (!strcasecmp(command,"subscribe") ||
!strcasecmp(command,"psubscribe")) config.pubsub_mode = 1; !strcasecmp(command,"psubscribe")) config.pubsub_mode = 1;
if (!strcasecmp(command,"sync") ||
!strcasecmp(command,"psync")) config.slave_mode = 1;
/* Setup argument length */ /* Setup argument length */
argvlen = malloc(argc*sizeof(size_t)); argvlen = malloc(argc*sizeof(size_t));
@ -621,6 +624,13 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
} }
} }
if (config.slave_mode) {
printf("Entering slave output mode... (press Ctrl-C to quit)\n");
slaveMode();
config.slave_mode = 0;
return REDIS_ERR; /* Error = slaveMode lost connection to master */
}
if (cliReadReply(output_raw) != REDIS_OK) { if (cliReadReply(output_raw) != REDIS_OK) {
free(argvlen); free(argvlen);
return REDIS_ERR; return REDIS_ERR;
@ -1061,6 +1071,7 @@ static void slaveMode(void) {
int fd = context->fd; int fd = context->fd;
unsigned long long payload = sendSync(fd); unsigned long long payload = sendSync(fd);
char buf[1024]; char buf[1024];
int original_output = config.output;
fprintf(stderr,"SYNC with master, discarding %llu " fprintf(stderr,"SYNC with master, discarding %llu "
"bytes of bulk transfer...\n", payload); "bytes of bulk transfer...\n", payload);
@ -1081,6 +1092,7 @@ static void slaveMode(void) {
/* Now we can use hiredis to read the incoming protocol. */ /* Now we can use hiredis to read the incoming protocol. */
config.output = OUTPUT_CSV; config.output = OUTPUT_CSV;
while (cliReadReply(0) == REDIS_OK); while (cliReadReply(0) == REDIS_OK);
config.output = original_output;
} }
/* This function implements --rdb, so it uses the replication protocol in order /* This function implements --rdb, so it uses the replication protocol in order