From e8d799cb2116a0f41860d361e0a920df6d3dcd24 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Fri, 11 Oct 2024 13:57:43 +0530
Subject: [PATCH 01/19] feat: created dao and dto for api audit logs

---
 .../akto/dao/audit_logs/ApiAuditLogsDao.java  | 21 +++++
 .../com/akto/dto/audit_logs/ApiAuditLogs.java | 81 +++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
 create mode 100644 libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java

diff --git a/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
new file mode 100644
index 0000000000..d4d29c828f
--- /dev/null
+++ b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
@@ -0,0 +1,21 @@
+package com.akto.dao.audit_logs;
+
+import com.akto.dao.AccountsContextDao;
+import com.akto.dto.audit_logs.ApiAuditLogs;
+
+public class ApiAuditLogsDao extends AccountsContextDao<ApiAuditLogs> {
+
+    public static final ApiAuditLogsDao instance = new ApiAuditLogsDao();
+
+    private ApiAuditLogsDao() {}
+
+    @Override
+    public String getCollName() {
+        return "api_audit_logs";
+    }
+
+    @Override
+    public Class<ApiAuditLogs> getClassT() {
+        return ApiAuditLogs.class;
+    }
+}
diff --git a/libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java b/libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java
new file mode 100644
index 0000000000..1f7cdd88a6
--- /dev/null
+++ b/libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java
@@ -0,0 +1,81 @@
+package com.akto.dto.audit_logs;
+
+public class ApiAuditLogs {
+
+    public static final String TIMESTAMP = "timestamp";
+    private long timestamp;
+
+    public static final String API_ENDPOINT = "apiEndpoint";
+    private String apiEndpoint;
+
+    public static final String ACTION_DESCRIPTION = "actionDescription";
+    private String actionDescription;
+
+    public static final String USER_EMAIL = "userEmail";
+    private String userEmail;
+
+    public static final String USER_AGENT = "userAgent";
+    private String userAgent;
+
+    public static final String USER_IP_ADDRESS = "userIpAddress";
+    private String userIpAddress;
+
+    public ApiAuditLogs() {}
+
+    public ApiAuditLogs(long timestamp, String apiEndpoint, String actionDescription, String userEmail, String userAgent, String userIpAddress) {
+        this.timestamp = timestamp;
+        this.apiEndpoint = apiEndpoint;
+        this.actionDescription = actionDescription;
+        this.userEmail = userEmail;
+        this.userAgent = userAgent;
+        this.userIpAddress = userIpAddress;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getApiEndpoint() {
+        return apiEndpoint;
+    }
+
+    public void setApiEndpoint(String apiEndpoint) {
+        this.apiEndpoint = apiEndpoint;
+    }
+
+    public String getActionDescription() {
+        return actionDescription;
+    }
+
+    public void setActionDescription(String actionDescription) {
+        this.actionDescription = actionDescription;
+    }
+
+    public String getUserEmail() {
+        return userEmail;
+    }
+
+    public void setUserEmail(String userEmail) {
+        this.userEmail = userEmail;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public String getUserIpAddress() {
+        return userIpAddress;
+    }
+
+    public void setUserIpAddress(String userIpAddress) {
+        this.userIpAddress = userIpAddress;
+    }
+}

From 5597323c7d57857f2edba07db27a799292896c41 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Fri, 11 Oct 2024 14:07:32 +0530
Subject: [PATCH 02/19] feat: inserting api audit logs for every write action

---
 .../interceptor/RoleAccessInterceptor.java    | 29 +++++++++++++++
 .../akto/audit_logs_util/AuditLogsUtil.java   | 35 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java

diff --git a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
index 40f084c644..b1a13e0cd1 100644
--- a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
+++ b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
@@ -1,8 +1,12 @@
 package com.akto.interceptor;
 
+import com.akto.audit_logs_util.AuditLogsUtil;
 import com.akto.dao.RBACDao;
+import com.akto.dao.audit_logs.ApiAuditLogsDao;
 import com.akto.dao.billing.OrganizationsDao;
+import com.akto.dao.context.Context;
 import com.akto.dto.User;
+import com.akto.dto.audit_logs.ApiAuditLogs;
 import com.akto.dto.billing.FeatureAccess;
 import com.akto.dto.billing.Organization;
 import com.akto.dto.RBAC.Role;
@@ -17,7 +21,9 @@
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import org.apache.struts2.ServletActionContext;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,6 +33,7 @@ public class RoleAccessInterceptor extends AbstractInterceptor {
 
     String featureLabel;
     String accessType;
+    String actionDescription;
 
     public void setFeatureLabel(String featureLabel) {
         this.featureLabel = featureLabel;
@@ -36,6 +43,10 @@ public void setAccessType(String accessType) {
         this.accessType = accessType;
     }
 
+    public void setActionDescription(String actionDescription) {
+        this.actionDescription = actionDescription;
+    }
+
     public final static String FORBIDDEN = "FORBIDDEN";
     private final static String USER = "user";
     private final static String FEATURE_LABEL_STRING = "RBAC_FEATURE";
@@ -68,6 +79,7 @@ private int getUserAccountId (Map<String, Object> session) throws Exception{
     @Override
     public String intercept(ActionInvocation invocation) throws Exception {
         try {
+            HttpServletRequest request = ServletActionContext.getRequest();
 
             if(featureLabel == null) {
                 throw new Exception("Feature list is null or empty");
@@ -116,6 +128,23 @@ public String intercept(ActionInvocation invocation) throws Exception {
                 ((ActionSupport) invocation.getAction()).addActionError("The role '" + userRole + "' does not have access.");
                 return FORBIDDEN;
             }
+
+            try {
+                if (this.accessType.equalsIgnoreCase(ReadWriteAccess.READ_WRITE.toString())) {
+                    long timestamp = Context.now();
+                    String apiEndpoint = invocation.getProxy().getActionName();
+                    String actionDescription = this.actionDescription == null ? "Error: Description not available" : this.actionDescription;
+                    String userEmail = user.getLogin();
+                    String userAgent = request.getHeader("User-Agent") == null ? "Unknown User-Agent" : request.getHeader("User-Agent");
+                    String userIpAddress = AuditLogsUtil.getClientIpAddress(request);
+
+                    ApiAuditLogs apiAuditLogs = new ApiAuditLogs(timestamp, apiEndpoint, actionDescription, userEmail, userAgent, userIpAddress);
+                    ApiAuditLogsDao.instance.insertOne(apiAuditLogs);
+                }
+            } catch(Exception e) {
+                loggerMaker.errorAndAddToDb(e, "Error while inserting api audit logs: " + e.getMessage(), LogDb.DASHBOARD);
+            }
+
         } catch(Exception e) {
             String api = invocation.getProxy().getActionName();
             String error = "Error in RoleInterceptor for api: " + api + " ERROR: " + e.getMessage();
diff --git a/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
new file mode 100644
index 0000000000..96e96e1c42
--- /dev/null
+++ b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
@@ -0,0 +1,35 @@
+package com.akto.audit_logs_util;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class AuditLogsUtil {
+    public static String getClientIpAddress(HttpServletRequest request) {
+        String ip = request.getHeader("X-Forwarded-For");
+
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("X-Real-IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+
+        if ("[0:0:0:0:0:0:0:1]".equals(ip) || "[::1]".equals(ip)) {
+            ip = "127.0.0.1";
+        }
+
+        return (ip == null || ip.isEmpty()) ? "unknown" : ip;
+    }
+}

From b847a3769ab3c634701addebaa6d85b4e01c7279 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Fri, 11 Oct 2024 17:50:45 +0530
Subject: [PATCH 03/19] feat: created mongodb index for timestamp field

---
 libs/dao/src/main/java/com/akto/DaoInit.java                | 2 ++
 .../main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/libs/dao/src/main/java/com/akto/DaoInit.java b/libs/dao/src/main/java/com/akto/DaoInit.java
index 5997c522a7..e17e862aaf 100644
--- a/libs/dao/src/main/java/com/akto/DaoInit.java
+++ b/libs/dao/src/main/java/com/akto/DaoInit.java
@@ -1,6 +1,7 @@
 package com.akto;
 
 import com.akto.dao.*;
+import com.akto.dao.audit_logs.ApiAuditLogsDao;
 import com.akto.dao.billing.OrganizationsDao;
 import com.akto.dao.loaders.LoadersDao;
 import com.akto.dao.testing.TestRolesDao;
@@ -402,6 +403,7 @@ public static void createIndices() {
         RBACDao.instance.createIndicesIfAbsent();
         TrafficAlertsDao.instance.createIndicesIfAbsent();
         RuntimeMetricsDao.instance.createIndicesIfAbsent();
+        ApiAuditLogsDao.instance.createIndicesIfAbsent();
     }
 
 }
diff --git a/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
index d4d29c828f..4a88eea9d4 100644
--- a/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
+++ b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
@@ -1,6 +1,7 @@
 package com.akto.dao.audit_logs;
 
 import com.akto.dao.AccountsContextDao;
+import com.akto.dao.MCollection;
 import com.akto.dto.audit_logs.ApiAuditLogs;
 
 public class ApiAuditLogsDao extends AccountsContextDao<ApiAuditLogs> {
@@ -9,6 +10,11 @@ public class ApiAuditLogsDao extends AccountsContextDao<ApiAuditLogs> {
 
     private ApiAuditLogsDao() {}
 
+    public void createIndicesIfAbsent() {
+        String[] fieldNames = { ApiAuditLogs.TIMESTAMP };
+        MCollection.createIndexIfAbsent(getDBName(), getCollName(), fieldNames, true);
+    }
+
     @Override
     public String getCollName() {
         return "api_audit_logs";

From cf6355146cde06954a5296f5eceaae10734373a6 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Fri, 11 Oct 2024 20:14:28 +0530
Subject: [PATCH 04/19] feat: created a new endpoint to fetch api audit logs
 from db

# Conflicts:
#	apps/dashboard/src/main/resources/struts.xml
---
 .../com/akto/action/ApiAuditLogsAction.java   | 65 +++++++++++++++++++
 .../interceptor/RoleAccessInterceptor.java    |  6 +-
 apps/dashboard/src/main/resources/struts.xml  | 21 ++++++
 .../com/akto/dto/audit_logs/ApiAuditLogs.java | 16 ++++-
 .../akto/audit_logs_util/AuditLogsUtil.java   | 50 +++++++-------
 5 files changed, 133 insertions(+), 25 deletions(-)
 create mode 100644 apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java

diff --git a/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java b/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
new file mode 100644
index 0000000000..43371a0476
--- /dev/null
+++ b/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
@@ -0,0 +1,65 @@
+package com.akto.action;
+
+import com.akto.dao.audit_logs.ApiAuditLogsDao;
+import com.akto.dto.audit_logs.ApiAuditLogs;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Sorts;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+public class ApiAuditLogsAction extends UserAction {
+    private int skip;
+    private int limit;
+    private int sortOrder;
+    private int startTimestamp;
+    private int endTimestamp;
+
+    private List<ApiAuditLogs> apiAuditLogs;
+    private long totalAuditLogs;
+    public String fetchApiAuditLogsFromDb() {
+        Bson filters = Filters.and(
+                Filters.gte(ApiAuditLogs.TIMESTAMP, startTimestamp),
+                Filters.lt(ApiAuditLogs.TIMESTAMP, endTimestamp)
+        );
+        Bson sort = sortOrder == -1 ? Sorts.descending(ApiAuditLogs.TIMESTAMP) : Sorts.ascending(ApiAuditLogs.TIMESTAMP);
+
+        if(limit == -1) {
+            apiAuditLogs = ApiAuditLogsDao.instance.findAll(filters);
+            totalAuditLogs = apiAuditLogs.size();
+        } else {
+            apiAuditLogs = ApiAuditLogsDao.instance.findAll(filters, skip, limit, sort);
+            totalAuditLogs = ApiAuditLogsDao.instance.getMCollection().countDocuments(Filters.empty());
+        }
+
+        return SUCCESS.toUpperCase();
+    }
+
+    public List<ApiAuditLogs> getApiAuditLogs() {
+        return apiAuditLogs;
+    }
+
+    public long getTotalAuditLogs() {
+        return totalAuditLogs;
+    }
+
+    public void setSortOrder(int sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
+    public void setSkip(int skip) {
+        this.skip = skip;
+    }
+
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+
+    public void setStartTimestamp(int startTimestamp) {
+        this.startTimestamp = startTimestamp;
+    }
+
+    public void setEndTimestamp(int endTimestamp) {
+        this.endTimestamp = endTimestamp;
+    }
+}
diff --git a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
index b1a13e0cd1..6cb1fd6866 100644
--- a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
+++ b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
@@ -25,6 +25,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class RoleAccessInterceptor extends AbstractInterceptor {
@@ -136,9 +137,10 @@ public String intercept(ActionInvocation invocation) throws Exception {
                     String actionDescription = this.actionDescription == null ? "Error: Description not available" : this.actionDescription;
                     String userEmail = user.getLogin();
                     String userAgent = request.getHeader("User-Agent") == null ? "Unknown User-Agent" : request.getHeader("User-Agent");
-                    String userIpAddress = AuditLogsUtil.getClientIpAddress(request);
+                    List<String> userProxyIpAddresses = AuditLogsUtil.getClientIpAddresses(request);
+                    String userIpAddress = userProxyIpAddresses.get(0);
 
-                    ApiAuditLogs apiAuditLogs = new ApiAuditLogs(timestamp, apiEndpoint, actionDescription, userEmail, userAgent, userIpAddress);
+                    ApiAuditLogs apiAuditLogs = new ApiAuditLogs(timestamp, apiEndpoint, actionDescription, userEmail, userAgent, userIpAddress, userProxyIpAddresses);
                     ApiAuditLogsDao.instance.insertOne(apiAuditLogs);
                 }
             } catch(Exception e) {
diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
index e3c4fdbfe9..5e9f2c8d1e 100644
--- a/apps/dashboard/src/main/resources/struts.xml
+++ b/apps/dashboard/src/main/resources/struts.xml
@@ -7013,6 +7013,27 @@
             </result>
         </action>
 
+        <action name="api/fetchApiAuditLogsFromDb" class="com.akto.action.ApiAuditLogsAction" method="fetchApiAuditLogsFromDb">
+            <interceptor-ref name="json"/>
+            <interceptor-ref name="defaultStack" />
+            <interceptor-ref name="roleAccessInterceptor">
+                <param name="featureLabel">LOGS</param>
+                <param name="accessType">READ</param>
+            </interceptor-ref>
+
+            <result name="FORBIDDEN" type="json">
+                <param name="statusCode">403</param>
+                <param name="ignoreHierarchy">false</param>
+                <param name="includeProperties">^actionErrors.*</param>
+                <param name="root">apiAuditLogs, totalAuditLogs</param>
+            </result>
+            <result name="SUCCESS" type="json"/>
+
+            <result name="ERROR" type="httpheader">
+                <param name="status">401</param>
+            </result>
+        </action>
+
     </package>
 
 </struts>
diff --git a/libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java b/libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java
index 1f7cdd88a6..8b77c2f3a6 100644
--- a/libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java
+++ b/libs/dao/src/main/java/com/akto/dto/audit_logs/ApiAuditLogs.java
@@ -1,5 +1,7 @@
 package com.akto.dto.audit_logs;
 
+import java.util.List;
+
 public class ApiAuditLogs {
 
     public static final String TIMESTAMP = "timestamp";
@@ -20,15 +22,19 @@ public class ApiAuditLogs {
     public static final String USER_IP_ADDRESS = "userIpAddress";
     private String userIpAddress;
 
+    public static final String USER_PROXY_IP_ADDRESSES = "userProxyIpAddresses";
+    private List<String> userProxyIpAddresses;
+
     public ApiAuditLogs() {}
 
-    public ApiAuditLogs(long timestamp, String apiEndpoint, String actionDescription, String userEmail, String userAgent, String userIpAddress) {
+    public ApiAuditLogs(long timestamp, String apiEndpoint, String actionDescription, String userEmail, String userAgent, String userIpAddress, List<String> userProxyIpAddresses) {
         this.timestamp = timestamp;
         this.apiEndpoint = apiEndpoint;
         this.actionDescription = actionDescription;
         this.userEmail = userEmail;
         this.userAgent = userAgent;
         this.userIpAddress = userIpAddress;
+        this.userProxyIpAddresses = userProxyIpAddresses;
     }
 
     public long getTimestamp() {
@@ -78,4 +84,12 @@ public String getUserIpAddress() {
     public void setUserIpAddress(String userIpAddress) {
         this.userIpAddress = userIpAddress;
     }
+
+    public List<String> getUserProxyIpAddresses() {
+        return userProxyIpAddresses;
+    }
+
+    public void setUserProxyIpAddresses(List<String> userProxyIpAddresses) {
+        this.userProxyIpAddresses = userProxyIpAddresses;
+    }
 }
diff --git a/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
index 96e96e1c42..7633524ffd 100644
--- a/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
+++ b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
@@ -1,35 +1,41 @@
 package com.akto.audit_logs_util;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 public class AuditLogsUtil {
-    public static String getClientIpAddress(HttpServletRequest request) {
-        String ip = request.getHeader("X-Forwarded-For");
+    public static List<String> getClientIpAddresses(HttpServletRequest request) {
+        List<String> headers = Arrays.asList(
+                "X-Forwarded-For",
+                "X-Real-IP",
+                "Proxy-Client-IP",
+                "WL-Proxy-Client-IP",
+                "HTTP_CLIENT_IP",
+                "HTTP_X_FORWARDED_FOR"
+        );
 
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("X-Real-IP");
-        }
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("Proxy-Client-IP");
-        }
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_CLIENT_IP");
-        }
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-        }
+        List<String> ipAddresses = new ArrayList<>();
 
-        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getRemoteAddr();
+        for (String header : headers) {
+            String ips = request.getHeader(header);
+            if (ips != null && !ips.isEmpty() && !"unknown".equalsIgnoreCase(ips)) {
+                for (String ip : ips.split(",")) {
+                    ipAddresses.add(ip.trim());
+                }
+                break;
+            }
         }
 
-        if ("[0:0:0:0:0:0:0:1]".equals(ip) || "[::1]".equals(ip)) {
-            ip = "127.0.0.1";
+        if (ipAddresses.isEmpty()) {
+            String remoteIp = request.getRemoteAddr();
+            if (remoteIp != null && !remoteIp.isEmpty()) {
+                ipAddresses.add(remoteIp);
+            }
         }
 
-        return (ip == null || ip.isEmpty()) ? "unknown" : ip;
+        return ipAddresses.isEmpty() ? Collections.singletonList("unknown") : ipAddresses;
     }
 }

From 79dd7994e256f44bb76e5148d915378f142ede64 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Fri, 11 Oct 2024 20:15:10 +0530
Subject: [PATCH 05/19] feat: fetching and show api audit logs in the settings

---
 .../src/apps/dashboard/pages/settings/api.js  |   7 +
 .../pages/settings/audit_logs/AuditLogs.jsx   | 165 ++++++++++++++++++
 .../pages/settings/nav/SettingsLeftNav.jsx    |   9 +-
 .../web/polaris_web/web/src/apps/main/App.js  |   5 +
 4 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/api.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/api.js
index 84c8bfbded..21afa316a4 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/api.js
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/api.js
@@ -447,6 +447,13 @@ const settingRequests = {
                 accountPermission, modifiedValueForAccount
             }
         })
+    },
+    fetchApiAuditLogsFromDb(skip, limit, sortOrder, startTimestamp, endTimestamp) {
+        return request({
+            url: '/api/fetchApiAuditLogsFromDb',
+            method: 'post',
+            data: {skip, limit, sortOrder, startTimestamp, endTimestamp}
+        })
     }
 }
 
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
new file mode 100644
index 0000000000..281fb016d0
--- /dev/null
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
@@ -0,0 +1,165 @@
+import { Button, IndexFiltersMode, Text } from '@shopify/polaris'
+import React, { useEffect, useReducer, useState } from 'react'
+import settingRequests from '../api'
+import func from '@/util/func'
+import PageWithMultipleCards from '../../../components/layouts/PageWithMultipleCards'
+import TitleWithInfo from '../../../components/shared/TitleWithInfo'
+import DateRangeFilter from '../../../components/layouts/DateRangeFilter'
+import { produce } from 'immer'
+import values from "@/util/values";
+import GithubSimpleTable from '../../../components/tables/GithubSimpleTable'
+import { CellType } from '../../../components/tables/rows/GithubRow'
+
+const headers = [
+    {
+        title: "User email",
+        text: "User email",
+        value: "userEmail",
+        filterKey: "userEmail",
+        showFilter: true
+    },
+    {
+        title: "API endpoint",
+        text: "API endpoint",
+        value: "apiEndpoint",
+        filterKey: "apiEndpoint",
+        showFilter: true
+    },
+    {
+        title: "Action description",
+        text: "Action description",
+        value: "actionDescription"
+    },
+    {
+        title: "Timestamp",
+        text: "Timestamp",
+        value: "timestamp",
+        sortActive: true,
+    },
+    {
+        title: "User IP address",
+        text: "User IP address",
+        value: "userIpAddress",
+        filterKey: "userIpAddress",
+        showFilter: true
+    },
+    {
+        title: "User agent",
+        text: "User agent",
+        value: "userAgent",
+        filterKey: "rawUserAgent",
+        isText: CellType.TEXT,
+    },
+]
+
+const sortOptions = [
+    { label: 'Timestamp', value: 'timestamp asc', directionLabel: 'Newest', sortKey: 'rawTimestamp', columnIndex: 4 },
+    { label: 'Timestamp', value: 'timestamp desc', directionLabel: 'Oldest', sortKey: 'rawTimestamp', columnIndex: 4 },
+]
+
+const resourceName = {
+    singular: 'audit log',
+    plural: 'audit logs',
+}
+
+const AuditLogs = () => {
+    const [key, setKey] = useState(false)
+    const [loading, setLoading] = useState(false)
+    const [tableLoading, setTableLoading] = useState(false)
+    const [auditLogsData, setAuditLogsData] = useState([])
+    
+    const [currDateRange, dispatchCurrDateRange] = useReducer(produce((draft, action) => func.dateRangeReducer(draft, action)), values.ranges[2])
+    const getTimeEpoch = (key) => {
+        return Math.floor(Date.parse(currDateRange.period[key]) / 1000)
+    }
+    const startTimestamp = getTimeEpoch("since")
+    const endTimestamp = getTimeEpoch("until")
+
+    const fetchData = async () => {
+        setLoading(true)
+        setTableLoading(true)
+        await settingRequests.fetchApiAuditLogsFromDb(0, -1, 1, startTimestamp, endTimestamp).then((resp) => {
+            const apiAuditLogsArr = resp?.apiAuditLogs.map((item) => {
+                const { timestamp, userAgent } = item
+                return {
+                    ...item,
+                    timestamp: func.prettifyEpoch(timestamp),
+                    rawTimestamp: timestamp,
+                    userAgent: <Text breakWord>{userAgent}</Text>,
+                    rawUserAgent: userAgent
+                }
+            })
+        
+            setAuditLogsData(apiAuditLogsArr)
+        })
+
+        setLoading(false)
+        setTableLoading(false)
+    }
+
+    useEffect(() => {
+        fetchData()
+    }, [startTimestamp, endTimestamp])
+
+    const exportAuditLogsCSV = async () => {
+        setLoading(true)
+        if(auditLogsData == null || auditLogsData.length === 0) {
+            func.setToast(true, true, "Can not export empty CSV")
+            return
+        }
+        const csvHeaders = Object.keys(auditLogsData[0]).join(',') + '\n'
+        const csvRows = auditLogsData.map(row => {
+            return Object.values(row).join(',')
+        }).join('\n')
+    
+        const csvString = csvHeaders + csvRows
+        let blob = new Blob([csvString], {
+            type: "application/csvcharset=UTF-8"
+        });
+        saveAs(blob, "akto_audit_logs.csv") ;
+        func.setToast(true, false,"CSV exported successfully")
+        setLoading(false)
+    }
+
+    function disambiguateLabel(key, value) {
+        return func.convertToDisambiguateLabelObj(value, null, 2)
+    }
+
+    const auditLogsTable = (
+        <GithubSimpleTable
+            key={key}
+            pageLimit={20}
+            data={auditLogsData}
+            resourceName={resourceName}
+            sortOptions={sortOptions}
+            filters={[]}
+            appliedFilters={[]}
+            headers={headers}
+            headings={headers}
+            selectable={false}
+            useNewRow={true}
+            condensedHeight={true}
+            disambiguateLabel={disambiguateLabel}
+            mode={IndexFiltersMode.Default}
+            onRowClick={(data) => {}}
+            showFooter={false}
+            loading={tableLoading}
+        />
+    )
+
+    return (
+        <PageWithMultipleCards
+            title={
+                <TitleWithInfo 
+                    titleText={"Audit logs"} 
+                />
+            }
+            primaryAction={<Button loading={loading} primary onClick={exportAuditLogsCSV}>Export as CSV</Button>}
+            secondaryActions={<DateRangeFilter initialDispatch={currDateRange} dispatch={(dateObj) => dispatchCurrDateRange({ type: "update", period: dateObj.period, title: dateObj.title, alias: dateObj.alias })} />}
+            isFirstPage={true}
+            components={[auditLogsTable]}
+        />
+    )
+}
+
+export default AuditLogs
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/nav/SettingsLeftNav.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/nav/SettingsLeftNav.jsx
index edcb24f082..32f95cab23 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/nav/SettingsLeftNav.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/nav/SettingsLeftNav.jsx
@@ -1,5 +1,5 @@
 import { Navigation } from "@shopify/polaris"
-import { StoreDetailsFilledMinor, IdentityCardFilledMajor, AutomationFilledMajor, AppsFilledMajor} from "@shopify/polaris-icons"
+import { StoreDetailsFilledMinor, IdentityCardFilledMajor, AutomationFilledMajor, AppsFilledMajor, ComposeMajor} from "@shopify/polaris-icons"
 import { ListFilledMajor, ReportFilledMinor, LockFilledMajor, CollectionsFilledMajor, PlanMajor, ChatMajor} from "@shopify/polaris-icons"
 import { VariantMajor, VocabularyMajor, AdjustMinor } from "@shopify/polaris-icons"
 import { useLocation, useNavigate } from "react-router-dom"
@@ -37,6 +37,12 @@ const SettingsLeftNav = () => {
         selected: page === "self-hosted",
         onClick: () => navigate("/dashboard/settings/self-hosted")
     }] : []
+    const auditLogsArr = ((window.IS_SAAS === 'true' || window.DASHBOARD_MODE === 'ON_PREM') && window.USER_ROLE === 'ADMIN') ? [{
+        label: 'Audit logs',
+        icon: ComposeMajor,
+        selected: page === 'audit-logs',
+        onClick: () => navigate("/dashboard/settings/audit-logs")
+    }] : []
 
     const billingArr = window.IS_SAAS === 'true' || window.DASHBOARD_MODE === 'ON_PREM' ? [{
         label: 'Billing',
@@ -111,6 +117,7 @@ const SettingsLeftNav = () => {
                     },
                     ...billingArr,
                     ...selfHostedArr,
+                    ...auditLogsArr,
                     {
                         label: 'Help & Support',
                         icon: ChatMajor,
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/main/App.js b/apps/dashboard/web/polaris_web/web/src/apps/main/App.js
index e413ea1552..7f746d0ade 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/main/App.js
+++ b/apps/dashboard/web/polaris_web/web/src/apps/main/App.js
@@ -77,6 +77,7 @@ import SignUpWithSSO from "../signup/components/SignUpWithSSO";
 
 import TeamsWebhooks from "../dashboard/pages/settings/integrations/teamsWebhooks/TeamsWebhooks";
 import TeamsWebhook from "../dashboard/pages/settings/integrations/teamsWebhooks/TeamsWebhook";
+import AuditLogs from "../dashboard/pages/settings/audit_logs/AuditLogs";
 
 // if you add a component in a new path, please verify the search implementation in function -> 'getSearchItemsArr' in func.js
 
@@ -317,6 +318,10 @@ const router = createBrowserRouter([
           {
             path: "self-hosted",
             element: <SelfHosted/>
+          },
+          {
+            path: 'audit-logs',
+            element: <AuditLogs/>
           }
         ]
       },

From d18fac905bc61dcb07688058365b1b251e9e1230 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Fri, 11 Oct 2024 23:07:10 +0530
Subject: [PATCH 06/19] feat: handling non-admin user behaviour for audit logs

---
 .../java/com/akto/action/ApiAuditLogsAction.java    | 13 +++++++++++++
 apps/dashboard/src/main/resources/struts.xml        |  9 +++++----
 .../components/layouts/DateRangeFilter.jsx          |  1 +
 .../pages/settings/audit_logs/AuditLogs.jsx         |  8 +++++---
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java b/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
index 43371a0476..91b5227dc0 100644
--- a/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
@@ -1,6 +1,10 @@
 package com.akto.action;
 
+import com.akto.dao.RBACDao;
 import com.akto.dao.audit_logs.ApiAuditLogsDao;
+import com.akto.dao.context.Context;
+import com.akto.dto.RBAC;
+import com.akto.dto.User;
 import com.akto.dto.audit_logs.ApiAuditLogs;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Sorts;
@@ -18,6 +22,15 @@ public class ApiAuditLogsAction extends UserAction {
     private List<ApiAuditLogs> apiAuditLogs;
     private long totalAuditLogs;
     public String fetchApiAuditLogsFromDb() {
+        User user = getSUser();
+        if(user == null) return ERROR.toUpperCase();
+
+        RBAC.Role currentRoleForUser = RBACDao.getCurrentRoleForUser(user.getId(), Context.accountId.get());
+        if(currentRoleForUser == null || !currentRoleForUser.equals(RBAC.Role.ADMIN)) {
+            addActionError("You do not have access to the audit logs.");
+            return ERROR.toUpperCase();
+        }
+
         Bson filters = Filters.and(
                 Filters.gte(ApiAuditLogs.TIMESTAMP, startTimestamp),
                 Filters.lt(ApiAuditLogs.TIMESTAMP, endTimestamp)
diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
index 5e9f2c8d1e..893daecaa0 100644
--- a/apps/dashboard/src/main/resources/struts.xml
+++ b/apps/dashboard/src/main/resources/struts.xml
@@ -7017,7 +7017,7 @@
             <interceptor-ref name="json"/>
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
-                <param name="featureLabel">LOGS</param>
+                <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ</param>
             </interceptor-ref>
 
@@ -7025,12 +7025,13 @@
                 <param name="statusCode">403</param>
                 <param name="ignoreHierarchy">false</param>
                 <param name="includeProperties">^actionErrors.*</param>
-                <param name="root">apiAuditLogs, totalAuditLogs</param>
             </result>
             <result name="SUCCESS" type="json"/>
 
-            <result name="ERROR" type="httpheader">
-                <param name="status">401</param>
+            <result name="ERROR" type="json">
+                <param name="statusCode">422</param>
+                <param name="ignoreHierarchy">false</param>
+                <param name="includeProperties">^actionErrors.*</param>
             </result>
         </action>
 
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx
index 8c10fd366a..c2e72b56ff 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx
@@ -25,6 +25,7 @@ function DateRangeFilter(props){
         fullHeight
         activator={
           <Button
+            disabled={props?.disabled}
             icon={CalendarMinor}
             onClick={() => setPopoverActive(!popoverActive)}
           >
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
index 281fb016d0..37ffb50af4 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
@@ -91,10 +91,11 @@ const AuditLogs = () => {
             })
         
             setAuditLogsData(apiAuditLogsArr)
+        }).finally(() => {
+            setLoading(false)
+            setTableLoading(false)
         })
 
-        setLoading(false)
-        setTableLoading(false)
     }
 
     useEffect(() => {
@@ -105,6 +106,7 @@ const AuditLogs = () => {
         setLoading(true)
         if(auditLogsData == null || auditLogsData.length === 0) {
             func.setToast(true, true, "Can not export empty CSV")
+            setLoading(false)
             return
         }
         const csvHeaders = Object.keys(auditLogsData[0]).join(',') + '\n'
@@ -155,7 +157,7 @@ const AuditLogs = () => {
                 />
             }
             primaryAction={<Button loading={loading} primary onClick={exportAuditLogsCSV}>Export as CSV</Button>}
-            secondaryActions={<DateRangeFilter initialDispatch={currDateRange} dispatch={(dateObj) => dispatchCurrDateRange({ type: "update", period: dateObj.period, title: dateObj.title, alias: dateObj.alias })} />}
+            secondaryActions={<DateRangeFilter disabled={window.USER_ROLE !== "ADMIN"} initialDispatch={currDateRange} dispatch={(dateObj) => dispatchCurrDateRange({ type: "update", period: dateObj.period, title: dateObj.title, alias: dateObj.alias })} />}
             isFirstPage={true}
             components={[auditLogsTable]}
         />

From f3e9fbf1a061335f96f4a4f7e7910f7c9314d808 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Sat, 12 Oct 2024 00:14:48 +0530
Subject: [PATCH 07/19] feat: cleaning the UI

---
 .../apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
index 37ffb50af4..71e31e4098 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
@@ -1,4 +1,4 @@
-import { Button, IndexFiltersMode, Text } from '@shopify/polaris'
+import { Box, Button, IndexFiltersMode, Text } from '@shopify/polaris'
 import React, { useEffect, useReducer, useState } from 'react'
 import settingRequests from '../api'
 import func from '@/util/func'
@@ -80,12 +80,13 @@ const AuditLogs = () => {
         setTableLoading(true)
         await settingRequests.fetchApiAuditLogsFromDb(0, -1, 1, startTimestamp, endTimestamp).then((resp) => {
             const apiAuditLogsArr = resp?.apiAuditLogs.map((item) => {
-                const { timestamp, userAgent } = item
+                const { actionDescription, timestamp, userAgent } = item
                 return {
                     ...item,
+                    actionDescription: <Box width='200px'><Text breakWord>{actionDescription}</Text></Box>,
                     timestamp: func.prettifyEpoch(timestamp),
                     rawTimestamp: timestamp,
-                    userAgent: <Text breakWord>{userAgent}</Text>,
+                    userAgent: <Box width='250px'><Text breakWord>{userAgent}</Text></Box>,
                     rawUserAgent: userAgent
                 }
             })

From 11e50cc578be612ec38b1a2caee4d55d2873f3ae Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Sat, 12 Oct 2024 11:28:26 +0530
Subject: [PATCH 08/19] feat: changing audit logs table column names

---
 .../pages/settings/audit_logs/AuditLogs.jsx   | 21 ++++++++++---------
 .../web/polaris_web/web/src/util/func.js      | 11 ++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
index 71e31e4098..879c99a126 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
@@ -19,20 +19,20 @@ const headers = [
         showFilter: true
     },
     {
-        title: "API endpoint",
-        text: "API endpoint",
+        title: "Operation",
+        text: "Operation",
         value: "apiEndpoint",
         filterKey: "apiEndpoint",
         showFilter: true
     },
     {
-        title: "Action description",
-        text: "Action description",
+        title: "Operation description",
+        text: "Operation description",
         value: "actionDescription"
     },
     {
-        title: "Timestamp",
-        text: "Timestamp",
+        title: "Time",
+        text: "Time",
         value: "timestamp",
         sortActive: true,
     },
@@ -80,13 +80,14 @@ const AuditLogs = () => {
         setTableLoading(true)
         await settingRequests.fetchApiAuditLogsFromDb(0, -1, 1, startTimestamp, endTimestamp).then((resp) => {
             const apiAuditLogsArr = resp?.apiAuditLogs.map((item) => {
-                const { actionDescription, timestamp, userAgent } = item
+                const { apiEndpoint, actionDescription, timestamp, userAgent } = item
                 return {
                     ...item,
-                    actionDescription: <Box width='200px'><Text breakWord>{actionDescription}</Text></Box>,
+                    apiEndpoint: func.formatEndpoint(apiEndpoint),
+                    actionDescription: <Box width='250px'><p style={{whiteSpace: 'pre-wrap'}}>{actionDescription}</p></Box>,
                     timestamp: func.prettifyEpoch(timestamp),
                     rawTimestamp: timestamp,
-                    userAgent: <Box width='250px'><Text breakWord>{userAgent}</Text></Box>,
+                    userAgent: <Box width='fit-content'><p style={{whiteSpace: 'pre-wrap'}}>{userAgent}</p></Box>,
                     rawUserAgent: userAgent
                 }
             })
@@ -157,7 +158,7 @@ const AuditLogs = () => {
                     titleText={"Audit logs"} 
                 />
             }
-            primaryAction={<Button loading={loading} primary onClick={exportAuditLogsCSV}>Export as CSV</Button>}
+            primaryAction={<Button disabled={window.USER_ROLE !== "ADMIN"} loading={loading} primary onClick={exportAuditLogsCSV}>Export as CSV</Button>}
             secondaryActions={<DateRangeFilter disabled={window.USER_ROLE !== "ADMIN"} initialDispatch={currDateRange} dispatch={(dateObj) => dispatchCurrDateRange({ type: "update", period: dateObj.period, title: dateObj.title, alias: dateObj.alias })} />}
             isFirstPage={true}
             components={[auditLogsTable]}
diff --git a/apps/dashboard/web/polaris_web/web/src/util/func.js b/apps/dashboard/web/polaris_web/web/src/util/func.js
index c7f01b9750..8f3daa2e1e 100644
--- a/apps/dashboard/web/polaris_web/web/src/util/func.js
+++ b/apps/dashboard/web/polaris_web/web/src/util/func.js
@@ -1647,6 +1647,17 @@ showConfirmationModal(modalContent, primaryActionContent, primaryAction) {
     if(iconsUsedMap[iconString] !== undefined){
       return iconsUsedMap[iconString]
     } return null
+  },
+  formatEndpoint(endpoint) {
+    const trimmedEndpoint = endpoint.replace(/^api\//, '')
+    const spacedEndpoint = trimmedEndpoint.replace(/([a-z])([A-Z])/g, '$1 $2')
+    const finalEndpoint = spacedEndpoint.replace(/[_-]/g, ' ')
+    const capitalizedEndpoint = finalEndpoint
+        .split(' ')
+        .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+        .join(' ')
+
+    return capitalizedEndpoint
   }
 }
 

From 674972fbccb33eb277bf6e1c451927ffa4768066 Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Sat, 12 Oct 2024 16:07:49 +0530
Subject: [PATCH 09/19] feat: changing accessType of READ_WRITE endpoints to
 READ only

---
 .../interceptor/RoleAccessInterceptor.java    | 13 +++-
 apps/dashboard/src/main/resources/struts.xml  | 73 ++++++++++---------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
index 6cb1fd6866..9960140dee 100644
--- a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
+++ b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
@@ -18,6 +18,7 @@
 import com.akto.log.LoggerMaker.LogDb;
 import com.akto.util.DashboardMode;
 import com.mongodb.client.model.Filters;
+import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
@@ -79,6 +80,7 @@ private int getUserAccountId (Map<String, Object> session) throws Exception{
 
     @Override
     public String intercept(ActionInvocation invocation) throws Exception {
+        ApiAuditLogs apiAuditLogs = null;
         try {
             HttpServletRequest request = ServletActionContext.getRequest();
 
@@ -140,8 +142,7 @@ public String intercept(ActionInvocation invocation) throws Exception {
                     List<String> userProxyIpAddresses = AuditLogsUtil.getClientIpAddresses(request);
                     String userIpAddress = userProxyIpAddresses.get(0);
 
-                    ApiAuditLogs apiAuditLogs = new ApiAuditLogs(timestamp, apiEndpoint, actionDescription, userEmail, userAgent, userIpAddress, userProxyIpAddresses);
-                    ApiAuditLogsDao.instance.insertOne(apiAuditLogs);
+                    apiAuditLogs = new ApiAuditLogs(timestamp, apiEndpoint, actionDescription, userEmail, userAgent, userIpAddress, userProxyIpAddresses);
                 }
             } catch(Exception e) {
                 loggerMaker.errorAndAddToDb(e, "Error while inserting api audit logs: " + e.getMessage(), LogDb.DASHBOARD);
@@ -153,6 +154,12 @@ public String intercept(ActionInvocation invocation) throws Exception {
             loggerMaker.errorAndAddToDb(e, error, LoggerMaker.LogDb.DASHBOARD);
         }
 
-        return invocation.invoke();
+        String result = invocation.invoke();
+
+        if (apiAuditLogs != null && result.equalsIgnoreCase(Action.SUCCESS.toUpperCase())) {
+            ApiAuditLogsDao.instance.insertOne(apiAuditLogs);
+        }
+
+        return result;
     }
 }
diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
index 893daecaa0..b9b4770575 100644
--- a/apps/dashboard/src/main/resources/struts.xml
+++ b/apps/dashboard/src/main/resources/struts.xml
@@ -209,7 +209,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -228,7 +228,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -246,7 +246,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -264,7 +264,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -340,7 +340,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -484,7 +484,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -563,7 +563,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -642,7 +642,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -663,7 +663,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1411,7 +1411,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2037,7 +2037,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2056,7 +2056,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2621,7 +2621,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -3517,7 +3517,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">LOGS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3537,7 +3537,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">LOGS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3577,7 +3577,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4082,7 +4082,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4103,7 +4103,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4601,7 +4601,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4675,7 +4675,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4769,7 +4769,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4813,7 +4813,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4834,7 +4834,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4855,7 +4855,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4897,7 +4897,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4940,7 +4940,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5188,7 +5188,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">METRICS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5231,7 +5231,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">METRICS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5312,7 +5312,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5370,7 +5370,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5815,7 +5815,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6086,7 +6086,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6130,7 +6130,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6520,7 +6520,7 @@
 
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6912,7 +6912,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -7020,6 +7020,9 @@
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ</param>
             </interceptor-ref>
+            <interceptor-ref name="usageInterceptor">
+                <param name="featureLabel">API_AUDIT_LOGS</param>
+            </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>

From 5c9fa4d26bc8cf59729026df2419c4a722b13a25 Mon Sep 17 00:00:00 2001
From: fenil <fenil@akto.io>
Date: Mon, 14 Oct 2024 19:32:56 +0530
Subject: [PATCH 10/19] Added description to logs

---
 apps/dashboard/src/main/resources/struts.xml | 157 +++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
index b9b4770575..8740e9acec 100644
--- a/apps/dashboard/src/main/resources/struts.xml
+++ b/apps/dashboard/src/main/resources/struts.xml
@@ -129,6 +129,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created a new account"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -152,6 +153,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">Navigated to a specific account in Akto</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -172,6 +174,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">User configured Google settings</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -192,6 +195,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">User sent Google authentication code to the server</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -303,6 +307,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"Removed a user from Akto"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -321,6 +326,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User made another user admin in Akto"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -430,6 +436,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted Github SSO settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -459,6 +466,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added Github SSO settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -509,6 +517,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added Okta SSO settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -538,6 +547,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted Okta SSO settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -588,6 +598,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added Azure SSO settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -617,6 +628,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted Azure SSO settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -685,6 +697,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added Github App Secret Key"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -706,6 +719,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted Github App Secret Key"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1051,6 +1065,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User triaged an API as false positive"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1072,6 +1087,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User invited another user to Akto"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1105,6 +1121,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a sensitive field"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1127,6 +1144,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User bulk marked sensitive fields"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1191,6 +1209,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User analyzed API samples for access matrix"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1233,6 +1252,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated an access matrix task"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1254,6 +1274,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created multiple access matrix tasks"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1274,6 +1295,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted an access matrix"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1295,6 +1317,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted an access matrix task"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1316,6 +1339,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User generated an OpenAPI file for a collection"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1336,6 +1360,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deactivated collections from inventory"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1360,6 +1385,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User imported an OpenAPI specification"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1387,6 +1413,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User activated collections in inventory"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1442,6 +1469,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User imported OpenAPI/Swagger file to Akto"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1668,6 +1696,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added APIs to a custom collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1689,6 +1718,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted APIs from a custom collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1710,6 +1740,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User removed APIs from a custom collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1731,6 +1762,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User computed custom collections"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1774,6 +1806,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated environment type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1794,6 +1827,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User redacted a collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1816,6 +1850,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User uploaded a HAR file"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1845,6 +1880,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User uploaded a TCP file"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1864,6 +1900,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created an empty collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1892,6 +1929,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created a custom collection with API endpoints"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1913,6 +1951,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated a custom collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1977,6 +2016,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added/updated Postman credentials"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1996,6 +2036,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created a Postman API"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2017,6 +2058,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added an API collection via Postman API"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2111,6 +2153,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User imported Postman data to Akto"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2138,6 +2181,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a Slack webhook"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2165,6 +2209,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted a Slack webhook"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2187,6 +2232,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added an API token"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2211,6 +2257,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted an API token"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2317,6 +2364,7 @@
            <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted an API collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2336,6 +2384,7 @@
            <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted multiple API collections"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2534,6 +2583,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added/updated a sensitive data type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2562,6 +2612,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User reset a sensitive data type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2582,6 +2633,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added/updated a sensitive data type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2602,6 +2654,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User reset a sensitive data type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2642,6 +2695,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User reset a sensitive data type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2662,6 +2716,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the active status of a sensitive data type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2720,6 +2775,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a custom auth type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2740,6 +2796,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated a custom auth type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2761,6 +2818,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User resets all custom auth types"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2781,6 +2839,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the active status of a custom auth type"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2804,6 +2863,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the sample data redaction status"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2828,6 +2888,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the merge async status"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2847,6 +2908,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the global rate limit"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2866,6 +2928,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the delta time for ignoring summaries"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2901,6 +2964,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the private CIDR IPs"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2924,6 +2988,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User applied access type to a collection"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2944,6 +3009,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the partner IPs"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2967,6 +3033,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TAGS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added/updated a tag config"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2988,6 +3055,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TAGS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User reviewed a tag config"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3009,6 +3077,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TAGS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the active status of a tag config"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3030,6 +3099,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User successfully updated Akto via instance refresh"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3053,6 +3123,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User started a test run"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3188,6 +3259,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User toggled a collection for testing"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3209,6 +3281,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added an auth mechanism"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3238,6 +3311,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User triggered login steps"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3420,6 +3494,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the setup (Production/Staging/QA/Development) type"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3441,6 +3516,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the regex matching in merging status"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3462,6 +3538,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the telemetry status"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3483,6 +3560,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">DEFAULT_PAYLOADS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the redundant URL settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3658,6 +3736,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created a test role"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3679,6 +3758,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted a test role"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3700,6 +3780,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated a test role"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3721,6 +3802,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted an auth mechanism from a test role"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3742,6 +3824,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated an auth mechanism in a test role"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3763,6 +3846,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added an auth mechanism to a test role"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3841,6 +3925,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the status of an issue"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3860,6 +3945,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User bulk updated the status of issues"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3879,6 +3965,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created a workflow test"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3899,6 +3986,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User edited a workflow test"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3919,6 +4007,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User set the state of a workflow test"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3939,6 +4028,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User exported a workflow test as a string"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3959,6 +4049,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User edited the details of a workflow node"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4020,6 +4111,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User fetched OTPs"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4041,6 +4133,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User sent OTPs"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4125,6 +4218,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User imported collection data in Burp"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4149,6 +4243,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a custom webhook"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4175,6 +4270,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted scheduled workflow tests"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4219,6 +4315,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated a custom webhook"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4266,6 +4363,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted test runs"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4287,6 +4385,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted test runs from summaries"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4329,6 +4428,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User downloaded workflow as JSON"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4350,6 +4450,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User changed the status of a webhook"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4374,6 +4475,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User ran a webhook once"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4412,6 +4514,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User stopped all tests"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4433,6 +4536,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User stopped a test"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4622,6 +4726,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the load balancer details"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4697,6 +4802,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created a runtime stack"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4749,6 +4855,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User saved OTP data"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4793,6 +4900,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User triggered a login step in user config"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4919,6 +5027,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User uploaded a recorded flow in user config"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4984,6 +5093,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the Akto UI mode"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5051,6 +5161,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User ran onboarding tests"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5095,6 +5206,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User skipped onboarding"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5118,6 +5230,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ASK_GPT</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User asked a question via AktoGPT"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5168,6 +5281,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ASK_GPT</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated AktoGPT config"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5255,6 +5369,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User imported collection data using postman file"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5284,6 +5399,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User imported collection data using postman file"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5342,6 +5458,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted postman import logs"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5394,6 +5511,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User closed a loader"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5415,6 +5533,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_EDITOR</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User set a test inactive in test editor"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5436,6 +5555,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">EXTERNAL_TEST_LIBRARY</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a new test library"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5457,6 +5577,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">EXTERNAL_TEST_LIBRARY</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User removed a test library"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5478,6 +5599,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">EXTERNAL_TEST_LIBRARY</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User synced a custom test library"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5522,6 +5644,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_EDITOR</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User saved a Akto test editor file"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5544,6 +5667,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User toggled debug logs feature in settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5565,6 +5689,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a filter header value map"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5586,6 +5711,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added an API collection name mapper"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5606,6 +5732,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted an API collection name mapper"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5627,6 +5754,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_EDITOR</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User ran a test for a given template in test editor"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5702,6 +5830,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated the traffic alert threshold seconds in settings"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5723,6 +5852,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User de-merged an API"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5756,6 +5886,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User tested Jira integration"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5787,6 +5918,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a Jira integration"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5837,6 +5969,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User created a Jira issue"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5858,6 +5991,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User attached a file to a Jira issue"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5980,6 +6114,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User marked a connection as skipped"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5999,6 +6134,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated their username and organization name"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6018,6 +6154,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User provisioned a subscription"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6041,6 +6178,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User synced usage data"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6064,6 +6202,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User synced with Akto usage data"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6108,6 +6247,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User refreshed usage data for an organization"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6173,6 +6313,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">DEFAULT_PAYLOADS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User saved a default payload"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6194,6 +6335,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User built a dependency table"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6216,6 +6358,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User invoked a dependency table"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6237,6 +6380,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User saved replace details"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6258,6 +6402,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User saved global variables"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6363,6 +6508,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User synced extracted APIs from source code"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6450,6 +6596,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TRAFFIC_FILTERS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User marked an alert as dismissed"</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6495,6 +6642,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated a script"</param>
             </interceptor-ref>
             <interceptor-ref name="usageInterceptor">
                 <param name="featureLabel">TEST_PRE_SCRIPT</param>
@@ -6543,6 +6691,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a script"</param>
             </interceptor-ref>
             <interceptor-ref name="usageInterceptor">
                 <param name="featureLabel">TEST_PRE_SCRIPT</param>
@@ -6571,6 +6720,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added a code analysis repo"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6593,6 +6743,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted a code analysis repo"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6676,6 +6827,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User saved a filter in YAML template"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6751,6 +6903,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User added advanced filters for traffic analysis"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6832,6 +6985,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User deleted an advanced filter for traffic analysis"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6853,6 +7007,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User changed the state of an advanced filter for traffic analysis"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6934,6 +7089,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User updated retrospective filter settings"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6977,6 +7133,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
+                <param name="actionDescription">"User modified account settings"</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>

From 0f5e8f67f6b5b350f78622ad95915ed3afa0a05d Mon Sep 17 00:00:00 2001
From: TangoBeeAkto <umesh@akto.io>
Date: Mon, 14 Oct 2024 13:15:41 +0530
Subject: [PATCH 11/19] feat: adding null check for accessGiven

---
 .../main/java/com/akto/interceptor/RoleAccessInterceptor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
index 9960140dee..3caf577be4 100644
--- a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
+++ b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
@@ -123,7 +123,7 @@ public String intercept(ActionInvocation invocation) throws Exception {
             ReadWriteAccess accessGiven = userRoleRecord.getReadWriteAccessForFeature(featureType);
             boolean hasRequiredAccess = false;
 
-            if(this.accessType.equalsIgnoreCase(ReadWriteAccess.READ.toString()) || this.accessType.equalsIgnoreCase(accessGiven.toString())){
+            if(this.accessType.equalsIgnoreCase(ReadWriteAccess.READ.toString()) || (accessGiven != null && this.accessType.equalsIgnoreCase(accessGiven.toString()))){
                 hasRequiredAccess = true;
             }
             
@@ -133,7 +133,7 @@ public String intercept(ActionInvocation invocation) throws Exception {
             }
 
             try {
-                if (this.accessType.equalsIgnoreCase(ReadWriteAccess.READ_WRITE.toString())) {
+                if (accessGiven != null && this.accessType.equalsIgnoreCase(ReadWriteAccess.READ_WRITE.toString())) {
                     long timestamp = Context.now();
                     String apiEndpoint = invocation.getProxy().getActionName();
                     String actionDescription = this.actionDescription == null ? "Error: Description not available" : this.actionDescription;

From 11904330c30c031d127c245f4e6536d928b970db Mon Sep 17 00:00:00 2001
From: Umesh Kumar <166806589+TangoBeeAkto@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:57:37 +0530
Subject: [PATCH 12/19] feat: giving admin_actions read access only to admins

---
 .../com/akto/action/ApiAuditLogsAction.java   |   9 -
 .../interceptor/RoleAccessInterceptor.java    |   5 +-
 apps/dashboard/src/main/resources/struts.xml  | 309 +++++++++---------
 .../pages/settings/audit_logs/AuditLogs.jsx   |   4 +-
 4 files changed, 160 insertions(+), 167 deletions(-)

diff --git a/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java b/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
index 91b5227dc0..7d519cf2a3 100644
--- a/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
@@ -1,9 +1,6 @@
 package com.akto.action;
 
-import com.akto.dao.RBACDao;
 import com.akto.dao.audit_logs.ApiAuditLogsDao;
-import com.akto.dao.context.Context;
-import com.akto.dto.RBAC;
 import com.akto.dto.User;
 import com.akto.dto.audit_logs.ApiAuditLogs;
 import com.mongodb.client.model.Filters;
@@ -25,12 +22,6 @@ public String fetchApiAuditLogsFromDb() {
         User user = getSUser();
         if(user == null) return ERROR.toUpperCase();
 
-        RBAC.Role currentRoleForUser = RBACDao.getCurrentRoleForUser(user.getId(), Context.accountId.get());
-        if(currentRoleForUser == null || !currentRoleForUser.equals(RBAC.Role.ADMIN)) {
-            addActionError("You do not have access to the audit logs.");
-            return ERROR.toUpperCase();
-        }
-
         Bson filters = Filters.and(
                 Filters.gte(ApiAuditLogs.TIMESTAMP, startTimestamp),
                 Filters.lt(ApiAuditLogs.TIMESTAMP, endTimestamp)
diff --git a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
index 3caf577be4..d7eab9c23f 100644
--- a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
+++ b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
@@ -126,7 +126,10 @@ public String intercept(ActionInvocation invocation) throws Exception {
             if(this.accessType.equalsIgnoreCase(ReadWriteAccess.READ.toString()) || (accessGiven != null && this.accessType.equalsIgnoreCase(accessGiven.toString()))){
                 hasRequiredAccess = true;
             }
-            
+            if(featureLabel.equals(Feature.ADMIN_ACTIONS.name())){
+                hasRequiredAccess = userRole.equals(Role.ADMIN.name());
+            }
+
             if(!hasRequiredAccess) {
                 ((ActionSupport) invocation.getAction()).addActionError("The role '" + userRole + "' does not have access.");
                 return FORBIDDEN;
diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
index 8740e9acec..a07346e496 100644
--- a/apps/dashboard/src/main/resources/struts.xml
+++ b/apps/dashboard/src/main/resources/struts.xml
@@ -129,7 +129,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created a new account"</param>
+                <param name="actionDescription">User created a new account</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -307,7 +307,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"Removed a user from Akto"</param>
+                <param name="actionDescription">Removed a user from Akto</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -326,7 +326,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User made another user admin in Akto"</param>
+                <param name="actionDescription">User made another user admin in Akto</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -436,7 +436,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted Github SSO settings"</param>
+                <param name="actionDescription">User deleted Github SSO settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -466,7 +466,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added Github SSO settings"</param>
+                <param name="actionDescription">User added Github SSO settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -517,7 +517,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added Okta SSO settings"</param>
+                <param name="actionDescription">User added Okta SSO settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -547,7 +547,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted Okta SSO settings"</param>
+                <param name="actionDescription">User deleted Okta SSO settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -598,7 +598,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added Azure SSO settings"</param>
+                <param name="actionDescription">User added Azure SSO settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -628,7 +628,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted Azure SSO settings"</param>
+                <param name="actionDescription">User deleted Azure SSO settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -697,7 +697,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added Github App Secret Key"</param>
+                <param name="actionDescription">User added Github App Secret Key</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -719,7 +719,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted Github App Secret Key"</param>
+                <param name="actionDescription">User deleted Github App Secret Key</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1065,7 +1065,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User triaged an API as false positive"</param>
+                <param name="actionDescription">User triaged an API as false positive</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1087,7 +1087,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User invited another user to Akto"</param>
+                <param name="actionDescription">User invited another user to Akto</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1121,7 +1121,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a sensitive field"</param>
+                <param name="actionDescription">User added a sensitive field</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1144,7 +1144,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User bulk marked sensitive fields"</param>
+                <param name="actionDescription">User bulk marked sensitive fields</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1209,7 +1209,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User analyzed API samples for access matrix"</param>
+                <param name="actionDescription">User analyzed API samples for access matrix</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1252,7 +1252,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated an access matrix task"</param>
+                <param name="actionDescription">User updated an access matrix task</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1274,7 +1274,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created multiple access matrix tasks"</param>
+                <param name="actionDescription">User created multiple access matrix tasks</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1295,7 +1295,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted an access matrix"</param>
+                <param name="actionDescription">User deleted an access matrix</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1317,7 +1317,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted an access matrix task"</param>
+                <param name="actionDescription">User deleted an access matrix task</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1339,7 +1339,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User generated an OpenAPI file for a collection"</param>
+                <param name="actionDescription">User generated an OpenAPI file for a collection</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1360,7 +1360,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deactivated collections from inventory"</param>
+                <param name="actionDescription">User deactivated collections from inventory</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1385,7 +1385,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User imported an OpenAPI specification"</param>
+                <param name="actionDescription">User imported an OpenAPI specification</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1413,7 +1413,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User activated collections in inventory"</param>
+                <param name="actionDescription">User activated collections in inventory</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1469,7 +1469,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User imported OpenAPI/Swagger file to Akto"</param>
+                <param name="actionDescription">User imported OpenAPI/Swagger file to Akto</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -1696,7 +1696,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added APIs to a custom collection"</param>
+                <param name="actionDescription">User added APIs to a custom collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1718,7 +1718,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted APIs from a custom collection"</param>
+                <param name="actionDescription">User deleted APIs from a custom collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1740,7 +1740,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User removed APIs from a custom collection"</param>
+                <param name="actionDescription">User removed APIs from a custom collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1762,7 +1762,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User computed custom collections"</param>
+                <param name="actionDescription">User computed custom collections</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1806,7 +1806,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated environment type"</param>
+                <param name="actionDescription">User updated environment type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1827,7 +1827,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User redacted a collection"</param>
+                <param name="actionDescription">User redacted a collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1850,7 +1850,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User uploaded a HAR file"</param>
+                <param name="actionDescription">User uploaded a HAR file</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1880,7 +1880,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User uploaded a TCP file"</param>
+                <param name="actionDescription">User uploaded a TCP file</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1900,7 +1900,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created an empty collection"</param>
+                <param name="actionDescription">User created an empty collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1929,7 +1929,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created a custom collection with API endpoints"</param>
+                <param name="actionDescription">User created a custom collection with API endpoints</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -1951,7 +1951,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated a custom collection"</param>
+                <param name="actionDescription">User updated a custom collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2016,7 +2016,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added/updated Postman credentials"</param>
+                <param name="actionDescription">User added/updated Postman credentials</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2036,7 +2036,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created a Postman API"</param>
+                <param name="actionDescription">User created a Postman API</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2058,7 +2058,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added an API collection via Postman API"</param>
+                <param name="actionDescription">User added an API collection via Postman API</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2153,7 +2153,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User imported Postman data to Akto"</param>
+                <param name="actionDescription">User imported Postman data to Akto</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2181,7 +2181,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a Slack webhook"</param>
+                <param name="actionDescription">User added a Slack webhook</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2209,7 +2209,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted a Slack webhook"</param>
+                <param name="actionDescription">User deleted a Slack webhook</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2232,7 +2232,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added an API token"</param>
+                <param name="actionDescription">User added an API token</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2257,7 +2257,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted an API token"</param>
+                <param name="actionDescription">User deleted an API token</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2364,7 +2364,7 @@
            <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted an API collection"</param>
+                <param name="actionDescription">User deleted an API collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2384,7 +2384,7 @@
            <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted multiple API collections"</param>
+                <param name="actionDescription">User deleted multiple API collections</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2583,7 +2583,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added/updated a sensitive data type"</param>
+                <param name="actionDescription">User added/updated a sensitive data type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2612,7 +2612,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User reset a sensitive data type"</param>
+                <param name="actionDescription">User reset a sensitive data type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2633,7 +2633,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added/updated a sensitive data type"</param>
+                <param name="actionDescription">User added/updated a sensitive data type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2654,7 +2654,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User reset a sensitive data type"</param>
+                <param name="actionDescription">User reset a sensitive data type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2695,7 +2695,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User reset a sensitive data type"</param>
+                <param name="actionDescription">User reset a sensitive data type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2716,7 +2716,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">SENSITIVE_DATA</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the active status of a sensitive data type"</param>
+                <param name="actionDescription">User updated the active status of a sensitive data type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2775,7 +2775,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a custom auth type"</param>
+                <param name="actionDescription">User added a custom auth type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2796,7 +2796,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated a custom auth type"</param>
+                <param name="actionDescription">User updated a custom auth type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2818,7 +2818,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User resets all custom auth types"</param>
+                <param name="actionDescription">User resets all custom auth types</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2839,7 +2839,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">AUTH_TYPE</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the active status of a custom auth type"</param>
+                <param name="actionDescription">User updated the active status of a custom auth type</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -2863,7 +2863,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the sample data redaction status"</param>
+                <param name="actionDescription">User updated the sample data redaction status</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2888,7 +2888,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the merge async status"</param>
+                <param name="actionDescription">User updated the merge async status</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2908,7 +2908,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the global rate limit"</param>
+                <param name="actionDescription">User updated the global rate limit</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2928,7 +2928,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the delta time for ignoring summaries"</param>
+                <param name="actionDescription">User updated the delta time for ignoring summaries</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2964,7 +2964,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the private CIDR IPs"</param>
+                <param name="actionDescription">User updated the private CIDR IPs</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -2988,7 +2988,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User applied access type to a collection"</param>
+                <param name="actionDescription">User applied access type to a collection</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -3009,7 +3009,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the partner IPs"</param>
+                <param name="actionDescription">User updated the partner IPs</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3033,7 +3033,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TAGS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added/updated a tag config"</param>
+                <param name="actionDescription">User added/updated a tag config</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3055,7 +3055,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TAGS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User reviewed a tag config"</param>
+                <param name="actionDescription">User reviewed a tag config</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3077,7 +3077,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TAGS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the active status of a tag config"</param>
+                <param name="actionDescription">User updated the active status of a tag config</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3099,7 +3099,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User successfully updated Akto via instance refresh"</param>
+                <param name="actionDescription">User successfully updated Akto via instance refresh</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3123,7 +3123,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User started a test run"</param>
+                <param name="actionDescription">User started a test run</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3259,7 +3259,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User toggled a collection for testing"</param>
+                <param name="actionDescription">User toggled a collection for testing</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3281,7 +3281,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added an auth mechanism"</param>
+                <param name="actionDescription">User added an auth mechanism</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3311,7 +3311,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User triggered login steps"</param>
+                <param name="actionDescription">User triggered login steps</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3494,7 +3494,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the setup (Production/Staging/QA/Development) type"</param>
+                <param name="actionDescription">User updated the setup (Production/Staging/QA/Development) type</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3516,7 +3516,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the regex matching in merging status"</param>
+                <param name="actionDescription">User updated the regex matching in merging status</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3538,7 +3538,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the telemetry status"</param>
+                <param name="actionDescription">User updated the telemetry status</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3560,7 +3560,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">DEFAULT_PAYLOADS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the redundant URL settings"</param>
+                <param name="actionDescription">User updated the redundant URL settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3736,7 +3736,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created a test role"</param>
+                <param name="actionDescription">User created a test role</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3758,7 +3758,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted a test role"</param>
+                <param name="actionDescription">User deleted a test role</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3780,7 +3780,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated a test role"</param>
+                <param name="actionDescription">User updated a test role</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3802,7 +3802,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted an auth mechanism from a test role"</param>
+                <param name="actionDescription">User deleted an auth mechanism from a test role</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3824,7 +3824,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated an auth mechanism in a test role"</param>
+                <param name="actionDescription">User updated an auth mechanism in a test role</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3846,7 +3846,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_ROLES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added an auth mechanism to a test role"</param>
+                <param name="actionDescription">User added an auth mechanism to a test role</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3925,7 +3925,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the status of an issue"</param>
+                <param name="actionDescription">User updated the status of an issue</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3945,7 +3945,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User bulk updated the status of issues"</param>
+                <param name="actionDescription">User bulk updated the status of issues</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3965,7 +3965,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created a workflow test"</param>
+                <param name="actionDescription">User created a workflow test</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -3986,7 +3986,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User edited a workflow test"</param>
+                <param name="actionDescription">User edited a workflow test</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4007,7 +4007,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User set the state of a workflow test"</param>
+                <param name="actionDescription">User set the state of a workflow test</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4028,7 +4028,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User exported a workflow test as a string"</param>
+                <param name="actionDescription">User exported a workflow test as a string</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4049,7 +4049,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User edited the details of a workflow node"</param>
+                <param name="actionDescription">User edited the details of a workflow node</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4111,7 +4111,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User fetched OTPs"</param>
+                <param name="actionDescription">User fetched OTPs</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4133,7 +4133,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User sent OTPs"</param>
+                <param name="actionDescription">User sent OTPs</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4218,7 +4218,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User imported collection data in Burp"</param>
+                <param name="actionDescription">User imported collection data in Burp</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4243,7 +4243,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a custom webhook"</param>
+                <param name="actionDescription">User added a custom webhook</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4270,7 +4270,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted scheduled workflow tests"</param>
+                <param name="actionDescription">User deleted scheduled workflow tests</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4315,7 +4315,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated a custom webhook"</param>
+                <param name="actionDescription">User updated a custom webhook</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4363,7 +4363,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted test runs"</param>
+                <param name="actionDescription">User deleted test runs</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4385,7 +4385,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted test runs from summaries"</param>
+                <param name="actionDescription">User deleted test runs from summaries</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4428,7 +4428,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_RESULTS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User downloaded workflow as JSON"</param>
+                <param name="actionDescription">User downloaded workflow as JSON</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4450,7 +4450,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User changed the status of a webhook"</param>
+                <param name="actionDescription">User changed the status of a webhook</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4475,7 +4475,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User ran a webhook once"</param>
+                <param name="actionDescription">User ran a webhook once</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4514,7 +4514,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User stopped all tests"</param>
+                <param name="actionDescription">User stopped all tests</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4536,7 +4536,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">START_TEST_RUN</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User stopped a test"</param>
+                <param name="actionDescription">User stopped a test</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4726,7 +4726,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the load balancer details"</param>
+                <param name="actionDescription">User updated the load balancer details</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4802,7 +4802,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created a runtime stack"</param>
+                <param name="actionDescription">User created a runtime stack</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4855,7 +4855,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User saved OTP data"</param>
+                <param name="actionDescription">User saved OTP data</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -4900,7 +4900,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User triggered a login step in user config"</param>
+                <param name="actionDescription">User triggered a login step in user config</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5027,7 +5027,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_CONFIG</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User uploaded a recorded flow in user config"</param>
+                <param name="actionDescription">User uploaded a recorded flow in user config</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5093,7 +5093,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the Akto UI mode"</param>
+                <param name="actionDescription">User updated the Akto UI mode</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5161,7 +5161,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User ran onboarding tests"</param>
+                <param name="actionDescription">User ran onboarding tests</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5205,8 +5205,7 @@
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
-                <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User skipped onboarding"</param>
+                <param name="accessType">READ</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5230,7 +5229,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ASK_GPT</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User asked a question via AktoGPT"</param>
+                <param name="actionDescription">User asked a question via AktoGPT</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5281,7 +5280,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ASK_GPT</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated AktoGPT config"</param>
+                <param name="actionDescription">User updated AktoGPT config</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5369,7 +5368,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User imported collection data using postman file"</param>
+                <param name="actionDescription">User imported collection data using postman file</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5399,7 +5398,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User imported collection data using postman file"</param>
+                <param name="actionDescription">User imported collection data using postman file</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5458,7 +5457,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted postman import logs"</param>
+                <param name="actionDescription">User deleted postman import logs</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5511,7 +5510,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User closed a loader"</param>
+                <param name="actionDescription">User closed a loader</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5533,7 +5532,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_EDITOR</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User set a test inactive in test editor"</param>
+                <param name="actionDescription">User set a test inactive in test editor</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5555,7 +5554,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">EXTERNAL_TEST_LIBRARY</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a new test library"</param>
+                <param name="actionDescription">User added a new test library</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5577,7 +5576,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">EXTERNAL_TEST_LIBRARY</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User removed a test library"</param>
+                <param name="actionDescription">User removed a test library</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5599,7 +5598,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">EXTERNAL_TEST_LIBRARY</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User synced a custom test library"</param>
+                <param name="actionDescription">User synced a custom test library</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5644,7 +5643,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_EDITOR</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User saved a Akto test editor file"</param>
+                <param name="actionDescription">User saved a Akto test editor file</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5667,7 +5666,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User toggled debug logs feature in settings"</param>
+                <param name="actionDescription">User toggled debug logs feature in settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5689,7 +5688,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a filter header value map"</param>
+                <param name="actionDescription">User added a filter header value map</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5711,7 +5710,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added an API collection name mapper"</param>
+                <param name="actionDescription">User added an API collection name mapper</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5732,7 +5731,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted an API collection name mapper"</param>
+                <param name="actionDescription">User deleted an API collection name mapper</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5754,7 +5753,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TEST_EDITOR</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User ran a test for a given template in test editor"</param>
+                <param name="actionDescription">User ran a test for a given template in test editor</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5830,7 +5829,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated the traffic alert threshold seconds in settings"</param>
+                <param name="actionDescription">User updated the traffic alert threshold seconds in settings</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5852,7 +5851,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User de-merged an API"</param>
+                <param name="actionDescription">User de-merged an API</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5886,7 +5885,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User tested Jira integration"</param>
+                <param name="actionDescription">User tested Jira integration</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5918,7 +5917,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a Jira integration"</param>
+                <param name="actionDescription">User added a Jira integration</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5969,7 +5968,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User created a Jira issue"</param>
+                <param name="actionDescription">User created a Jira issue</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -5991,7 +5990,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ISSUES</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User attached a file to a Jira issue"</param>
+                <param name="actionDescription">User attached a file to a Jira issue</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6114,7 +6113,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User marked a connection as skipped"</param>
+                <param name="actionDescription">User marked a connection as skipped</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6134,7 +6133,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated their username and organization name"</param>
+                <param name="actionDescription">User updated their username and organization name</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6154,7 +6153,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User provisioned a subscription"</param>
+                <param name="actionDescription">User provisioned a subscription</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6178,7 +6177,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User synced usage data"</param>
+                <param name="actionDescription">User synced usage data</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6202,7 +6201,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User synced with Akto usage data"</param>
+                <param name="actionDescription">User synced with Akto usage data</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6247,7 +6246,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">BILLING</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User refreshed usage data for an organization"</param>
+                <param name="actionDescription">User refreshed usage data for an organization</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6313,7 +6312,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">DEFAULT_PAYLOADS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User saved a default payload"</param>
+                <param name="actionDescription">User saved a default payload</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6335,7 +6334,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User built a dependency table"</param>
+                <param name="actionDescription">User built a dependency table</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6358,7 +6357,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User invoked a dependency table"</param>
+                <param name="actionDescription">User invoked a dependency table</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6380,7 +6379,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User saved replace details"</param>
+                <param name="actionDescription">User saved replace details</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6402,7 +6401,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User saved global variables"</param>
+                <param name="actionDescription">User saved global variables</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6508,7 +6507,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">API_COLLECTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User synced extracted APIs from source code"</param>
+                <param name="actionDescription">User synced extracted APIs from source code</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6596,7 +6595,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">TRAFFIC_FILTERS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User marked an alert as dismissed"</param>
+                <param name="actionDescription">User marked an alert as dismissed</param>
             </interceptor-ref>
 
             <result name="FORBIDDEN" type="json">
@@ -6642,7 +6641,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated a script"</param>
+                <param name="actionDescription">User updated a script</param>
             </interceptor-ref>
             <interceptor-ref name="usageInterceptor">
                 <param name="featureLabel">TEST_PRE_SCRIPT</param>
@@ -6691,7 +6690,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a script"</param>
+                <param name="actionDescription">User added a script</param>
             </interceptor-ref>
             <interceptor-ref name="usageInterceptor">
                 <param name="featureLabel">TEST_PRE_SCRIPT</param>
@@ -6720,7 +6719,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added a code analysis repo"</param>
+                <param name="actionDescription">User added a code analysis repo</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6743,7 +6742,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">INTEGRATIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted a code analysis repo"</param>
+                <param name="actionDescription">User deleted a code analysis repo</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6827,7 +6826,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User saved a filter in YAML template"</param>
+                <param name="actionDescription">User saved a filter in YAML template</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6903,7 +6902,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User added advanced filters for traffic analysis"</param>
+                <param name="actionDescription">User added advanced filters for traffic analysis</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -6985,7 +6984,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User deleted an advanced filter for traffic analysis"</param>
+                <param name="actionDescription">User deleted an advanced filter for traffic analysis</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -7007,7 +7006,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User changed the state of an advanced filter for traffic analysis"</param>
+                <param name="actionDescription">User changed the state of an advanced filter for traffic analysis</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -7089,7 +7088,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User updated retrospective filter settings"</param>
+                <param name="actionDescription">User updated retrospective filter settings</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
@@ -7133,7 +7132,7 @@
             <interceptor-ref name="roleAccessInterceptor">
                 <param name="featureLabel">ADMIN_ACTIONS</param>
                 <param name="accessType">READ_WRITE</param>
-                <param name="actionDescription">"User modified account settings"</param>
+                <param name="actionDescription">User modified account settings</param>
             </interceptor-ref>
             <result name="FORBIDDEN" type="json">
                 <param name="statusCode">403</param>
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
index 879c99a126..56ac646995 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
@@ -84,10 +84,10 @@ const AuditLogs = () => {
                 return {
                     ...item,
                     apiEndpoint: func.formatEndpoint(apiEndpoint),
-                    actionDescription: <Box width='250px'><p style={{whiteSpace: 'pre-wrap'}}>{actionDescription}</p></Box>,
+                    actionDescription: <Text>{actionDescription}</Text>,
                     timestamp: func.prettifyEpoch(timestamp),
                     rawTimestamp: timestamp,
-                    userAgent: <Box width='fit-content'><p style={{whiteSpace: 'pre-wrap'}}>{userAgent}</p></Box>,
+                    userAgent: <Text>{userAgent}</Text>,
                     rawUserAgent: userAgent
                 }
             })

From 19f5a55847218ae828cc1cd5a9f3a1f6e3ec9d4b Mon Sep 17 00:00:00 2001
From: Umesh Kumar <166806589+TangoBeeAkto@users.noreply.github.com>
Date: Mon, 21 Oct 2024 13:17:39 +0530
Subject: [PATCH 13/19] feat: showing search box on audit logs page by default

---
 .../src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
index 56ac646995..c616f000ff 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
@@ -144,7 +144,7 @@ const AuditLogs = () => {
             useNewRow={true}
             condensedHeight={true}
             disambiguateLabel={disambiguateLabel}
-            mode={IndexFiltersMode.Default}
+            mode={IndexFiltersMode.Filtering}
             onRowClick={(data) => {}}
             showFooter={false}
             loading={tableLoading}

From a1b9a20ef9e79cfd3f5fb181da9bdcde9e742376 Mon Sep 17 00:00:00 2001
From: Umesh Kumar <166806589+TangoBeeAkto@users.noreply.github.com>
Date: Mon, 21 Oct 2024 13:29:10 +0530
Subject: [PATCH 14/19] fix: fetching issues by status only if we have
 testingRunSummaryId

---
 .../testing/vulnerability_report/VulnerabilityReport.jsx    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/vulnerability_report/VulnerabilityReport.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/vulnerability_report/VulnerabilityReport.jsx
index a691dfdccf..33c1c1cb98 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/vulnerability_report/VulnerabilityReport.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/vulnerability_report/VulnerabilityReport.jsx
@@ -187,11 +187,11 @@ function VulnerabilityReport() {
         let vulnerableTestingRunResults = []
         //let sampleDataVsCurlMap = {}
         let allIgnoredTestingRunIssues = []
-        await api.fetchIssuesByStatusAndSummaryId(testingRunSummaryId, ["IGNORED", "FIXED"]).then((issues) => {
-            allIgnoredTestingRunIssues = issues
-        })
 
         if (testingRunSummaryId) {
+            await api.fetchIssuesByStatusAndSummaryId(testingRunSummaryId, ["IGNORED", "FIXED"]).then((issues) => {
+                allIgnoredTestingRunIssues = issues
+            })
             while (true) {
                 let testingRunCountsFromDB = 0
                 await api.fetchVulnerableTestingRunResults(testingRunSummaryId, resultsCount).then((resp) => {

From 371698ada73bd405c8aa7c7f0093218184a07262 Mon Sep 17 00:00:00 2001
From: Umesh Kumar <166806589+TangoBeeAkto@users.noreply.github.com>
Date: Mon, 21 Oct 2024 14:10:33 +0530
Subject: [PATCH 15/19] fix: not calling admin_actions api if user is not admin

---
 apps/dashboard/src/main/resources/struts.xml       |  2 +-
 .../apps/dashboard/pages/settings/about/About.jsx  |  4 +++-
 .../pages/settings/test_library/TestLibrary.jsx    |  4 +++-
 .../pages/testing/user_config/UserConfig.jsx       | 14 ++++++++------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
index a07346e496..b7a249ebb5 100644
--- a/apps/dashboard/src/main/resources/struts.xml
+++ b/apps/dashboard/src/main/resources/struts.xml
@@ -4556,7 +4556,7 @@
             <interceptor-ref name="json"/>
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
-                <param name="featureLabel">ADMIN_ACTIONS</param>
+                <param name="featureLabel">USER_ACTIONS</param>
                 <param name="accessType">READ</param>
             </interceptor-ref>
 
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/about/About.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/about/About.jsx
index df366c5807..f0cb31b069 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/about/About.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/about/About.jsx
@@ -72,7 +72,9 @@ function About() {
     }
 
     useEffect(()=>{
-        fetchDetails()
+        if(window.USER_ROLE === 'ADMIN') {
+            fetchDetails()
+        }
     },[])
 
     function TitleComponent ({title,description}) {
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/test_library/TestLibrary.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/test_library/TestLibrary.jsx
index 0124d945bd..1c20010a95 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/test_library/TestLibrary.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/test_library/TestLibrary.jsx
@@ -37,7 +37,9 @@ function TestLibrary() {
     }
 
     useEffect(() => {
-        fetchData();
+        if(window.USER_ROLE === 'ADMIN') {
+            fetchData();
+        }
     }, [])
 
     async function handleRemoveTestLibrary(repositoryUrl) {
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx
index b7d6810b15..d31aa4a826 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx
@@ -41,12 +41,14 @@ function UserConfig() {
             else setHardcodedOpen(false)
         }
 
-        await settingRequests.fetchAdminSettings().then((resp)=> {
-            setInitialLimit(resp.accountSettings.globalRateLimit);
-            const val = resp?.accountSettings?.timeForScheduledSummaries === undefined || resp?.accountSettings?.timeForScheduledSummaries === 0 ? (120*60) : resp?.accountSettings?.timeForScheduledSummaries
-            setInitialDeltaTime(val/60)
-            LocalStore.getState().setDefaultIgnoreSummaryTime(val)
-        })
+        if(window.USER_ROLE === 'ADMIN') {
+            await settingRequests.fetchAdminSettings().then((resp)=> {
+                setInitialLimit(resp.accountSettings.globalRateLimit);
+                const val = resp?.accountSettings?.timeForScheduledSummaries === undefined || resp?.accountSettings?.timeForScheduledSummaries === 0 ? (120*60) : resp?.accountSettings?.timeForScheduledSummaries
+                setInitialDeltaTime(val/60)
+                LocalStore.getState().setDefaultIgnoreSummaryTime(val)
+            })
+        }
 
         await api.fetchScript().then((resp)=> {
             if (resp) { 

From 4fd34eb1a5164b6f3f4ebee7cd8e87861b99b335 Mon Sep 17 00:00:00 2001
From: Umesh Kumar <166806589+TangoBeeAkto@users.noreply.github.com>
Date: Mon, 21 Oct 2024 14:35:40 +0530
Subject: [PATCH 16/19] feat: showing user agent client type in audit logs

---
 .../interceptor/RoleAccessInterceptor.java    |  3 +-
 .../akto/audit_logs_util/AuditLogsUtil.java   | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
index d7eab9c23f..e2a11309c4 100644
--- a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
+++ b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
@@ -142,10 +142,11 @@ public String intercept(ActionInvocation invocation) throws Exception {
                     String actionDescription = this.actionDescription == null ? "Error: Description not available" : this.actionDescription;
                     String userEmail = user.getLogin();
                     String userAgent = request.getHeader("User-Agent") == null ? "Unknown User-Agent" : request.getHeader("User-Agent");
+                    AuditLogsUtil.ClientType userAgentType = AuditLogsUtil.findUserAgentType(userAgent);
                     List<String> userProxyIpAddresses = AuditLogsUtil.getClientIpAddresses(request);
                     String userIpAddress = userProxyIpAddresses.get(0);
 
-                    apiAuditLogs = new ApiAuditLogs(timestamp, apiEndpoint, actionDescription, userEmail, userAgent, userIpAddress, userProxyIpAddresses);
+                    apiAuditLogs = new ApiAuditLogs(timestamp, apiEndpoint, actionDescription, userEmail, userAgentType.name(), userIpAddress, userProxyIpAddresses);
                 }
             } catch(Exception e) {
                 loggerMaker.errorAndAddToDb(e, "Error while inserting api audit logs: " + e.getMessage(), LogDb.DASHBOARD);
diff --git a/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
index 7633524ffd..bdee4e6fc8 100644
--- a/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
+++ b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
@@ -1,12 +1,47 @@
 package com.akto.audit_logs_util;
 
+import com.akto.util.Pair;
+
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 
 public class AuditLogsUtil {
+
+    public enum ClientType {
+        JAVA, NODE, GOLANG, CPP, PYTHON, MOBILE, BROWSER, CLOUDFLARE, POSTMAN, CURL, CUSTOM
+    }
+    private static final List<Pair<Pattern, ClientType>> CLIENT_PATTERNS = new ArrayList<>();
+    static {
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("android|iPhone|iPad"), ClientType.MOBILE));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Mozilla|Chrome|Safari|Firefox|Edg|AppleWebKit"), ClientType.BROWSER));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("PostmanRuntime"), ClientType.POSTMAN));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("curl"), ClientType.CURL));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Apache-HttpClient|okhttp|unirest-java|Java"), ClientType.JAVA));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("node-fetch|axios|got|node"), ClientType.NODE));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Go-http-client|golang"), ClientType.GOLANG));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("C\\+\\+|cpprestsdk"), ClientType.CPP));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("python-requests|urllib3"), ClientType.PYTHON));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Cloudflare-Traffic-Manager"), ClientType.CLOUDFLARE));
+    }
+
+    public static ClientType findUserAgentType(String userAgentValue) {
+        if (userAgentValue == null || userAgentValue.isEmpty()) {
+            return ClientType.CUSTOM;
+        }
+
+        for (Pair<Pattern, ClientType> entry : CLIENT_PATTERNS) {
+            if (entry.getFirst().matcher(userAgentValue).find()) {
+                return entry.getSecond();
+            }
+        }
+
+        return ClientType.CUSTOM;
+    }
+
     public static List<String> getClientIpAddresses(HttpServletRequest request) {
         List<String> headers = Arrays.asList(
                 "X-Forwarded-For",

From cacc94616df412e9e14de16c1d24fe1e646d8569 Mon Sep 17 00:00:00 2001
From: Umesh Kumar <166806589+TangoBeeAkto@users.noreply.github.com>
Date: Mon, 21 Oct 2024 15:07:13 +0530
Subject: [PATCH 17/19] feat: code clean up

---
 .../{ => settings}/ApiAuditLogsAction.java    |  3 +-
 .../interceptor/RoleAccessInterceptor.java    |  7 +--
 apps/dashboard/src/main/resources/struts.xml  |  2 +-
 .../components/layouts/DateRangeFilter.jsx    |  1 -
 .../pages/settings/audit_logs/AuditLogs.jsx   |  8 ++--
 .../akto/audit_logs_util/AuditLogsUtil.java   | 45 +------------------
 .../runtime/policies/ApiAccessTypePolicy.java |  2 +-
 .../runtime/policies/UserAgentTypePolicy.java | 41 +++++++++++++++++
 8 files changed, 55 insertions(+), 54 deletions(-)
 rename apps/dashboard/src/main/java/com/akto/action/{ => settings}/ApiAuditLogsAction.java (96%)
 create mode 100644 libs/utils/src/main/java/com/akto/runtime/policies/UserAgentTypePolicy.java

diff --git a/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java b/apps/dashboard/src/main/java/com/akto/action/settings/ApiAuditLogsAction.java
similarity index 96%
rename from apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
rename to apps/dashboard/src/main/java/com/akto/action/settings/ApiAuditLogsAction.java
index 7d519cf2a3..7fe71ae395 100644
--- a/apps/dashboard/src/main/java/com/akto/action/ApiAuditLogsAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/settings/ApiAuditLogsAction.java
@@ -1,5 +1,6 @@
-package com.akto.action;
+package com.akto.action.settings;
 
+import com.akto.action.UserAction;
 import com.akto.dao.audit_logs.ApiAuditLogsDao;
 import com.akto.dto.User;
 import com.akto.dto.audit_logs.ApiAuditLogs;
diff --git a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
index e2a11309c4..31636c8be1 100644
--- a/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
+++ b/apps/dashboard/src/main/java/com/akto/interceptor/RoleAccessInterceptor.java
@@ -16,6 +16,7 @@
 import com.akto.filter.UserDetailsFilter;
 import com.akto.log.LoggerMaker;
 import com.akto.log.LoggerMaker.LogDb;
+import com.akto.runtime.policies.UserAgentTypePolicy;
 import com.akto.util.DashboardMode;
 import com.mongodb.client.model.Filters;
 import com.opensymphony.xwork2.Action;
@@ -123,7 +124,7 @@ public String intercept(ActionInvocation invocation) throws Exception {
             ReadWriteAccess accessGiven = userRoleRecord.getReadWriteAccessForFeature(featureType);
             boolean hasRequiredAccess = false;
 
-            if(this.accessType.equalsIgnoreCase(ReadWriteAccess.READ.toString()) || (accessGiven != null && this.accessType.equalsIgnoreCase(accessGiven.toString()))){
+            if(this.accessType.equalsIgnoreCase(ReadWriteAccess.READ.toString()) || this.accessType.equalsIgnoreCase(accessGiven.toString())){
                 hasRequiredAccess = true;
             }
             if(featureLabel.equals(Feature.ADMIN_ACTIONS.name())){
@@ -136,13 +137,13 @@ public String intercept(ActionInvocation invocation) throws Exception {
             }
 
             try {
-                if (accessGiven != null && this.accessType.equalsIgnoreCase(ReadWriteAccess.READ_WRITE.toString())) {
+                if (this.accessType.equalsIgnoreCase(ReadWriteAccess.READ_WRITE.toString())) {
                     long timestamp = Context.now();
                     String apiEndpoint = invocation.getProxy().getActionName();
                     String actionDescription = this.actionDescription == null ? "Error: Description not available" : this.actionDescription;
                     String userEmail = user.getLogin();
                     String userAgent = request.getHeader("User-Agent") == null ? "Unknown User-Agent" : request.getHeader("User-Agent");
-                    AuditLogsUtil.ClientType userAgentType = AuditLogsUtil.findUserAgentType(userAgent);
+                    UserAgentTypePolicy.ClientType userAgentType = UserAgentTypePolicy.findUserAgentType(userAgent);
                     List<String> userProxyIpAddresses = AuditLogsUtil.getClientIpAddresses(request);
                     String userIpAddress = userProxyIpAddresses.get(0);
 
diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
index b7a249ebb5..1c870344e6 100644
--- a/apps/dashboard/src/main/resources/struts.xml
+++ b/apps/dashboard/src/main/resources/struts.xml
@@ -7169,7 +7169,7 @@
             </result>
         </action>
 
-        <action name="api/fetchApiAuditLogsFromDb" class="com.akto.action.ApiAuditLogsAction" method="fetchApiAuditLogsFromDb">
+        <action name="api/fetchApiAuditLogsFromDb" class="com.akto.action.settings.ApiAuditLogsAction" method="fetchApiAuditLogsFromDb">
             <interceptor-ref name="json"/>
             <interceptor-ref name="defaultStack" />
             <interceptor-ref name="roleAccessInterceptor">
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx
index c2e72b56ff..8c10fd366a 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx
@@ -25,7 +25,6 @@ function DateRangeFilter(props){
         fullHeight
         activator={
           <Button
-            disabled={props?.disabled}
             icon={CalendarMinor}
             onClick={() => setPopoverActive(!popoverActive)}
           >
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
index c616f000ff..305521cc7c 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/audit_logs/AuditLogs.jsx
@@ -1,4 +1,4 @@
-import { Box, Button, IndexFiltersMode, Text } from '@shopify/polaris'
+import { Badge, Button, IndexFiltersMode, Text } from '@shopify/polaris'
 import React, { useEffect, useReducer, useState } from 'react'
 import settingRequests from '../api'
 import func from '@/util/func'
@@ -87,7 +87,7 @@ const AuditLogs = () => {
                     actionDescription: <Text>{actionDescription}</Text>,
                     timestamp: func.prettifyEpoch(timestamp),
                     rawTimestamp: timestamp,
-                    userAgent: <Text>{userAgent}</Text>,
+                    userAgent: <Badge>{func.toSentenceCase(userAgent)}</Badge>,
                     rawUserAgent: userAgent
                 }
             })
@@ -158,8 +158,8 @@ const AuditLogs = () => {
                     titleText={"Audit logs"} 
                 />
             }
-            primaryAction={<Button disabled={window.USER_ROLE !== "ADMIN"} loading={loading} primary onClick={exportAuditLogsCSV}>Export as CSV</Button>}
-            secondaryActions={<DateRangeFilter disabled={window.USER_ROLE !== "ADMIN"} initialDispatch={currDateRange} dispatch={(dateObj) => dispatchCurrDateRange({ type: "update", period: dateObj.period, title: dateObj.title, alias: dateObj.alias })} />}
+            primaryAction={<Button loading={loading} primary onClick={exportAuditLogsCSV}>Export as CSV</Button>}
+            secondaryActions={<DateRangeFilter initialDispatch={currDateRange} dispatch={(dateObj) => dispatchCurrDateRange({ type: "update", period: dateObj.period, title: dateObj.title, alias: dateObj.alias })} />}
             isFirstPage={true}
             components={[auditLogsTable]}
         />
diff --git a/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
index bdee4e6fc8..3331a4b432 100644
--- a/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
+++ b/libs/utils/src/main/java/com/akto/audit_logs_util/AuditLogsUtil.java
@@ -1,56 +1,15 @@
 package com.akto.audit_logs_util;
 
-import com.akto.util.Pair;
-
+import com.akto.runtime.policies.ApiAccessTypePolicy;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.regex.Pattern;
 
 public class AuditLogsUtil {
 
-    public enum ClientType {
-        JAVA, NODE, GOLANG, CPP, PYTHON, MOBILE, BROWSER, CLOUDFLARE, POSTMAN, CURL, CUSTOM
-    }
-    private static final List<Pair<Pattern, ClientType>> CLIENT_PATTERNS = new ArrayList<>();
-    static {
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("android|iPhone|iPad"), ClientType.MOBILE));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Mozilla|Chrome|Safari|Firefox|Edg|AppleWebKit"), ClientType.BROWSER));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("PostmanRuntime"), ClientType.POSTMAN));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("curl"), ClientType.CURL));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Apache-HttpClient|okhttp|unirest-java|Java"), ClientType.JAVA));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("node-fetch|axios|got|node"), ClientType.NODE));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Go-http-client|golang"), ClientType.GOLANG));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("C\\+\\+|cpprestsdk"), ClientType.CPP));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("python-requests|urllib3"), ClientType.PYTHON));
-        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Cloudflare-Traffic-Manager"), ClientType.CLOUDFLARE));
-    }
-
-    public static ClientType findUserAgentType(String userAgentValue) {
-        if (userAgentValue == null || userAgentValue.isEmpty()) {
-            return ClientType.CUSTOM;
-        }
-
-        for (Pair<Pattern, ClientType> entry : CLIENT_PATTERNS) {
-            if (entry.getFirst().matcher(userAgentValue).find()) {
-                return entry.getSecond();
-            }
-        }
-
-        return ClientType.CUSTOM;
-    }
-
     public static List<String> getClientIpAddresses(HttpServletRequest request) {
-        List<String> headers = Arrays.asList(
-                "X-Forwarded-For",
-                "X-Real-IP",
-                "Proxy-Client-IP",
-                "WL-Proxy-Client-IP",
-                "HTTP_CLIENT_IP",
-                "HTTP_X_FORWARDED_FOR"
-        );
+        List<String> headers = ApiAccessTypePolicy.CLIENT_IP_HEADERS;
 
         List<String> ipAddresses = new ArrayList<>();
 
diff --git a/libs/utils/src/main/java/com/akto/runtime/policies/ApiAccessTypePolicy.java b/libs/utils/src/main/java/com/akto/runtime/policies/ApiAccessTypePolicy.java
index cd6d06caa9..7eea8633fc 100644
--- a/libs/utils/src/main/java/com/akto/runtime/policies/ApiAccessTypePolicy.java
+++ b/libs/utils/src/main/java/com/akto/runtime/policies/ApiAccessTypePolicy.java
@@ -47,7 +47,7 @@ public ApiAccessTypePolicy(List<String> privateCidrList) {
      */
     );
 
-    static final private List<String> CLIENT_IP_HEADERS = Arrays.asList(
+    static final public List<String> CLIENT_IP_HEADERS = Arrays.asList(
             "x-forwarded-for",
             "x-real-ip",
             "x-cluster-client-ip",
diff --git a/libs/utils/src/main/java/com/akto/runtime/policies/UserAgentTypePolicy.java b/libs/utils/src/main/java/com/akto/runtime/policies/UserAgentTypePolicy.java
new file mode 100644
index 0000000000..92833dbb9b
--- /dev/null
+++ b/libs/utils/src/main/java/com/akto/runtime/policies/UserAgentTypePolicy.java
@@ -0,0 +1,41 @@
+package com.akto.runtime.policies;
+
+import com.akto.util.Pair;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class UserAgentTypePolicy {
+
+    public enum ClientType {
+        JAVA, NODE, GOLANG, CPP, PYTHON, MOBILE, BROWSER, CLOUDFLARE, POSTMAN, CURL, CUSTOM
+    }
+    private static final List<Pair<Pattern, ClientType>> CLIENT_PATTERNS = new ArrayList<>();
+    static {
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("android|iPhone|iPad"), ClientType.MOBILE));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Mozilla|Chrome|Safari|Firefox|Edg|AppleWebKit"), ClientType.BROWSER));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("PostmanRuntime"), ClientType.POSTMAN));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("curl"), ClientType.CURL));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Apache-HttpClient|okhttp|unirest-java|Java"), ClientType.JAVA));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("node-fetch|axios|got|node"), ClientType.NODE));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Go-http-client|golang"), ClientType.GOLANG));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("C\\+\\+|cpprestsdk"), ClientType.CPP));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("python-requests|urllib3"), ClientType.PYTHON));
+        CLIENT_PATTERNS.add(new Pair<>(Pattern.compile("Cloudflare-Traffic-Manager"), ClientType.CLOUDFLARE));
+    }
+
+    public static ClientType findUserAgentType(String userAgentValue) {
+        if (userAgentValue == null || userAgentValue.isEmpty()) {
+            return ClientType.CUSTOM;
+        }
+
+        for (Pair<Pattern, ClientType> entry : CLIENT_PATTERNS) {
+            if (entry.getFirst().matcher(userAgentValue).find()) {
+                return entry.getSecond();
+            }
+        }
+
+        return ClientType.CUSTOM;
+    }
+}

From e45766985e518f08284d3afa2a15c4b83e5cc829 Mon Sep 17 00:00:00 2001
From: Ark2307 <kr.aryan2307@gmail.com>
Date: Mon, 21 Oct 2024 15:17:10 +0530
Subject: [PATCH 18/19] Fixing api audit logs dao

---
 .../com/akto/dao/audit_logs/ApiAuditLogsDao.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
index 4a88eea9d4..3fa068a57a 100644
--- a/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
+++ b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
@@ -2,6 +2,7 @@
 
 import com.akto.dao.AccountsContextDao;
 import com.akto.dao.MCollection;
+import com.akto.dao.context.Context;
 import com.akto.dto.audit_logs.ApiAuditLogs;
 
 public class ApiAuditLogsDao extends AccountsContextDao<ApiAuditLogs> {
@@ -11,8 +12,23 @@ public class ApiAuditLogsDao extends AccountsContextDao<ApiAuditLogs> {
     private ApiAuditLogsDao() {}
 
     public void createIndicesIfAbsent() {
+
+        boolean exists = false;
+        for (String col: clients[0].getDatabase(Context.accountId.get()+"").listCollectionNames()){
+            if (getCollName().equalsIgnoreCase(col)){
+                exists = true;
+                break;
+            }
+        };
+
+        if (!exists) {
+            clients[0].getDatabase(Context.accountId.get()+"").createCollection(getCollName());
+        }
+
         String[] fieldNames = { ApiAuditLogs.TIMESTAMP };
         MCollection.createIndexIfAbsent(getDBName(), getCollName(), fieldNames, true);
+
+        fieldNames = new String[]{ApiAuditLogs.USER_EMAIL, ApiAuditLogs.USER_IP_ADDRESS};
     }
 
     @Override

From f184238636d139354c4db1788cae06a0bb21bf44 Mon Sep 17 00:00:00 2001
From: Aryan Khandelwal <60040654+Ark2307@users.noreply.github.com>
Date: Mon, 21 Oct 2024 15:29:27 +0530
Subject: [PATCH 19/19] Update ApiAuditLogsDao.java

---
 .../src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
index 3fa068a57a..85e3917c38 100644
--- a/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
+++ b/libs/dao/src/main/java/com/akto/dao/audit_logs/ApiAuditLogsDao.java
@@ -28,7 +28,8 @@ public void createIndicesIfAbsent() {
         String[] fieldNames = { ApiAuditLogs.TIMESTAMP };
         MCollection.createIndexIfAbsent(getDBName(), getCollName(), fieldNames, true);
 
-        fieldNames = new String[]{ApiAuditLogs.USER_EMAIL, ApiAuditLogs.USER_IP_ADDRESS};
+        fieldNames = new String[]{ApiAuditLogs.USER_EMAIL, ApiAuditLogs.USER_IP_ADDRESS, ApiAuditLogs.TIMESTAMP};
+        MCollection.createIndexIfAbsent(getDBName(), getCollName(), fieldNames, true);
     }
 
     @Override