Database-level access control

src/cli_commands.c

@@ -3,8 +3,8 @@
 
 /* Definitions to configure commands.c to generate the above structs. */
 #define MAKE_CMD(name, summary, complexity, since, doc_flags, replaced, deprecated, group, group_enum, history, \
-                 num_history, tips, num_tips, function, arity, flags, acl, key_specs, key_specs_num, get_keys,  \
-                 numargs)                                                                                       \
+                 num_history, tips, num_tips, function, arity, flags, acl, get_dbid_args, key_specs,            \
+                 key_specs_num, get_keys, numargs)                                                              \
     name, summary, group, since, numargs
 #define MAKE_ARG(name, type, key_spec_index, token, summary, since, flags, numsubargs, deprecated_since) \
     name, type, token, since, flags, numsubargs

src/commands.c

@@ -2,10 +2,10 @@
 #include "server.h"
 
 #define MAKE_CMD(name, summary, complexity, since, doc_flags, replaced, deprecated, group, group_enum, history, \
-                 num_history, tips, num_tips, function, arity, flags, acl, key_specs, key_specs_num, get_keys,  \
-                 numargs)                                                                                       \
+                 num_history, tips, num_tips, function, arity, flags, acl, get_dbid_args, key_specs,            \
+                 key_specs_num, get_keys, numargs)                                                              \
     name, summary, complexity, since, doc_flags, replaced, deprecated, group_enum, history, num_history, tips,  \
-        num_tips, function, arity, flags, acl, key_specs, key_specs_num, get_keys, numargs
+        num_tips, function, arity, flags, acl, get_dbid_args, key_specs, key_specs_num, get_keys, numargs
 #define MAKE_ARG(name, type, key_spec_index, token, summary, since, flags, numsubargs, deprecated_since) \
     name, type, key_spec_index, token, summary, since, flags, deprecated_since, numsubargs
 #define COMMAND_STRUCT serverCommand

src/commands/README.md

@@ -54,6 +54,7 @@ following keys. To be safe, assume all of them are optional.
   the command. (Don't use it for anything else.)
 * `"command_flags"`: An array of flags represented as strings. Command flags:
   * `"ADMIN"`
+  * `"ALL_DBS"`
   * `"ALLOW_BUSY"`
   * `"ASKING"`
   * `"BLOCKING"`
@@ -93,6 +94,9 @@ following keys. To be safe, assume all of them are optional.
   * `"STREAM"`
   * `"STRING"`
   * `"TRANSACTION"`
+* `"get_dbid_args"`: The name of the C function in Valkey's source code
+  implementing retrieval of database ID arguments from commands that accept
+  database ID as an argument.
 * `"command_tips"`: Optional. A list of one or more of these strings:
   * `"NONDETERMINISTIC_OUTPUT"`
   * `"NONDETERMINISTIC_OUTPUT_ORDER"`

src/commands/acl-getuser.json

@@ -15,6 +15,10 @@
             [
                 "7.0.0",
                 "Added selectors and changed the format of key and channel patterns from a list to their rule representation."
+            ],
+            [
+                "9.1.0",
+                "Added database permission rules."
             ]
         ],
         "command_flags": [
@@ -61,6 +65,10 @@
                             "description": "Root selector's channels.",
                             "type": "string"
                         },
+                        "databases": {
+                            "description": "Root selector's databases.",
+                            "type": "string"
+                        },
                         "selectors": {
                             "type": "array",
                             "items": {
@@ -75,6 +83,9 @@
                                     },
                                     "channels": {
                                         "type": "string"
+                                    },
+                                    "databases": {
+                                        "type": "string"
                                     }
                                 }
                             }

src/commands/acl-setuser.json

