diff options
| author | Oran Agra <oran@redislabs.com> | 2022-02-28 15:35:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 15:35:46 +0200 |
| commit | d2b5a579dd8b785690aa7714df8776ffc452d242 (patch) | |
| tree | 1c54c71bae68eaa44efbf89020d75399a88dee40 /tests/modules/aclcheck.c | |
| parent | d5915a167f696644e210ee85e549c7ceb41b5791 (diff) | |
| parent | 10dc57ab226155bbdbfb0b0d914e681aa346d7de (diff) | |
| download | redis-7.0-rc2.tar.gz | |
Merge pull request #10355 from oranagra/release-7.0-rc27.0-rc2
Release 7.0 RC2
Diffstat (limited to 'tests/modules/aclcheck.c')
| -rw-r--r-- | tests/modules/aclcheck.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/modules/aclcheck.c b/tests/modules/aclcheck.c index cc8d263fd..0e9c9af29 100644 --- a/tests/modules/aclcheck.c +++ b/tests/modules/aclcheck.c @@ -15,11 +15,13 @@ int set_aclcheck_key(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { const char *flags = RedisModule_StringPtrLen(argv[1], NULL); if (!strcasecmp(flags, "W")) { - permissions = REDISMODULE_KEY_PERMISSION_WRITE; + permissions = REDISMODULE_CMD_KEY_UPDATE; } else if (!strcasecmp(flags, "R")) { - permissions = REDISMODULE_KEY_PERMISSION_READ; + permissions = REDISMODULE_CMD_KEY_ACCESS; } else if (!strcasecmp(flags, "*")) { - permissions = REDISMODULE_KEY_PERMISSION_ALL; + permissions = REDISMODULE_CMD_KEY_UPDATE | REDISMODULE_CMD_KEY_ACCESS; + } else if (!strcasecmp(flags, "~")) { + permissions = 0; /* Requires either read or write */ } else { RedisModule_ReplyWithError(ctx, "INVALID FLAGS"); return REDISMODULE_OK; @@ -58,7 +60,7 @@ int publish_aclcheck_channel(RedisModuleCtx *ctx, RedisModuleString **argv, int /* Check that the pubsub channel can be accessed */ RedisModuleString *user_name = RedisModule_GetCurrentUserName(ctx); RedisModuleUser *user = RedisModule_GetModuleUserFromUserName(user_name); - int ret = RedisModule_ACLCheckChannelPermissions(user, argv[1], 1); + int ret = RedisModule_ACLCheckChannelPermissions(user, argv[1], REDISMODULE_CMD_CHANNEL_SUBSCRIBE); if (ret != 0) { RedisModule_ReplyWithError(ctx, "DENIED CHANNEL"); RedisModule_FreeModuleUser(user); |