From bb6513cbba972c4932c17ba8188030ec2cfc0aa5 Mon Sep 17 00:00:00 2001 From: Binbin Date: Thu, 22 Sep 2022 14:13:39 +0800 Subject: ACL default newly created user set USER_FLAG_SANITIZE_PAYLOAD flag (#11279) Starting from 6.2, after ACL SETUSER user reset, the user will carry the sanitize-payload flag. It was added in #7807, and then ACL SETUSER reset is inconsistent with default newly created user which missing sanitize-payload flag. Same as `off` and `on` these two bits are mutually exclusive, the default created user needs to have sanitize-payload flag. Adds USER_FLAG_SANITIZE_PAYLOAD flag to ACLCreateUser. Note that the bug don't have any real implications, since the code in rdb.c (rdbLoadObject) checks for `USER_FLAG_SANITIZE_PAYLOAD_SKIP`, so the fact that `USER_FLAG_SANITIZE_PAYLOAD` is missing doesn't really matters. Added tests to make sure it won't be broken in the future, and updated the comment in ACLSetUser and redis.conf --- redis.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'redis.conf') diff --git a/redis.conf b/redis.conf index 5672f3c2c..4460e37b6 100644 --- a/redis.conf +++ b/redis.conf @@ -942,9 +942,9 @@ replica-priority 100 # "nopass" status. After "resetpass" the user has no associated # passwords and there is no way to authenticate without adding # some password (or setting it as "nopass" later). -# reset Performs the following actions: resetpass, resetkeys, off, -# -@all. The user returns to the same state it has immediately -# after its creation. +# reset Performs the following actions: resetpass, resetkeys, resetchannels, +# allchannels (if acl-pubsub-default is set), off, clearselectors, -@all. +# The user returns to the same state it has immediately after its creation. # () Create a new selector with the options specified within the # parentheses and attach it to the user. Each option should be # space separated. The first character must be ( and the last -- cgit v1.2.1