Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
9f87ef93
Unverified
Commit
9f87ef93
authored
Dec 07, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Dec 07, 2018
Browse files
Merge pull request #5460 from krallin/env-password
cli: pass auth through REDISCLI_AUTH
parents
75c181ee
f24ad5d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis-cli.c
View file @
9f87ef93
...
...
@@ -67,6 +67,7 @@
#define REDIS_CLI_HISTFILE_DEFAULT ".rediscli_history"
#define REDIS_CLI_RCFILE_ENV "REDISCLI_RCFILE"
#define REDIS_CLI_RCFILE_DEFAULT ".redisclirc"
#define REDIS_CLI_AUTH_ENV "REDISCLI_AUTH"
#define CLUSTER_MANAGER_SLOTS 16384
#define CLUSTER_MANAGER_MIGRATE_TIMEOUT 60000
...
...
@@ -1419,6 +1420,14 @@ static int parseOptions(int argc, char **argv) {
return
i
;
}
static
void
parseEnv
()
{
/* Set auth from env, but do not overwrite CLI arguments if passed */
char
*
auth
=
getenv
(
REDIS_CLI_AUTH_ENV
);
if
(
auth
!=
NULL
&&
config
.
auth
==
NULL
)
{
config
.
auth
=
auth
;
}
}
static
sds
readArgFromStdin
(
void
)
{
char
buf
[
1024
];
sds
arg
=
sdsempty
();
...
...
@@ -1446,6 +1455,9 @@ static void usage(void) {
" -p <port> Server port (default: 6379).
\n
"
" -s <socket> Server socket (overrides hostname and port).
\n
"
" -a <password> Password to use when connecting to the server.
\n
"
" You can also use the "
REDIS_CLI_AUTH_ENV
" environment
\n
"
" variable to pass this password more safely
\n
"
" (if both are used, this argument takes predecence).
\n
"
" -u <uri> Server URI.
\n
"
" -r <repeat> Execute specified command N times.
\n
"
" -i <interval> When -r is used, waits <interval> seconds per command.
\n
"
...
...
@@ -6781,6 +6793,8 @@ int main(int argc, char **argv) {
argc
-=
firstarg
;
argv
+=
firstarg
;
parseEnv
();
/* Cluster Manager mode */
if
(
CLUSTER_MANAGER_MODE
())
{
clusterManagerCommandProc
*
proc
=
validateClusterManagerCommand
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment