mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,187 Commits 93 Branches 332 Tags 492 MiB
Commit Graph

5751 Commits

Author SHA1 Message Date
Salvatore Sanfilippo fd7484cde2
Merge pull request #5836 from soloestoy/fix-acl-warning 
ACL: show categories in COMMAND reply
 2019-02-13 18:59:59 +01:00
zhaozhao.zz 14507457a0 ACL: show categories in COMMAND reply 
Adding another new filed categories at the end of
command reply, it's easy to read and distinguish
flags and categories, also compatible with old format.
 2019-02-14 00:13:01 +08:00
antirez e819c2ef5b ACL: tag LASTSAVE as dangerous. 
That's not REALLY needed, but... right now with LASTSAVE being the only
command tagged as "admin" but not "dangerous" what happens is that after
rewrites the rewrite engine will produce from the rules:

    user default on +@all ~* -@dangerous nopass

The rewrite:

    user default on nopass ~* +@all -@admin -@dangerous +lastsave

Which is correct but will have users wondering about why LASTSAVE has
something special.

Since LASTSAVE after all also leaks information about the underlying
server configuration, that may not be great for SAAS vendors, let's tag
it as dangerous as well and forget about this issue :-)
 2019-02-13 16:30:44 +01:00
zhaozhao.zz a65094dae8 ACL: fix cat type format warning 2019-02-13 11:47:10 +08:00
antirez bfdcfbb3ed ACL: fix setting of FAST flag. 2019-02-12 17:06:26 +01:00
antirez b9c97c0b2e ACL: CAT subcommand implemented. 2019-02-12 17:02:45 +01:00
Guy Benoish bdd9a8002a Trim SDS free space of retained module strings 
In some cases processMultibulkBuffer uses sdsMakeRoomFor to
expand the querybuf, but later in some cases it uses that query
buffer as is for an argv element (see "Optimization"), which means
that the sds in argv may have a lot of wasted space, and then in case
modules keep that argv RedisString inside their data structure, this
space waste will remain for long (until restarted from rdb).
 2019-02-12 14:21:21 +01:00
Salvatore Sanfilippo a22815b4e9
Merge pull request #5833 from soloestoy/masteruser 
ACL: add masteruser configuration for replication
 2019-02-12 10:27:59 +01:00
zhaozhao.zz ea9d3aefec ACL: add masteruser configuration for replication 
In mostly production environment, normal user's behavior should be
limited.

Now in redis ACL mechanism we can do it like that:

    user default on +@all ~* -@dangerous nopass
    user admin on +@all ~* >someSeriousPassword

Then the default normal user can not execute dangerous commands like
FLUSHALL/KEYS.

But some admin commands are in dangerous category too like PSYNC,
and the configurations above will forbid replica from sync with master.

Finally I think we could add a new configuration for replication,
it is masteruser option, like this:

    masteruser admin
    masterauth someSeriousPassword

Then replica will try AUTH admin someSeriousPassword and get privilege
to execute PSYNC. If masteruser is NULL, replica would AUTH with only
masterauth like before.
 2019-02-12 17:12:37 +08:00
antirez d5e4a7f439 ACL: when client->user is NULL the client is a superuser. 
Related to #5832.
 2019-02-12 09:44:30 +01:00
antirez cc6d05a1f7 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-02-12 09:43:50 +01:00
zhaozhao.zz 0f42447a0e ACL: show client's user 2019-02-12 16:03:58 +08:00
Chris Lamb d0089cf208 Don't assume the __x86_64__ pointer size to avoid warnings on x32. 
__x86_64__ is defined on the on the x32 architecture and the conditionals in
debug.c therefore assume the size of (void*) etc:

  debug.c: In function 'getMcontextEip':
  debug.c:757:12: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
       return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */
              ^
  debug.c: In function 'logRegisters':
  debug.c:920:21: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
       logStackContent((void**)uc->uc_mcontext.gregs[15]);

We can remedy this by checking for __ILP32__ first. See:

  https://wiki.debian.org/ArchitectureSpecificsMemo

... for more info.
 2019-02-11 17:12:27 +01:00
antirez f0c7cfa459 ACL: return error when removing a non existing password. 
Otherwise it's very simple for an human mistake to think a password is
removed because of a typo in the ACL SETUSER myuser <somepass command
line.
 2019-02-11 17:01:58 +01:00
antirez f8a6132f15 ACL: refactor+fix AUTH check in processCommand(). 
The part that is fixed is that now if the default user is off whatever
is its configuration the user is not considered authenticated.
 2019-02-11 16:47:02 +01:00
antirez df346bca39 ACL: ACLFreeUserAndKillClients(): free user later. 
Soon or later we may have code in freeClient() that may have to deal
with ACLs. Imagine for instance the command proposed multiple times (not
sure if this will ever be accepted but still...):

    ONCLOSE DEL mykey

Accumulating commands to run when a client is disconnected. Now the
function is compatible with such use cases.

Related to #5829.
 2019-02-11 16:28:31 +01:00
zhaozhao.zz 2ce96c0fa7 ACL: kill the old users clients after load aclfile 2019-02-11 16:26:00 +01:00
antirez 3df1eb85ca ACL: add command fingerprint for CAT subcommand. 2019-02-08 12:40:42 +01:00
antirez d453936b52 ACL: add arity check in ACL command where missing. 2019-02-08 12:38:41 +01:00
antirez d4890c20c1 ACL: ignore modules commands when adding categories. 
We can't trust modules commands flagging, so module commands must be
always explicitly added, with the exception of +@all that will include
everything. However something like +@readonly should not include command
from modules that may be potentially dangerous: our categories must be
safe and reliable and modules may not be like that.
 2019-02-08 11:50:39 +01:00
