Make all ACL categories explicit in JSON files

src/commands/README.md

@@ -134,16 +134,13 @@ following keys. To be safe, assume all of them are optional.
     if type is "pure-token". If type is anything else, then `"token"` indicates
     the argument is preceded by an extra (fixed string) argument.
 
-Implicit ACL categories
+ACL categories
 -----------------------
 
-The ACL categories specified as `"acl_categories"` are not the ones actually used.
-The effective ACL categories are affected also by command flags.
-
-The logic for this can be found in the function `setImplicitACLCategories()` in
-`server.c`. Here are the rules (unless they have changed since this
-documentation was written):
+The ACL categories specified as `"acl_categories"` are the ones that are actually used.
+**Note:** commands categories should follow specific rules that are checked in `utils/generate-command-code.py`
 
+**ACL Category Rules:**
 * Command flag WRITE implies ACL category WRITE.
 * Command flag READONLY and not ACL category SCRIPTING implies ACL category READ.
   "Exclude scripting commands from the RO category."
@@ -153,9 +150,6 @@ documentation was written):
 * Command flag BLOCKING implies ACL category BLOCKING.
 * Not ACL category FAST implies ACL category SLOW. "If it's not fast, it's slow."
 
-There's an issue about explicitly listing all categories, removing this
-discrepancy: https://github.com/valkey-io/valkey/issues/417
-
 Key specs
 ---------
 

src/commands/acl-cat.json

@@ -37,6 +37,9 @@
                 "type": "string",
                 "optional": true
             }
+        ],
+        "acl_categories": [
+            "SLOW"
         ]
     }
 }

src/commands/acl-deluser.json

@@ -15,9 +15,9 @@
             "SENTINEL"
         ],
         "command_tips": [
-          "REQUEST_POLICY:ALL_NODES",
-          "RESPONSE_POLICY:ALL_SUCCEEDED"
-        ],        
+            "REQUEST_POLICY:ALL_NODES",
+            "RESPONSE_POLICY:ALL_SUCCEEDED"
+        ],
         "reply_schema": {
             "type": "integer",
             "description": "The number of users that were deleted."
@@ -28,6 +28,11 @@
                 "type": "string",
                 "multiple": true
             }
+        ],
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
         ]
     }
 }

src/commands/acl-dryrun.json

@@ -41,6 +41,11 @@
                 "optional": true,
                 "multiple": true
             }
+        ],
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
         ]
     }
 }

src/commands/acl-genpass.json

@@ -23,6 +23,9 @@
                 "type": "integer",
                 "optional": true
             }
+        ],
+        "acl_categories": [
+            "SLOW"
         ]
     }
 }

src/commands/acl-getuser.json

@@ -86,6 +86,11 @@
                     "type": "null"
                 }
             ]
-        }
+        },
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
+        ]
     }
 }

src/commands/acl-help.json

@@ -18,6 +18,9 @@
             "items": {
                 "type": "string"
             }
-        }
+        },
+        "acl_categories": [
+            "SLOW"
+        ]
     }
 }

src/commands/acl-list.json

@@ -20,6 +20,11 @@
             "items": {
                 "type": "string"
             }
-        }
+        },
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
+        ]
     }
 }

src/commands/acl-load.json

@@ -16,6 +16,11 @@
         ],
         "reply_schema": {
             "const": "OK"
-        }
+        },
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
+        ]
     }
 }

src/commands/acl-log.json

@@ -85,6 +85,11 @@
                     }
                 ]
             }
+        ],
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
         ]
     }
 }

src/commands/acl-save.json

@@ -15,11 +15,16 @@
             "SENTINEL"
         ],
         "command_tips": [
-          "REQUEST_POLICY:ALL_NODES",
-          "RESPONSE_POLICY:ALL_SUCCEEDED"
+            "REQUEST_POLICY:ALL_NODES",
+            "RESPONSE_POLICY:ALL_SUCCEEDED"
         ],
         "reply_schema": {
             "const": "OK"
-        }
+        },
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
+        ]
     }
 }

src/commands/acl-setuser.json

@@ -25,9 +25,9 @@
             "SENTINEL"
         ],
         "command_tips": [
-          "REQUEST_POLICY:ALL_NODES",
-          "RESPONSE_POLICY:ALL_SUCCEEDED"
-        ],        
+            "REQUEST_POLICY:ALL_NODES",
+            "RESPONSE_POLICY:ALL_SUCCEEDED"
+        ],
         "reply_schema": {
             "const": "OK"
         },
