Fix formatting and import order

Signed-off-by: Jacob Murphy <jkmurphy@google.com>

Author: murphyjacob4

src/acl.c

@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sds.h"
 #include "server.h"
+#include "sds.h"
 #include "sha256.h"
 #include "module.h"
 #include "intset.h"
@@ -676,7 +676,7 @@ static void ACLSetSelectorCommandBitsForCategory(hashtable *commands, aclSelecto
 }
 
 /* This function is responsible for recomputing the command bits for all selectors of the existing users.
- * It uses the 'command_rules', a string representation of the ordered categories and commands,
+ * It uses the 'command_rules', a list of the ordered categories and commands,
  * to recompute the command bits. */
 void ACLRecomputeCommandBitsFromCommandRulesAllUsers(void) {
     raxIterator ri;
@@ -689,6 +689,10 @@ void ACLRecomputeCommandBitsFromCommandRulesAllUsers(void) {
         listRewind(u->selectors, &li);
         while ((ln = listNext(&li))) {
             aclSelector *selector = (aclSelector *)listNodeValue(ln);
+            /* Duplicate the rules list before resetting the selector, as
+             * ACLSetSelector will clear selector->command_rules. */
+            list *rules_copy = listDup(selector->command_rules);
+ 
             /* Checking selector's permissions for all commands to start with a clean state. */
             if (ACLSelectorCanExecuteFutureCommands(selector)) {
                 int res = ACLSetSelector(selector, "+@all", -1);
@@ -698,15 +702,16 @@ void ACLRecomputeCommandBitsFromCommandRulesAllUsers(void) {
                 serverAssert(res == C_OK);
             }
 
-            /* Apply all of the commands and categories to this selector. */
+            /* Apply all of the commands and categories to this selector from the copy. */
             listIter sli;
             listNode *sln;
-            listRewind(selector->command_rules, &sli);
+            listRewind(rules_copy, &sli);
             while ((sln = listNext(&sli))) {
                 sds rule = listNodeValue(sln);
                 int res = ACLSetSelector(selector, rule, sdslen(rule));
                 serverAssert(res == C_OK);
             }
+            listRelease(rules_copy);
         }
     }
     raxStop(&ri);

tests/unit/acl.tcl

@@ -1493,16 +1493,16 @@ start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"] tags
                 } else {
                     assert_equal [dict get $acl $field] $expected_val
                 }
-            
-            # Verify with LIST for specific cases to ensure quoting in serialization
-            if {$username eq "keyquoter"} {
-                set acl_list [r ACL LIST]
-                assert_match {*"~key\\\"name"*} $acl_list
-            }
-            if {$username eq "chanquoter"} {
-                set acl_list [r ACL LIST]
-                assert_match {*"&chan\\\"name"*} $acl_list
-            }
+
+                # Verify with LIST for specific cases to ensure quoting in serialization
+                if {$username eq "keyquoter"} {
+                    set acl_list [r ACL LIST]
+                    assert_match {*"~key\\\"name"*} $acl_list
+                }
+                if {$username eq "chanquoter"} {
+                    set acl_list [r ACL LIST]
+                    assert_match {*"&chan\\\"name"*} $acl_list
+                }
             }
 
             # Clean up user for next iteration