antirez 80f987726d ACL: load ACL file at startup. Prevent silly configurations. 2019-02-07 17:20:03 +01:00
antirez db30727547 ACL: ACLLoadFromFile(): several errors fixed to make it work. 2019-02-07 17:07:51 +01:00
antirez d26c9b5307 ACL: ACLLoadFromFile(), restore DefaultUser global. 2019-02-07 17:00:35 +01:00
antirez 6a7545e4d4 ACL: fix fgets wrong buffer size. 2019-02-07 16:53:41 +01:00
antirez cbed35efd3 ACL: add assertion and fix comment typo. 2019-02-07 16:47:14 +01:00
antirez 7a86ba22e0 ACL: fix a few ACLLoadFromFile() errors and finish ACLFreeUsersSet(). 2019-02-07 16:20:49 +01:00
antirez 1790be1496 ACL: WIP: preserve the old config on loading errors. 2019-02-07 12:57:21 +01:00
antirez 0f0240b526 ACL: implement LOAD subcommand plus some minor rafactoring. 2019-02-07 12:20:30 +01:00
antirez 72e8a080c2 ACL: fix and complete ACLLoadFromFile() loading step. 2019-02-07 12:04:25 +01:00
antirez bbdf02338d ACL: now ACLLoadFromFile() validates against fake user. 2019-02-06 16:44:55 +01:00
antirez 0d3fb9f7f1 ACL: refactoring creation of unlinked users. 2019-02-06 16:19:17 +01:00
antirez e1e0f993d8 ACL: initial design for ACLLoadFromFile() function. 2019-02-06 12:39:11 +01:00
antirez cc116736c1 ACL: ability to configure an external ACL file. 2019-02-05 17:49:52 +01:00
antirez 416c640156 ACL: change behavior of redefined user. Last line counts. 2019-02-05 10:52:05 +01:00
antirez 775bf6193d ACL: implement rewriting of users in redis.conf. 2019-02-05 10:48:17 +01:00
antirez 2262dd184d ACL: fix user/rule inverted error message. 2019-02-04 16:58:35 +01:00
antirez 623b17425e ACL: load the defined users at server startup. 2019-02-04 16:39:07 +01:00
antirez 500b3e128f ACL: implement ACLLoadConfiguredUsers(). 2019-02-04 16:35:15 +01:00
antirez 68fd4a97fa ACL: better error reporting in users configuration errors. 2019-02-04 13:04:35 +01:00
antirez b166c41edd ACL: make ACLAppendUserForLoading() able to report bad argument. 2019-02-04 13:00:58 +01:00
antirez 21e84cdae2 ACL: initial appending of users in user loading list. 2019-02-04 12:55:48 +01:00
antirez 8f16e1ea91 ACL: implement ACLAppendUserForLoading(). 2019-02-01 13:02:59 +01:00
antirez b8323d98e9 ACL: skeleton and first ideas for postponed user loading. 2019-02-01 12:20:09 +01:00
antirez 1769c22248 ACL: set modules help clients to the root user. 
It does not make much sense to limit what modules can do: the admin
should instead limit what module commnads an user may call. So
RedisModule_Call() and other module operations should be able to execute
everything they want: the limitation should be posed by the API exported
by the module itself.
 2019-02-01 11:37:28 +01:00
antirez b6372f16c4 ACL: assign ACL command ID to modules commands. 2019-02-01 08:17:24 +01:00
antirez ec1aee031c ACL: implement DELUSER. 2019-01-31 18:33:14 +01:00
antirez 74b7afdf71 ACL: check arity of LIST / USERS subcommand. 2019-01-31 18:32:49 +01:00
antirez bc9b118e05 ACL: don't emit useless flags in ACLDescribeUser(). 2019-01-31 17:04:42 +01:00
antirez 0f1b06aa40 ACL: implement LIST and USERS subcommands. 2019-01-31 17:01:32 +01:00
antirez c7cd10dfe9 ACL: flags refactoring, function to describe user. 2019-01-31 16:49:22 +01:00
antirez 479f7f7af4 ACL: add function to return ACLSetUser() string errors. 2019-01-30 16:02:25 +01:00
antirez 0960259835 ACL: don't allow patterns after the * pattern. 2019-01-30 15:59:45 +01:00
antirez 77471dfe86 ACL: implement keys field in ACL GETUSER. 2019-01-30 15:52:36 +01:00
antirez 9db2c84984 ACL: free memory leak when freeing subcommands array. 2019-01-30 11:50:30 +01:00
antirez 36a0168cfd ACL: return error when adding subcommands of fully added commands. 
It's almost certainly an error from the user side.
 2019-01-30 08:25:12 +01:00
antirez 9c2e64db9c ACL: remove leak in ACLSetUser(). 2019-01-30 08:20:31 +01:00
antirez efce73a001 ACL: ACLDescribeUserCommandRules(): emit subcommands. 2019-01-30 08:17:33 +01:00
antirez 9ae8e3fefa ACL: clear the subcommands array when setting category bits. 2019-01-30 08:09:05 +01:00
antirez feba39d318 ACL: finish/fix ACLDescribeUserCommandRules() first version. 2019-01-29 18:54:21 +01:00
antirez 4db92e5928 ACL: ACLDescribeUserCommandRules(): add final commands. 2019-01-29 18:41:11 +01:00
antirez 11f64c6886 ACL: initial design for ACLDescribeUserCommandRules() and helpers. 2019-01-29 17:25:05 +01:00
antirez 4380423d40 ACL: enforce ACLs in Lua scripts as well. 2019-01-29 10:12:22 +01:00
antirez acd168a70b ACL: refactoring and fix of adding subcommands to users. 2019-01-28 18:40:54 +01:00
antirez 7fb9e2b4ce ACL: reset the subcommands table on +@all / -@all. 
This also is a bugfix because after -@all the previously enabled
subcommands would remain valid.
 2019-01-28 18:27:42 +01:00