@@ -42,6 +42,11 @@
                 "optional": true,
                 "multiple": true
             }
+        ],
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
         ]
     }
 }

src/commands/acl-users.json

@@ -20,6 +20,11 @@
             "items": {
                 "type": "string"
             }
-        }
+        },
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
+        ]
     }
 }

src/commands/acl-whoami.json

@@ -16,6 +16,9 @@
         "reply_schema": {
             "type": "string",
             "description": "The username of the current connection."
-        }
+        },
+        "acl_categories": [
+            "SLOW"
+        ]
     }
 }

src/commands/acl.json

@@ -7,6 +7,9 @@
         "arity": -2,
         "command_flags": [
             "SENTINEL"
+        ],
+        "acl_categories": [
+            "SLOW"
         ]
     }
 }

src/commands/append.json

@@ -12,7 +12,9 @@
             "FAST"
         ],
         "acl_categories": [
-            "STRING"
+            "FAST",
+            "STRING",
+            "WRITE"
         ],
         "key_specs": [
             {

src/commands/asking.json

@@ -10,7 +10,8 @@
             "FAST"
         ],
         "acl_categories": [
-            "CONNECTION"
+            "CONNECTION",
+            "FAST"
         ],
         "reply_schema": {
             "const": "OK"

src/commands/auth.json

@@ -22,7 +22,8 @@
             "ALLOW_BUSY"
         ],
         "acl_categories": [
-            "CONNECTION"
+            "CONNECTION",
+            "FAST"
         ],
         "reply_schema": {
             "const": "OK"

src/commands/bgrewriteaof.json

@@ -14,6 +14,11 @@
         "reply_schema": {
             "description": "A simple string reply indicating that the rewriting started or is about to start ASAP",
             "type": "string"
-        }
+        },
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
+        ]
     }
 }

src/commands/bgsave.json

@@ -57,6 +57,11 @@
                     "const": "Scheduled background saving cancelled"
                 }
             ]
-        }
+        },
+        "acl_categories": [
+            "ADMIN",
+            "DANGEROUS",
+            "SLOW"
+        ]
     }
 }

src/commands/bitcount.json

@@ -20,7 +20,9 @@
             "READONLY"
         ],
         "acl_categories": [
-            "BITMAP"
+            "BITMAP",
+            "READ",
+            "SLOW"
         ],
         "key_specs": [
             {

src/commands/bitfield.json

@@ -12,7 +12,9 @@
             "DENYOOM"
         ],
         "acl_categories": [
-            "BITMAP"
+            "BITMAP",
+            "SLOW",
+            "WRITE"
         ],
         "key_specs": [
             {

src/commands/bitfield_ro.json

@@ -11,7 +11,9 @@
             "FAST"
         ],
         "acl_categories": [
-            "BITMAP"
+            "BITMAP",
+            "FAST",
+            "READ"
         ],
         "key_specs": [
             {

src/commands/bitop.json

@@ -11,7 +11,9 @@
             "DENYOOM"
         ],
         "acl_categories": [
-            "BITMAP"
+            "BITMAP",
+            "SLOW",
+            "WRITE"
         ],
         "key_specs": [
             {

src/commands/bitpos.json

@@ -16,7 +16,9 @@
             "READONLY"
         ],
         "acl_categories": [
-            "BITMAP"
+            "BITMAP",
+            "READ",
+            "SLOW"
         ],
         "key_specs": [
             {

src/commands/blmove.json

@@ -12,7 +12,10 @@
             "BLOCKING"
         ],
         "acl_categories": [
-            "LIST"
+            "BLOCKING",
+            "LIST",
+            "SLOW",
+            "WRITE"
         ],
         "key_specs": [
             {

src/commands/blmpop.json

@@ -12,7 +12,10 @@
             "BLOCKING"
         ],
         "acl_categories": [
-            "LIST"
+            "BLOCKING",
+            "LIST",
+            "SLOW",
+            "WRITE"
         ],
         "key_specs": [
             {

src/commands/blpop.json

@@ -17,7 +17,10 @@
             "BLOCKING"
         ],
         "acl_categories": [
-            "LIST"
+            "BLOCKING",
+            "LIST",
+            "SLOW",
+            "WRITE"
         ],
         "key_specs": [
             {

src/commands/brpop.json

@@ -17,7 +17,10 @@
             "BLOCKING"
         ],
         "acl_categories": [
-            "LIST"
+            "BLOCKING",
+            "LIST",
+            "SLOW",
+            "WRITE"
         ],
         "key_specs": [
             {