From 1209dc2277342491b100f298d311510c86b0a2f2 Mon Sep 17 00:00:00 2001
From: Madelyn Olson <34459052+madolson@users.noreply.github.com>
Date: Sat, 9 Jul 2022 21:02:22 -0700
Subject: [PATCH] Only print ACL syntax errors once and include command names
 in errors (#10922)

* Only print ACL syntax errors once and include command names in errors
---
 src/acl.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/acl.c b/src/acl.c
index 3443ee691..b22761411 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -2169,15 +2169,25 @@ sds ACLLoadFromFile(const char *filename) {
                     server.acl_filename, linenum);
         }
 
-        int j;
-        for (j = 0; j < merged_argc; j++) {
+        int syntax_error = 0;
+        for (int j = 0; j < merged_argc; j++) {
             acl_args[j] = sdstrim(acl_args[j],"\t\r\n");
             if (ACLSetUser(u,acl_args[j],sdslen(acl_args[j])) != C_OK) {
                 const char *errmsg = ACLSetUserStringError();
-                errors = sdscatprintf(errors,
-                         "%s:%d: %s. ",
-                         server.acl_filename, linenum, errmsg);
-                continue;
+                if (errno == ENOENT) {
+                    /* For missing commands, we print out more information since
+                     * it shouldn't contain any sensitive information. */
+                    errors = sdscatprintf(errors,
+                            "%s:%d: Error in applying operation '%s': %s. ",
+                            server.acl_filename, linenum, acl_args[j], errmsg);
+                } else if (syntax_error == 0) {
+                    /* For all other errors, only print out the first error encountered
+                     * since it might affect future operations. */
+                    errors = sdscatprintf(errors,
+                            "%s:%d: %s. ",
+                            server.acl_filename, linenum, errmsg);
+                    syntax_error = 1;
+                }
             }
         }