@@ -15,6 +15,10 @@
             [
                 "7.0.0",
                 "Added selectors and key based permissions."
+            ],
+            [
+                "9.1.0",
+                "Added database permission rules."
             ]
         ],
         "command_flags": [

src/commands/cluster-cancelslotmigrations.json

@@ -10,7 +10,8 @@
         "command_flags": [
             "NO_ASYNC_LOADING",
             "ADMIN",
-            "STALE"
+            "STALE",
+            "ALL_DBS"
         ],
         "reply_schema": {
             "const": "OK"

src/commands/cluster-countkeysinslot.json

@@ -8,7 +8,8 @@
         "container": "CLUSTER",
         "function": "clusterCommand",
         "command_flags": [
-            "STALE"
+            "STALE",
+            "ALL_DBS"
         ],
         "arguments": [
             {

src/commands/cluster-migrateslots.json

@@ -10,7 +10,8 @@
         "command_flags": [
             "NO_ASYNC_LOADING",
             "ADMIN",
-            "STALE"
+            "STALE",
+            "ALL_DBS"
         ],
         "arguments": [
             {

src/commands/copy.json

@@ -15,6 +15,7 @@
             "SLOW",
             "WRITE"
         ],
+        "get_dbid_args": "copyDbIdArgs",
         "key_specs": [
             {
                 "flags": [

src/commands/flushall.json

@@ -17,7 +17,8 @@
             ]
         ],
         "command_flags": [
-            "WRITE"
+            "WRITE",
+            "ALL_DBS"
         ],
         "acl_categories": [
             "DANGEROUS",

src/commands/migrate.json

@@ -34,6 +34,7 @@
             "SLOW",
             "WRITE"
         ],
+        "get_dbid_args": "migrateDbIdArgs",
         "command_tips": [
             "NONDETERMINISTIC_OUTPUT"
         ],

src/commands/move.json

@@ -15,6 +15,7 @@
             "KEYSPACE",
             "WRITE"
         ],
+        "get_dbid_args": "moveDbIdArgs",
         "key_specs": [
             {
                 "flags": [

src/commands/select.json

@@ -15,6 +15,7 @@
             "CONNECTION",
             "FAST"
         ],
+        "get_dbid_args": "selectDbIdArgs",
         "reply_schema": {
             "const": "OK"
         },

src/commands/swapdb.json

@@ -16,6 +16,7 @@
             "KEYSPACE",
             "WRITE"
         ],
+        "get_dbid_args": "swapdbDbIdArgs",
         "arguments": [
             {
                 "name": "index1",

src/db.c

@@ -899,9 +899,14 @@ void selectCommand(client *c) {
 
     if (selectDb(c, id) == C_ERR) {
         addReplyError(c, "DB index is out of range");
-    } else {
-        addReply(c, shared.ok);
+        return;
     }
+
+    if (c->flag.multi) {
+        serverAssert(c->mstate != NULL);
+        c->mstate->transaction_db_id = id;
+    }
+    addReply(c, shared.ok);
 }
 
 void randomkeyCommand(client *c) {
@@ -2954,3 +2959,72 @@ int bitfieldGetKeys(struct serverCommand *cmd, robj **argv, int argc, getKeysRes
     }
     return 1;
 }
+
+int *selectDbIdArgs(robj **argv, int argc, int *count) {
+    if (argc < 2) return NULL;
+
+    long long dbid;
+    if (getLongLongFromObject(argv[1], &dbid) != C_OK) return NULL;
+    if (dbid < 0 || dbid >= server.dbnum) return NULL;
+
+    int *result = zmalloc(sizeof(int));
+    result[0] = (int)dbid;
+    *count = 1;
+    return result;
+}
+
+int *swapdbDbIdArgs(robj **argv, int argc, int *count) {
+    if (argc < 3) return NULL;
+
+    long long db1, db2;
+    if (getLongLongFromObject(argv[1], &db1) != C_OK ||
+        getLongLongFromObject(argv[2], &db2) != C_OK) return NULL;
+    if (db1 < 0 || db1 >= server.dbnum || db2 < 0 || db2 >= server.dbnum) return NULL;
+
+    int *result = zmalloc(2 * sizeof(int));
+    result[0] = (int)db1;
+    result[1] = (int)db2;
+    *count = 2;
+    return result;
+}
+
+int *moveDbIdArgs(robj **argv, int argc, int *count) {
+    if (argc < 3) return NULL;
+
+    long long dbid;
+    if (getLongLongFromObject(argv[2], &dbid) != C_OK) return NULL;
+    if (dbid < 0 || dbid >= server.dbnum) return NULL;
+
+    int *result = zmalloc(sizeof(int));
+    result[0] = (int)dbid;
+    *count = 1;
+    return result;
+}
+
+int *migrateDbIdArgs(robj **argv, int argc, int *count) {
+    if (argc < 5) return NULL;
+
+    long long dbid;
+    if (getLongLongFromObject(argv[4], &dbid) != C_OK) return NULL;
+    if (dbid < 0 || dbid >= server.dbnum) return NULL;
+
+    int *result = zmalloc(sizeof(int));
+    result[0] = (int)dbid;
+    *count = 1;
+    return result;
+}
+
+int *copyDbIdArgs(robj **argv, int argc, int *count) {
+    if (argc < 5) return NULL;
+
+    if (strcasecmp(argv[3]->ptr, "db") != 0) return NULL;
+
+    long long dbid;
+    if (getLongLongFromObject(argv[4], &dbid) != C_OK) return NULL;
+    if (dbid < 0 || dbid >= server.dbnum) return NULL;
+
+    int *result = zmalloc(sizeof(int));
+    result[0] = (int)dbid;
+    *count = 1;
+    return result;
+}

src/intset.c

@@ -335,3 +335,18 @@ int intsetValidateIntegrity(const unsigned char *p, size_t size, int deep) {
 
     return 1;
 }
+
+/* Free an intset */
+void intsetFree(intset *is) {
+    if (is) zfree(is);
+}
+
+/* Deep copy an intset */
+intset *intsetDup(intset *is) {
+    if (!is) return intsetNew();
+
+    size_t size = intsetBlobLen(is);
+    intset *copy = zmalloc(size);
+    memcpy(copy, is, size);
+    return copy;
+}

src/intset.h

@@ -49,5 +49,7 @@ uint8_t intsetGet(intset *is, uint32_t pos, int64_t *value);
 uint32_t intsetLen(const intset *is);
 size_t intsetBlobLen(intset *is);
 int intsetValidateIntegrity(const unsigned char *is, size_t size, int deep);
+void intsetFree(intset *is);
+intset *intsetDup(intset *is);
 
 #endif // __INTSET_H