antirez 097d57f56e ACL: fix crash when checking for subcommands. 2019-01-28 18:15:59 +01:00
Guy Benoish b0c8d6c227 Increase string2ld's buffer size (and fix HINCRBYFLOAT) 
The string representation of `long double` may take
up to ~5000 chars (see PR #3745).

Before this fix HINCRBYFLOAT would never overflow (since
the string could not exceed 256 chars). Now it can.
 2019-01-28 17:58:11 +02:00
antirez 6320aa49f3 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-01-28 12:13:25 +01:00
antirez 4b9b128c49 ACL: remove leak when removing passwords/patterns. 2019-01-28 12:11:11 +01:00
Salvatore Sanfilippo 4e6abe2bbb
Merge pull request #5808 from ArkayZheng/ArkayWork 
Fix the output of serverLog in replication.c
 2019-01-27 12:16:14 +01:00
antirez af72a31490 ACL: fix command bit check. 2019-01-26 12:51:43 +01:00
ArkayZheng 76f20729fc Fix the output bug in rename exceptions. 2019-01-25 21:48:23 +08:00
antirez b7750a936f ACL: remove the ALLCOMMANDS user flag at a safer place. 
This fixes -@<category> as a side effect.
 2019-01-25 13:27:33 +01:00
antirez eb840f9bc5 ACL: fix command ID assignment off by one error. 2019-01-25 13:07:20 +01:00
antirez 53ba09e08a ACL: remove useless NULL check. 2019-01-25 13:00:49 +01:00
antirez d5fe17dc11 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-01-25 13:00:30 +01:00
Salvatore Sanfilippo 1aa9fa37e3
Merge pull request #5806 from soloestoy/bugfix-acl-check-key-pattern 
Bugfix in ACLCheckCommandPerm
 2019-01-25 13:00:17 +01:00
zhaozhao.zz 0de83bcc62 ACL: fix memory leak when key patterns no match 2019-01-25 19:35:18 +08:00
zhaozhao.zz 8fc0079366 ACL: check patterns instead of passwords in ACLCheckCommandPerm 2019-01-25 19:06:18 +08:00
antirez b82d356883 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-01-25 11:47:50 +01:00
Salvatore Sanfilippo 5cc3b557f6
Merge pull request #5804 from artix75/dev 
Cluster Manager: remove unused code elements
 2019-01-25 11:47:45 +01:00
antirez 510327df0b Merge branch 'unstable' of github.com:/antirez/redis into unstable 2019-01-25 11:27:34 +01:00
Salvatore Sanfilippo e545b30f97
Merge pull request #5801 from soloestoy/fix-getuser-null-pointer 
ACL: fix null pointer in getuser
 2019-01-25 11:27:21 +01:00
antirez 7b4f3cc33a ACL: + and - opcode for categories implemented. 2019-01-24 18:15:46 +01:00
antirez e8bf9b03ed ACL: ACLSetUserCommandBitsForCategory() low level API. 2019-01-24 18:11:09 +01:00
artix 9fb160b130 Cluster Manager: remove unused code elements 2019-01-24 17:29:44 +01:00
antirez f99e0f59ef ACL: populate category flags from command table. 2019-01-23 16:59:09 +01:00
zhaozhao.zz 496497f81a ACL: fix null pointer in getuser 2019-01-23 23:57:18 +08:00
antirez 91ec53ed13 ACL: define category names and flags. 2019-01-23 16:47:29 +01:00
antirez c5e717c637 ACL: command categories added to the command table. 2019-01-23 12:15:10 +01:00
antirez b8ff73894a ACL: improve top comments of the command table. 2019-01-23 11:21:02 +01:00
antirez 932a1196d8 ACL: mark more commands as read-only commands. 2019-01-23 11:14:39 +01:00
antirez effb84be17 ACL: specify better the +@all semantics in comments. 2019-01-23 11:05:54 +01:00
Guy Benoish 2502956835 ZPOP should return an empty array if COUNT=0 2019-01-23 11:11:57 +02:00
antirez b270322ff9 ACL: ACLUserCanExecuteFutureCommands() function added. 2019-01-23 08:14:56 +01:00
antirez 70e541b7bc ACL: better define name, and the idea of reserved ID. 2019-01-23 08:10:57 +01:00
antirez 711e514ea4 ACL: update comments in command flags. 2019-01-22 19:02:50 +01:00
antirez e97481d4f4 ACL: remove no longer existing flag from comment. 2019-01-22 17:57:20 +01:00
antirez 82d194c1ab ACL: populate command table with new flags. 2019-01-22 17:57:20 +01:00
antirez 9e4fb96ca1 ACL: review of Redis command table and new flags format. 
However the code is yet not able to parse the new flags format.
 2019-01-22 17:57:20 +01:00
antirez 561661b145 ACL: setuser nocommands / -@all implemented. 2019-01-22 17:57:20 +01:00
antirez 8dfeb4fba1 ACL: setuser reset implemented. 2019-01-22 17:57:20 +01:00
antirez 9e5c38282b ACL: setuser resetkeys implemented. 2019-01-22 17:57:20 +01:00
antirez 2263d6e173 ACL: specify better the command denied error. 2019-01-22 17:57:20 +01:00
antirez 53321c3c2c ACL: subcommand matching. 2019-01-22 17:57:20 +01:00
antirez 4078755ddb ACL: setting single commands ACLs implementation. 2019-01-22 17:57:20 +01:00
antirez 10f121295c ACL: GetUserCommandBit() is a much better name for the function. 2019-01-22 17:57:20 +01:00
antirez 48eeec5fb4 ACL: user commands bitmap check refactoring for new features. 2019-01-22 17:57:20 +01:00
antirez dbdc68a658 ACL: handle command IDs in case insensitive way. 2019-01-22 17:57:20 +01:00
Salvatore Sanfilippo 94460440b7
Merge pull request #5743 from AngusP/forever-repeat-cli 
Redis CLI: Fix broken interval and repeat behaviour (incluing in cluster mode)
 2019-01-22 17:29:37 +01:00
Salvatore Sanfilippo ed356c3a79
Merge pull request #5795 from zhicheng/fix-double-free-issue 
fix clusterManagerGetAntiAffinityScore double free otypes
 2019-01-22 17:28:45 +01:00
Salvatore Sanfilippo 7c53e5bdc4
Merge pull request #5796 from soloestoy/fix-acl-compile-warning 
ACL: fix compile warnings
 2019-01-21 17:14:04 +01:00
antirez 4dc69497f5 Refactoring: always kill AOF/RDB child via helper functions. 2019-01-21 11:28:44 +01:00
Salvatore Sanfilippo adfaf548e3
Merge branch 'unstable' into fixChildInfoPipeFdLeak 2019-01-21 11:20:56 +01:00
antirez cfdc800a5f Remove non semantical newline space from PR #5797. 2019-01-21 11:15:48 +01:00
Salvatore Sanfilippo 9f939610f3
Merge pull request #5797 from trevor211/fixUpdateDictResizePolicy 
Fix update dict resize policy
 2019-01-21 11:14:48 +01:00
WuYunlong 440385de14 Fix child info pipe fd leak when child process gets killed. 2019-01-21 17:48:45 +08:00
WuYunlong f004a3e7ff Update dict resize policy when rdb child process gets killed. 2019-01-21 17:33:18 +08:00
WuYunlong 3f0c2b1fa2 Update dict resize policy when aof rewrite process gets killed. 2019-01-21 17:27:36 +08:00
zhaozhao.zz ab1992c9c6 ACL: fix compile warnings 2019-01-21 14:53:46 +08:00
Zhicheng Wei c90cf3d82f fix clusterManagerGetAntiAffinityScore double free otypes 2019-01-19 11:38:36 +08:00
antirez c8391388c2 ACL: remove server.requirepass + some refactoring. 2019-01-18 11:49:30 +01:00
antirez 7de6e30241 ACL: fix config get requirepass. 2019-01-18 11:30:40 +01:00
antirez ac6e49de48 ACL: implement resetpass directive and adjust test. 2019-01-18 11:26:32 +01:00
antirez 2c66c525f9 ACL: configure the master connection without user. 2019-01-17 18:33:36 +01:00
antirez b87815c1f8 ACL: AUTH + no default user password raises an error. 
This way the behavior is very similar to the past one.
This is useful in order to remember the user she probably failed to
configure a password correctly.
 2019-01-17 18:30:23 +01:00
antirez 636424c0ce ACL: change requirepass stop condition to use ACLs. 2019-01-17 18:22:22 +01:00
antirez 0526d1538b ACL: partial implementation of ACL GETUSER. 2019-01-17 18:19:04 +01:00
antirez 7b65605ab2 ACL: reimplement requirepass option in term of ACLs. 2019-01-17 18:05:43 +01:00
antirez 4a3419acfc ACL: fix and improve ACL key checking. 2019-01-16 18:31:05 +01:00
antirez dbae371090 ACL: create the user pattern list ASAP. 2019-01-16 13:50:00 +01:00
antirez f78b3ede27 ACL: key matching implemented. 2019-01-16 13:39:04 +01:00
antirez 0db42d4ba8 ACL: implement the key match opcode in ACLSetUser(). 2019-01-16 13:29:04 +01:00
zhaozhao.zz 645d44d545 Streams: checkType before XGROUP CREATE 
Fix issue #5785, in case create group on a key is not stream.
 2019-01-16 19:19:14 +08:00
antirez ff92c06947 ACL: fix command exec check by returning. 2019-01-15 18:28:43 +01:00
antirez c79b01f4ba ACL: the AUTH command can be always executed. 2019-01-15 18:26:44 +01:00
antirez cca64672f4 ACL: AUTH uses users. ACL WHOAMI implemented. 2019-01-15 18:16:20 +01:00
antirez 35fe59935e ACL: automatically authenticate the nopass default user. 2019-01-15 17:57:49 +01:00
antirez 52e9922987 ACL: AUTH command new form, using the ACL subsystem. 2019-01-15 13:45:16 +01:00
antirez b39409bcf8 ACL: nopass user setting. 
This is needed in order to model the current behavior of authenticating
the connection directly when no password is set. Now with ACLs this will
be obtained by setting the default user as "nopass" user. Moreover this
flag can be used in order to create other users that do not require any
password but will work with "AUTH username <any-password>".
 2019-01-15 13:16:31 +01:00
antirez 4f7ff85b88 ACL: ability to set/remove user passwords. 2019-01-15 12:58:54 +01:00
antirez 7aea02fa87 ACL: initial implementation of the ACL command. 2019-01-15 09:36:12 +01:00
antirez a2e376ba52 ACL: ACLCheckCommandPerm() implementation WIP. 2019-01-14 18:35:21 +01:00
antirez 733438fe23 RESP3: Populate new fields for the AOF fake client. 
However we should remove this fake client ad-hoc creation, and replace
it with the proper call to createClient(-1), and then adjust the fake
client as we like.
 2019-01-14 17:01:49 +01:00
antirez 09391369b8 ACL: fix field name typo causing segfault. 2019-01-14 16:09:29 +01:00
antirez a0a4fb85ff ACL: Fix compilation by adding prototype and c->cmd fix. 2019-01-14 13:22:56 +01:00
antirez 2da2e452ab ACL: ACLLCOMMAND flags. 2019-01-14 13:21:21 +01:00
antirez 648411eb7d ACL: Add hook in processCommand() to check the ACLs before call(). 2019-01-14 13:20:45 +01:00
antirez f95152d4c8 ACL: Add skeleton for function checking ability to execute a command. 2019-01-14 13:19:50 +01:00
antirez 4376575d83 ACL: ACLSetUser(), add allcommands in comment. 2019-01-14 13:19:42 +01:00
antirez 67754ae021 ACL: ACLSetUser(), fix flag and add allcommands +@all opcode. 2019-01-14 13:18:12 +01:00
antirez e7d15e4820 ACL: implement to first trivial opcodes in ACLSetUser(). 2019-01-11 13:03:50 +01:00
antirez aced0328e3 ACL: avoid a radix tree lookup for the default user. 2019-01-11 11:32:41 +01:00
antirez 7f8314760a ACL: modify comment from PR. 2019-01-11 11:30:09 +01:00
Salvatore Sanfilippo 6078d85b52
Merge pull request #5769 from charsyam/feature/fix-segmentfault-when-server-starts 
fix segmentfault when server start in unstable branch
 2019-01-11 11:27:09 +01:00
antirez 4b72d087e9 ACL: ACLSetUser(), initial ideas in comments. 2019-01-11 11:25:55 +01:00
charsyam 45952df700 fix segmentfault when server start 2019-01-11 19:12:06 +09:00
antirez dc4f7ad106 ACL: create the default user. 2019-01-11 11:02:55 +01:00
antirez 6bb6a6d3a8 ACL: implement ACLCreateUser(). 2019-01-10 17:01:12 +01:00
antirez e4846b028d ACL: implement ACLGetUserByName(). 2019-01-10 16:40:45 +01:00
antirez 29c88a9ce5 ACL: initialization function. 2019-01-10 16:39:32 +01:00
antirez e9a902a958 ACL: split acl.c into clear sections. 2019-01-10 16:35:55 +01:00
antirez 4278104acc ACL: add a reference to the user in each client. 2019-01-10 16:34:13 +01:00
antirez 4729f71495 ACL: improved version of the user structure. 2019-01-10 12:47:52 +01:00
antirez 45ff9f33d6 ACL: ACLCheckUserCredentials() next id should be static. 2019-01-09 21:47:43 +01:00
antirez 7fc882c578 ACL: use a fixed table for command IDs. 2019-01-09 21:31:29 +01:00
antirez 010b24f864 ACL: set the command ID while populating the commands table. 2019-01-09 17:23:23 +01:00
antirez 91f1d8026b ACL: introduce the concept of command ID. 2019-01-09 17:20:47 +01:00
antirez 42271cff2d ACL: fix ACLCheckUserCredentials() usage in AUTH. 2019-01-09 17:09:30 +01:00
antirez f5d918b2bb ACL: HELLO should stop if the user is not authenticated. 2019-01-09 17:00:30 +01:00
antirez b43d70df56 ACL: refactoring of the original authentication code. 2019-01-09 17:00:30 +01:00
antirez 4d80b0e965 RESP3: allow HELLO during busy script and not authenticated states. 2019-01-09 17:00:30 +01:00
antirez 9018388c3f RESP3: Allow any command in RESP3 Pub/Sub mode. 2019-01-09 17:00:30 +01:00
antirez a4f8f4a824 RESP3: PING should reply normally in RESP3 Pub/Sub mode. 
Because in RESP3 commands can be sent in the Pub/Sub connection without
problems, so it's better if in such mode there is no exception about
PING.
 2019-01-09 17:00:30 +01:00
antirez eaaac08892 RESP3: Pubsub messages in new push format if client is in RESP3 mode. 2019-01-09 17:00:30 +01:00
antirez bc75a94e2d RESP3: pubsub messages API completely refactored. 2019-01-09 17:00:30 +01:00
antirez 798a329192 RESP3: extract code to send pubsub messages into functions. 2019-01-09 17:00:30 +01:00
antirez 709a6612eb RESP3: addReplyString() -> addReplyProto(). 
The function naming was totally nuts. Let's fix it as we break PRs
anyway with RESP3 refactoring and changes.
 2019-01-09 17:00:30 +01:00
antirez 7d4b600f5d RESP3: redis-cli support for boolean in TTY output. 2019-01-09 17:00:30 +01:00
antirez e291170385 RESP3: verbatim reply API + DEBUG PROTOCOL support. 2019-01-09 17:00:30 +01:00
antirez afba211297 RESP3: DEBUG PROTOCOL: boolean types. 2019-01-09 17:00:30 +01:00
antirez 8042afb246 RESP3: Fix addReplyBool() RESP2/3 output. 2019-01-09 17:00:30 +01:00
antirez 4e2dd54df0 RESP3: DEBUG PROTOCOL: fix strcasecmp() check. 2019-01-09 17:00:30 +01:00
antirez 795ad670f9 RESP3: DEBUG PROTOCOL command. Only types already supported by API. 2019-01-09 17:00:30 +01:00
antirez c3bf646ef3 RESP3: fix DEBUG DIGEST-VALUE with new API. 2019-01-09 17:00:30 +01:00
antirez 62b2642c51 RESP3: redis-cli: show the double as received from Redis. 2019-01-09 17:00:30 +01:00
antirez a2b2d88f38 RESP3: hiredis: initial double implementation. 2019-01-09 17:00:30 +01:00
antirez 005915b5c3 RESP3: hiredis: map and set display for TTY output. 2019-01-09 17:00:30 +01:00
antirez 809e3a44a7 RESP3: addReplyBool() implemented. 2019-01-09 17:00:29 +01:00
antirez 4f0860cbfd RESP3: initial implementation of the HELLO command. 2019-01-09 17:00:29 +01:00
antirez e5fdd6b6bf RESP3: fix HMGET bug introduced with RESP3 changes. 2019-01-09 17:00:29 +01:00
antirez 0652b05caf RESP3: fix genericHgetallCommand() assert. 2019-01-09 17:00:29 +01:00
antirez c2e5be0421 RESP3: fix zrangeGenericCommand() proto dependent array len. 2019-01-09 17:00:29 +01:00
antirez 8a0391fbc9 RESP3: t_stream.c updated. 2019-01-09 17:00:29 +01:00
antirez baf5b3f93a RESP3: module.c updated. 2019-01-09 17:00:29 +01:00
antirez 920611a419 RESP3: latency.c updated. 2019-01-09 17:00:29 +01:00
antirez ddb98ad56f RESP3: hyperloglog.c updated. 2019-01-09 17:00:29 +01:00
antirez 3fd78f41e8 RESP3: restore the concept of null array for RESP2 compat. 2019-01-09 17:00:29 +01:00
antirez 2ad6e875ba RESP3: add shared.nullarray for better RESP2 compat. 2019-01-09 17:00:29 +01:00
antirez 1a17cdfadf RESP3: addReplyNullArray() added for better RESP2 compat. 2019-01-09 17:00:29 +01:00
antirez 86c30a92f9 RESP3: geo.c updated. 2019-01-09 17:00:29 +01:00
antirez 071da9844c RESP3: blocked.c updated. 2019-01-09 17:00:29 +01:00
antirez 9705c12d85 RESP3: sentinel.c updated. 2019-01-09 17:00:29 +01:00
antirez 3a3d806989 RESP3: bitops.c updated. 2019-01-09 17:00:29 +01:00
antirez 317f8b9d38 RESP3: most null replies converted. 2019-01-09 17:00:29 +01:00
antirez 1b7298e66a RESP3: addReplyNull() added. 2019-01-09 17:00:29 +01:00
antirez fc9a3de97d RESP3: remove other pointless shared object. 2019-01-09 17:00:29 +01:00
antirez b7e8b734c9 RESP3: remove certain constants to spot places to fix. 2019-01-09 17:00:29 +01:00
antirez a1feda2388 RESP3: Scripting RESP3 mode set/map protocol -> Lua conversion. 2019-01-09 17:00:29 +01:00
antirez 9330bcc7ee RESP3: Fix API in scripting.c leaving Lua conversions RESP2. 2019-01-09 17:00:29 +01:00
antirez f07f3d729f RESP3: Use new aggregate reply API in slowlog.c. 2019-01-09 17:00:29 +01:00
antirez feb6b31832 RESP3: Use new aggregate reply API in t_set.c. 2019-01-09 17:00:29 +01:00
antirez dcbd40cea4 RESP3: Use new aggregate reply API in cluster.c. 2019-01-09 17:00:29 +01:00
antirez c7f80e4f1a RESP3: Make WITHSCORES reply back with a flat array in RESP2. 2019-01-09 17:00:29 +01:00
antirez fe67418ba4 RESP3: Use new deferred len API in object.c. 2019-01-09 17:00:29 +01:00
antirez 13966522ea RESP3: bring RESP2 compatibility to previous changes. 2019-01-09 17:00:29 +01:00
antirez e14aabf936 RESP3: addReply*Len() support for RESP2 backward comp. 2019-01-09 17:00:29 +01:00
antirez 1ac6926647 RESP3: put RESP version in the client structure. 2019-01-09 17:00:29 +01:00
antirez f44e00b691 RESP3: Use new API and types in t_hash.c. 2019-01-09 17:00:29 +01:00
antirez b507654716 RESP3: Use new deferred len API in dict.c. 2019-01-09 17:00:29 +01:00
antirez cdd10193c5 RESP3: Use new deferred len API in config.c. 2019-01-09 17:00:29 +01:00
antirez 470c28380f RESP3: Use new deferred len API in t_zset.c. 2019-01-09 17:00:29 +01:00
antirez a577230a58 RESP3: Use new deferred len API in t_string.c. 2019-01-09 17:00:29 +01:00
antirez 07bce54093 RESP3: Use new deferred len API in replication.c. 2019-01-09 17:00:29 +01:00
antirez 073293693e RESP3: Use new deferred len API in server.c. 2019-01-09 17:00:29 +01:00
antirez 57c5a766a2 RESP3: Aggregate deferred lengths functions. 2019-01-09 17:00:29 +01:00
antirez 914ee43108 RESP3: Double replies and aggregate lengths initial functions. 2019-01-09 17:00:29 +01:00
Salvatore Sanfilippo 14400d073b
Merge pull request #5729 from artix75/cluster_manager_fix_cmd 
Cluster Manager del-node: use CLUSTER RESET in place of SHUTDOWN
 2019-01-09 10:11:27 +01:00
chenyangyang 30d8d05cd6
Update ae.c 
Update comment
 2019-01-06 15:01:25 +08:00
Angus Pearson 2925bdc63b Add comment explaining negative repeat 2019-01-02 19:28:04 +00:00
Angus Pearson 2f6ed9333f Fix broken interval and repeat bahaviour in redis-cli (incluing cluster mode) 
This addresses two problems, one where infinite (negative) repeat count is broken for all types for Redis,
and another specific to cluster mode where redirection is needed.

Now allows and works correctly for negative (i.e. -1) repeat values passed with `-r` argument to redis-cli
as documented here https://redis.io/topics/rediscli#continuously-run-the-same-command which seems to have
regressed as a feature in 95b988 (though that commit removed bad integer wrap-around to `0` behaviour).

This broken behaviour exists currently (e50458), and redis-cli will just exit immediately with repeat `-r <= 0`
as opposed to send commands indefinitely as it should with `-r < 0`

Additionally prevents a repeat * interval seconds hang/time spent doing nothing at the start before issuing
commands in cluster mode (`-c`), where the command needed to redirect to a slot on another node, as commands
where failing and waiting to be reissued but this was fully repeated before being reissued. For example,

        redis-cli -c -r 10 -i 0.5 INCR test_key_not_on_6379

Would hang and show nothing for 5 seconds (10 * 0.5) before showing

        (integer) 1
        (integer) 2
        (integer) 3
        (integer) 4
        (integer) 5
        (integer) 6
        (integer) 7
        (integer) 8
        (integer) 9
        (integer) 10

at half second intervals as intended.
 2019-01-02 18:50:58 +00:00
artix 17797660f1 Cluster Manager del-node: use CLUSTER RESET in place of SHUTDOWN 
See issue #5687
 2018-12-27 17:20:42 +01:00
antirez 8a87de130f Modules shared API: export new core APIs. 2018-12-20 17:57:49 +01:00
antirez d3eb0028e9 Modules shared API: also unregister the module as user. 2018-12-20 17:57:46 +01:00
antirez 9403b3d7a3 Modules shared API: prevent unloading of used modules. 2018-12-20 17:57:43 +01:00
antirez 6bb8cdaebe Modules shared API: unregister APIs function. 2018-12-20 17:57:40 +01:00
antirez 27f6e9bb9b Modules shared API: initial core functions. 
Based on ideas and code in PR #5560 by @MeirShpilraien.
 2018-12-20 17:57:35 +01:00
antirez 850b64c116 Revert shared APIs to modify the design. 2018-12-20 17:56:38 +01:00
MeirShpilraien ab37289fa6 added module ability to register api to be used by other modules 2018-12-20 17:55:18 +01:00
artix 503fd229e4 Cluster Manager: enable --cluster-replace also for 'fix' command. 2018-12-19 17:29:25 +01:00
artix cc29590188 Fixed memory leak in clusterManagerCompareKeysValues. 2018-12-18 18:45:10 +01:00
artix 143bfa1e6e Cluster Manager: compare key values after BUSYKEY error (migration). 
If a key exists in the target node during a migration (BUSYKEY),
the value of the key on both nodes (source and target) will be compared.
If the key has the same value on both keys, the migration will be
automatically retried with the REPLACE argument in order to override
the target's key.

If the key has different values, the behaviour will depend on such
cases:
- In case of 'fix' command, the migration will stop and the user
  will be warned to manually check the key(s).
- In other cases (ie. reshard), if the user launched the command
  with the --cluster-replace option, the migration will be
  retried with the REPLACE argument, elsewhere the migration will
  stop and the user will be warned.
 2018-12-18 17:45:35 +01:00
Guy Benoish ed88f77d6d Check server.verbosity in RM_LogRaw 2018-12-13 13:57:38 +01:00
artix d935cfcb89 Cluster Manager: avoid using reply error messages to check slot status. 
Slot assignment status is now checked by using CLUSTER SLOTS.
Furthermore, one memory leak has been fixed.
 2018-12-12 13:34:43 +01:00
antirez 129f2d2746 freeMemoryIfNeeded() small refactoring. 
Related to issue #5686 and PR #5689.
 2018-12-12 11:37:15 +01:00
Salvatore Sanfilippo 7ae184bfea
Merge pull request #5689 from soloestoy/donot-evict-when-AOF-loading 
evict: don't care about mem if loading
 2018-12-12 11:29:10 +01:00
antirez 03e2bb0cfd Crashing is too much in addReplyErrorLength(). 
See #5663.
 2018-12-11 17:50:18 +01:00
zhaozhao.zz b9cd89d108 evict: don't care about mem if loading 
When loading data, we call processEventsWhileBlocked
to process events and execute commands.
But if we are loading AOF it's dangerous, because
processCommand would call freeMemoryIfNeeded to evict,
and that will break data consistency, see issue #5686.
 2018-12-12 00:25:58 +08:00
antirez 0110e46f6e Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-12-11 13:30:04 +01:00
antirez a31ca8d753 stringmatchlen() fuzz test added. 
Verified to be able to trigger at least #5632. Does not report other
issues.
 2018-12-11 13:29:30 +01:00
antirez c710d4afdc Fix stringmatchlen() read past buffer bug. 
See #5632.
 2018-12-11 13:18:52 +01:00
Salvatore Sanfilippo f77edf4234
Merge pull request #5665 from louiszhw/unstable 
fix comments fault discription
 2018-12-11 13:03:09 +01:00
Salvatore Sanfilippo e8529d1b1e
Merge pull request #4264 from lsytj0413/unstable 
fix a typo: craeted -> created
 2018-12-11 13:02:28 +01:00
zhaozhao.zz 6100be7d82 fix typo 2018-12-11 19:53:54 +08:00
zhaozhao.zz 1530c0a7dd multi: ignore multiState's cmd_flags when loading AOF 2018-12-11 19:47:36 +08:00
antirez 274531396c Reject EXEC containing write commands against RO replica. 
Thanks to @soloestoy for discovering this issue in #5667.
This is an alternative fix in order to avoid both cycling the clients
and also disconnecting clients just having valid read-only transactions
pending.
 2018-12-11 11:39:21 +01:00
artix 27ddb2ba3a Cluster Manager: 
- Multiple owners checking in 'fix'/'check' commands is now
  optional (using --cluster-search-multiple-owners).
- Updated help.
 2018-12-10 18:01:18 +01:00
artix 0c1336caf4 Cluster Manager: 
- FixOpenSlot now correctly updates in-memory cluster configuration.
    - Improved output messages.
 2018-12-10 17:43:58 +01:00
artix 1a56fc913e Cluster Manager: 'fix' command now handles open slots with migrating state 
in one node and importing state in multiple nodes.
 2018-12-10 17:43:58 +01:00
artix d5f7703367 Cluster Manager: setting new slot owner is now handled atomically 
in 'fix' command.
 2018-12-10 17:43:58 +01:00
artix eaac9f9e93 Cluster Manager: code cleanup. 2018-12-10 17:43:58 +01:00
artix 5bf13eaaf8 Cluster Manager: check/fix commands now handle multiple owners even if 
all slots are covered and not open.
 2018-12-10 17:39:54 +01:00
Salvatore Sanfilippo 5bfd8ae253
Merge pull request #5626 from soloestoy/remove-useless-code 
remove useless tryObjectEncoding in debug assert
 2018-12-07 17:09:56 +01:00
Salvatore Sanfilippo 03629ba0b6
Merge pull request #5633 from oranagra/frag_bytes_signed 
fix #5580, display fragmentation and rss overhead bytes as signed
 2018-12-07 17:09:10 +01:00
antirez cdab4c3e09 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-12-07 17:07:14 +01:00
antirez 7e0cc2bb91 Remove no longer relevant comment in processCommand(). 2018-12-07 17:06:55 +01:00
Salvatore Sanfilippo c6341ce373
Merge pull request #5673 from soloestoy/check-current-client-after-freememory 
networking: current_client should not be NULL when trim qb_pos
 2018-12-07 17:03:48 +01:00
antirez 5a0b7212c9 DEBUG DIGEST-VALUE implemented. 2018-12-07 16:41:54 +01:00
antirez e9400e8efd DEBUG DIGEST refactoring: extract function to digest a value. 2018-12-07 16:30:33 +01:00
zhaozhao.zz 28c4281495 networking: current_client should not be NULL when trim qb_pos 2018-12-07 19:14:33 +08:00
yura 74f942cfa5 redis-cli reshard/rebalance: ability to force replacement on existing keys 2018-12-07 14:14:11 +03:00
Salvatore Sanfilippo 9f87ef9399
Merge pull request #5460 from krallin/env-password 
cli: pass auth through REDISCLI_AUTH
 2018-12-07 11:30:07 +01:00
Salvatore Sanfilippo 75c181ee2b
Merge pull request #5664 from yongman/fix-rediscli-output-format 
Fix cluster call reply format readable
 2018-12-07 11:28:18 +01:00
lsytj0413 6aa9606995 fix a typo: craeted -> created 2018-12-06 11:08:59 +08:00
hdmg b1e35d3244
fix comments fault discription 2018-12-05 17:15:02 +08:00
yongman dfe81b33fe Fix cluster call reply format readable 2018-12-04 17:36:42 +08:00
Madelyn Olson e2c1f80b46 Fixed a serverPanic when sending an invalid command to a monitor client 2018-12-04 07:17:17 +00:00
Oran Agra b587c54c24 fix #5580, display fragmentation and rss overhead bytes as signed 
these metrics become negative when RSS is smaller than the used_memory.
This can easily happen when the program allocated a lot of memory and haven't
written to it yet, in which case the kernel doesn't allocate any pages to the process
 2018-12-02 15:29:20 +02:00
zhaozhao.zz 0da171b3a6 remove useless tryObjectEncoding in debug assert 2018-11-30 12:05:46 +08:00
Salvatore Sanfilippo 4c544394eb
Merge pull request #5562 from soloestoy/memory-usage-more-accurate 
MEMORY command: make USAGE more accurate
 2018-11-28 18:16:04 +01:00
Salvatore Sanfilippo 04a5189b50
Merge pull request #5594 from yongman/fix-rediscli-fixcoverage 
Fix choose a random master node for slot assignment
 2018-11-28 18:13:04 +01:00
zhaozhao.zz d56c631343 MEMORY command: make USAGE more accurate 
In MEMORY USAGE command, we count the key argv[2] into usage,
but the argument in command may contains free spaces because of
sdsMakeRoomFor. But the key in db never contains free spaces
because we use sdsdup when dbAdd, so using the real key to
count the usage is more accurate.
 2018-11-29 01:01:51 +08:00
Salvatore Sanfilippo d403208d51
Merge pull request #5572 from Weiliang-Li/patch3-util 
fix comment typo in util.c
 2018-11-28 17:14:21 +01:00
Salvatore Sanfilippo ef00633759
Merge pull request #5597 from lamby/clarify-socket-creation-error-message 
Clarify the "Creating Server TCP listening socket" error message
 2018-11-28 17:06:51 +01:00
Salvatore Sanfilippo 1eca933d6f
Merge pull request #5598 from lamby/dont-treat-unsupported-protocols-as-fatal-errors 
Don't treat unsupported protocols as fatal errors
 2018-11-28 17:06:17 +01:00
Salvatore Sanfilippo 1dd8d2c7ef
Merge pull request #5599 from devnexen/backtrace_support_on_bsd 
Backtrace/register dump on BSD.
 2018-11-28 17:01:33 +01:00
Salvatore Sanfilippo 6a6471aad5
Merge pull request #4737 from guybe7/zlexcount_fix 
Don't call sdscmp() with shared.maxstring or shared.minstring
 2018-11-28 16:53:32 +01:00
antirez edd3939bef Abort instead of crashing when loading bad stream master key. 
See #5612.
 2018-11-28 16:24:53 +01:00
David Carlier ac086b1932 OpenBSD support. 
Special treatment here as backtrace support is optional,
cannot be found via pkg-config and similar neither.
 2018-11-25 08:10:26 +00:00
David Carlier 69ca907868 Backtrace/register dump on BSD. 
FreeBSD/DragonFlyBSD does have backtrace only it does not
belong to libc.
 2018-11-25 07:21:56 +00:00
Chris Lamb fbff351406 Don't treat unsupported protocols as fatal errors 
If we encounter an unsupported protocol in the "bind" list, don't
ipso-facto consider it a fatal error. We continue to abort startup if
there are no listening sockets at all.

This ensures that the lack of IPv6 support does not prevent Redis from
starting on Debian where we try to bind to the ::1 interface by default
(via "bind 127.0.0.1 ::1"). A machine with IPv6 disabled (such as some
container systems) would simply fail to start Redis after the initiall
call to apt(8).

This is similar to the case for where "bind" is not specified:

  https://github.com/antirez/redis/issues/3894

... and was based on the corresponding PR:

  https://github.com/antirez/redis/pull/4108

... but also adds EADDRNOTAVAIL to the list of errors to catch which I
believe is missing from there.

This issue was raised in Debian as both <https://bugs.debian.org/900284>
& <https://bugs.debian.org/914354>.
 2018-11-23 18:01:12 +01:00
Chris Lamb 9cfcf37968 Clarify the "Creating Server TCP listening socket" error. 
This really helps spot it in the logs, otherwise it does not look like a
warning/error. For example:

  Creating Server TCP listening socket ::1:6379: bind: Cannot assign requested address

... is not nearly as clear as:

  Could not create server TCP listening listening socket ::1:6379: bind: Cannot assign requested address
 2018-11-23 17:57:01 +01:00
yongman 221dfbd322 fix typo 2018-11-23 23:51:16 +08:00
yongman 2961c89161 Fix choose a random master node for slot assignment 2018-11-23 16:58:55 +08:00
Salvatore Sanfilippo 0c12ebf6e7
Merge pull request #5553 from devnexen/dflybsd_build_fix 
DragonFlyBSD little build fix
 2018-11-22 11:16:30 +01:00
yongman 2f76829dc7 skip slave nodes when sending cluster setslot command 2018-11-21 23:01:35 +08:00
Salvatore Sanfilippo 8acc07e6f0
Merge pull request #5579 from yongman/fix-rediscli-pointer-access 
Fix pointer access and memory leak in redis-cli.
 2018-11-20 10:38:59 +01:00
antirez 2bd6802fa1 Stream: fix XREADGROUP history reading of deleted messages. 
This commit fixes #5570. It is a similar bug to one fixed a few weeks
ago and is due to the range API to be called with NULL as "end ID"
parameter instead of repeating again the start ID, to be sure that we
selectively issue the entry with a given ID, or we get zero returned
(and we know we should emit a NULL reply).
 2018-11-19 17:00:34 +01:00
antirez 18d0759b14 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-11-19 16:51:09 +01:00
antirez 29251f58e2 Streams: fix XREADGROUP history reading when CG last_id is low. 
This fixes the issue reported in #5570.
This was fixed the hard way, that is, propagating more information to
the lower level API about this being a request to read just the history,
so that the code is simpler and less likely to regress.
 2018-11-19 16:41:27 +01:00
antirez 3830ef2483 t_stream.c comment resized to 80 cols. 2018-11-19 16:26:02 +01:00