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
36d15882
Commit
36d15882
authored
Feb 25, 2019
by
antirez
Browse files
ACL: authCommand() refactored into ACLAuthenticateUser().
parent
87594a74
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/acl.c
View file @
36d15882
...
@@ -888,6 +888,22 @@ int ACLCheckUserCredentials(robj *username, robj *password) {
...
@@ -888,6 +888,22 @@ int ACLCheckUserCredentials(robj *username, robj *password) {
return
C_ERR
;
return
C_ERR
;
}
}
/* This is like ACLCheckUserCredentials(), however if the user/pass
* are correct, the connection is put in authenticated state and the
* connection user reference is populated.
*
* The return value is C_OK or C_ERR with the same meaning as
* ACLCheckUserCredentials(). */
int
ACLAuthenticateUser
(
client
*
c
,
robj
*
username
,
robj
*
password
)
{
if
(
ACLCheckUserCredentials
(
username
,
password
)
==
C_OK
)
{
c
->
authenticated
=
1
;
c
->
user
=
ACLGetUserByName
(
username
->
ptr
,
sdslen
(
username
->
ptr
));
return
C_OK
;
}
else
{
return
C_ERR
;
}
}
/* For ACL purposes, every user has a bitmap with the commands that such
/* For ACL purposes, every user has a bitmap with the commands that such
* user is allowed to execute. In order to populate the bitmap, every command
* user is allowed to execute. In order to populate the bitmap, every command
* should have an assigned ID (that is used to index the bitmap). This function
* should have an assigned ID (that is used to index the bitmap). This function
...
@@ -1605,9 +1621,7 @@ void authCommand(client *c) {
...
@@ -1605,9 +1621,7 @@ void authCommand(client *c) {
password
=
c
->
argv
[
2
];
password
=
c
->
argv
[
2
];
}
}
if
(
ACLCheckUserCredentials
(
username
,
password
)
==
C_OK
)
{
if
(
ACLAuthenticateUser
(
c
,
username
,
password
)
==
C_OK
)
{
c
->
authenticated
=
1
;
c
->
user
=
ACLGetUserByName
(
username
->
ptr
,
sdslen
(
username
->
ptr
));
addReply
(
c
,
shared
.
ok
);
addReply
(
c
,
shared
.
ok
);
}
else
{
}
else
{
addReplyError
(
c
,
"-WRONGPASS invalid username-password pair"
);
addReplyError
(
c
,
"-WRONGPASS invalid username-password pair"
);
...
...
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