e3ef73dc2a
Normally, `redis-cli` escapes non-printable data received from Redis, using a custom scheme (which is also used to handle quoted input). When using `--json` this is not desired as it is not compatible with RFC 7159, which specifies JSON strings are assumed to be Unicode and how they should be escaped. This commit changes `--json` to follow RFC 7159, which means that properly encoded Unicode strings in Redis will result with a valid Unicode JSON. However, this introduces a new problem with `--json` and data that is not valid Unicode (e.g., random binary data, text that follows other encoding, etc.). To address this, we add `--quoted-json` which produces JSON strings that follow the original redis-cli quoting scheme. For example, a value that consists of only null (0x00) bytes will show up as: * `"\u0000\u0000\u0000"` when using `--json` * `"\\x00\\x00\\x00"` when using `--quoted-json`
55 lines
1.6 KiB
C
55 lines
1.6 KiB
C
#ifndef __CLICOMMON_H
|
|
#define __CLICOMMON_H
|
|
|
|
#include <hiredis.h>
|
|
#include <sdscompat.h> /* Use hiredis' sds compat header that maps sds calls to their hi_ variants */
|
|
|
|
typedef struct cliSSLconfig {
|
|
/* Requested SNI, or NULL */
|
|
char *sni;
|
|
/* CA Certificate file, or NULL */
|
|
char *cacert;
|
|
/* Directory where trusted CA certificates are stored, or NULL */
|
|
char *cacertdir;
|
|
/* Skip server certificate verification. */
|
|
int skip_cert_verify;
|
|
/* Client certificate to authenticate with, or NULL */
|
|
char *cert;
|
|
/* Private key file to authenticate with, or NULL */
|
|
char *key;
|
|
/* Preferred cipher list, or NULL (applies only to <= TLSv1.2) */
|
|
char* ciphers;
|
|
/* Preferred ciphersuites list, or NULL (applies only to TLSv1.3) */
|
|
char* ciphersuites;
|
|
} cliSSLconfig;
|
|
|
|
|
|
/* server connection information object, used to describe an ip:port pair, db num user input, and user:pass. */
|
|
typedef struct cliConnInfo {
|
|
char *hostip;
|
|
int hostport;
|
|
int input_dbnum;
|
|
char *auth;
|
|
char *user;
|
|
} cliConnInfo;
|
|
|
|
int cliSecureConnection(redisContext *c, cliSSLconfig config, const char **err);
|
|
|
|
ssize_t cliWriteConn(redisContext *c, const char *buf, size_t buf_len);
|
|
|
|
int cliSecureInit();
|
|
|
|
sds readArgFromStdin(void);
|
|
|
|
sds *getSdsArrayFromArgv(int argc,char **argv, int quoted);
|
|
|
|
sds unquoteCString(char *str);
|
|
|
|
void parseRedisUri(const char *uri, const char* tool_name, cliConnInfo *connInfo, int *tls_flag);
|
|
|
|
void freeCliConnInfo(cliConnInfo connInfo);
|
|
|
|
sds escapeJsonString(sds s, const char *p, size_t len);
|
|
|
|
#endif /* __CLICOMMON_H */
|