ACL LOG support entry-id (#3366)

fixes #3346

Author: yangbodong22011

src/main/java/redis/clients/jedis/BuilderFactory.java

@@ -925,6 +925,9 @@ private Map<String, Builder> createDecoderMap() {
       tempMappingFunctions.put(AccessControlLogEntry.USERNAME, STRING);
       tempMappingFunctions.put(AccessControlLogEntry.AGE_SECONDS, STRING);
       tempMappingFunctions.put(AccessControlLogEntry.CLIENT_INFO, STRING);
+      tempMappingFunctions.put(AccessControlLogEntry.ENTRY_ID, LONG);
+      tempMappingFunctions.put(AccessControlLogEntry.TIMESTAMP_CREATED, LONG);
+      tempMappingFunctions.put(AccessControlLogEntry.TIMESTAMP_LAST_UPDATED, LONG);
 
       return tempMappingFunctions;
     }

src/main/java/redis/clients/jedis/resps/AccessControlLogEntry.java

@@ -19,6 +19,10 @@ public class AccessControlLogEntry implements Serializable {
   public static final String USERNAME = "username";
   public static final String AGE_SECONDS = "age-seconds";
   public static final String CLIENT_INFO = "client-info";
+  // Redis 7.2
+  public static final String ENTRY_ID = "entry-id";
+  public static final String TIMESTAMP_CREATED = "timestamp-created";
+  public static final String TIMESTAMP_LAST_UPDATED = "timestamp-last-updated";
 
   private long count;
   private final String reason;
@@ -28,6 +32,9 @@ public class AccessControlLogEntry implements Serializable {
   private final String ageSeconds;
   private final Map<String, String> clientInfo;
   private final Map<String, Object> logEntry;
+  private final long entryId;
+  private final long timestampCreated;
+  private final long timestampLastUpdated;
 
   public AccessControlLogEntry(Map<String, Object> map) {
     count = (long) map.get(COUNT);
@@ -38,6 +45,9 @@ public AccessControlLogEntry(Map<String, Object> map) {
     ageSeconds = (String) map.get(AGE_SECONDS);
     clientInfo = getMapFromRawClientInfo((String) map.get(CLIENT_INFO));
     logEntry = map;
+    entryId = (long) map.get(ENTRY_ID);
+    timestampCreated = (long) map.get(TIMESTAMP_CREATED);
+    timestampLastUpdated = (long) map.get(TIMESTAMP_LAST_UPDATED);
   }
 
   public long getCount() {
@@ -75,6 +85,18 @@ public Map<String, Object> getlogEntry() {
     return logEntry;
   }
 
+  public long getEntryId() {
+    return entryId;
+  }
+
+  public long getTimestampCreated() {
+    return timestampCreated;
+  }
+
+  public long getTimestampLastUpdated() {
+    return timestampLastUpdated;
+  }
+
   /**
    * Convert the client-info string into a Map of String. When the value is empty, the value in the
    * map is set to an empty string The key order is maintained to reflect the string return by Redis
@@ -95,6 +117,8 @@ private Map<String, String> getMapFromRawClientInfo(String clientInfo) {
   public String toString() {
     return "AccessControlLogEntry{" + "count=" + count + ", reason='" + reason + '\''
         + ", context='" + context + '\'' + ", object='" + object + '\'' + ", username='" + username
-        + '\'' + ", ageSeconds='" + ageSeconds + '\'' + ", clientInfo=" + clientInfo + '}';
+        + '\'' + ", ageSeconds='" + ageSeconds + '\'' + ", clientInfo=" + clientInfo
+        + ", entryId=" + entryId + ", timestampCreated=" + timestampCreated
+        + ", timestampLastUpdated=" + timestampLastUpdated + '}';
   }
 }

src/test/java/redis/clients/jedis/commands/jedis/AccessControlListCommandsTest.java

@@ -25,6 +25,7 @@
 import redis.clients.jedis.Transaction;
 import redis.clients.jedis.exceptions.JedisAccessControlException;
 import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.jedis.resps.AccessControlLogEntry;
 import redis.clients.jedis.resps.AccessControlUser;
 import redis.clients.jedis.util.RedisVersionUtil;
 import redis.clients.jedis.util.SafeEncoder;
@@ -444,6 +445,30 @@ public void aclLogTest() {
     jedis.aclDelUser("antirez");
   }
 
+  @Test
+  public void aclLogWithEntryID() {
+    try {
+      jedis.auth("wronguser", "wrongpass");
+      fail("wrong user should not passed");
+    } catch (JedisAccessControlException e) {
+    }
+
+    List<AccessControlLogEntry> aclEntries = jedis.aclLog();
+    assertEquals("Number of log messages ", 1, aclEntries.size());
+    assertEquals(1, aclEntries.get(0).getCount());
+    assertEquals("wronguser", aclEntries.get(0).getUsername());
+    assertEquals("toplevel", aclEntries.get(0).getContext());
+    assertEquals("auth", aclEntries.get(0).getReason());
+    assertEquals("AUTH", aclEntries.get(0).getObject());
+    assertTrue(aclEntries.get(0).getEntryId() >= 0);
+    assertTrue(aclEntries.get(0).getTimestampCreated() > 0);
+    assertEquals(aclEntries.get(0).getTimestampCreated(), aclEntries.get(0).getTimestampLastUpdated());
+
+    // RESET
+    String status = jedis.aclLogReset();
+    assertEquals(status, "OK");
+  }
+
   @Test
   public void aclGenPass() {
     assertNotNull(jedis.aclGenPass());