Server side pagination for user audit logs api

deepfence_server/apiDocs/operation.go

@@ -735,9 +735,12 @@ func (d *OpenApiDocs) AddSettingsOperations() {
 	d.AddOperation("updateSetting", http.MethodPatch, "/deepfence/settings/global-settings/{id}",
 		"Update setting", "Update setting",
 		http.StatusNoContent, []string{tagSettings}, bearerToken, new(SettingUpdateRequest), nil)
-	d.AddOperation("getUserActivityLogs", http.MethodGet, "/deepfence/settings/user-activity-log",
-		"Get activity logs", "Get activity logs for all users",
-		http.StatusOK, []string{tagSettings}, bearerToken, nil, new([]postgresqldb.GetAuditLogsRow))
+	d.AddOperation("getUserAuditLogs", http.MethodPost, "/deepfence/settings/user-audit-log",
+		"Get user audit logs", "Get audit logs for all users",
+		http.StatusOK, []string{tagSettings}, bearerToken, new(GetAuditLogsRequest), new([]postgresqldb.GetAuditLogsRow))
+	d.AddOperation("getUserAuditLogsCount", http.MethodGet, "/deepfence/settings/user-audit-log/count",
+		"Get user audit logs count", "Get user audit logs count",
+		http.StatusOK, []string{tagSettings}, bearerToken, nil, new(SearchCountResp))
 
 	// Scheduled tasks
 	d.AddOperation("getScheduledTasks", http.MethodGet, "/deepfence/scheduled-task",

deepfence_server/handler/audit_log.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/deepfence/ThreatMapper/deepfence_server/model"
+	reporters_search "github.com/deepfence/ThreatMapper/deepfence_server/reporters/search"
 	"github.com/deepfence/ThreatMapper/deepfence_utils/directory"
 	"github.com/deepfence/ThreatMapper/deepfence_utils/log"
 	postgresql_db "github.com/deepfence/ThreatMapper/deepfence_utils/postgresql/postgresql-db"
@@ -155,7 +156,36 @@ func (h *Handler) AddAuditLog(namespace string, params postgresql_db.CreateAudit
 	return nil
 }
 
+func (h *Handler) GetAuditLogsCount(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	pgClient, err := directory.PostgresClient(ctx)
+	if err != nil {
+		log.Error().Err(err).Msg("failed to get db connection")
+		h.respondError(err, w)
+		return
+	}
+
+	count, err := pgClient.CountAuditLogs(ctx)
+	if err != nil {
+		log.Error().Err(err).Msg("failed to run CountAuditLogs query")
+		h.respondError(err, w)
+		return
+	}
+
+	httpext.JSON(w, http.StatusOK, reporters_search.SearchCountResp{
+		Count: int(count),
+	})
+}
+
 func (h *Handler) GetAuditLogs(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	var req model.GetAuditLogsRequest
+	err := httpext.DecodeJSON(r, httpext.NoQueryParams, MaxPostRequestSize, &req)
+	if err != nil {
+		h.respondError(&BadDecoding{err}, w)
+		return
+	}
+
 	ctx := r.Context()
 	pgClient, err := directory.PostgresClient(ctx)
 	if err != nil {
@@ -164,7 +194,10 @@ func (h *Handler) GetAuditLogs(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	auditLogs, err := pgClient.GetAuditLogs(ctx)
+	auditLogs, err := pgClient.GetAuditLogs(ctx, postgresql_db.GetAuditLogsParams{
+		Offset: int32(req.Window.Offset),
+		Limit:  int32(req.Window.Size),
+	})
 	if err != nil {
 		log.Error().Msgf("%v", err)
 		h.respondError(err, w)

deepfence_server/model/setting.go

@@ -58,6 +58,10 @@ type SettingsResponse struct {
 	Description string      `json:"description" required:"true"`
 }
 
+type GetAuditLogsRequest struct {
+	Window FetchWindow `json:"window"  required:"true"`
+}
+
 type SettingUpdateRequest struct {
 	ID    int64  `path:"id" validate:"required" required:"true"`
 	Key   string `json:"key" validate:"required,oneof=console_url inactive_delete_scan_results" required:"true" enum:"console_url,inactive_delete_scan_results"`

deepfence_server/router/router.go

@@ -206,7 +206,10 @@ func SetupRoutes(r *chi.Mux, serverPort string, serveOpenapiDocs bool, ingestC c
 			})
 
 			r.Route("/settings", func(r chi.Router) {
-				r.Get("/user-activity-log", dfHandler.AuthHandler(ResourceSettings, PermissionRead, dfHandler.GetAuditLogs))
+				r.Route("/user-audit-log", func(r chi.Router) {
+					r.Post("/", dfHandler.AuthHandler(ResourceSettings, PermissionRead, dfHandler.GetAuditLogs))
+					r.Get("/count", dfHandler.AuthHandler(ResourceSettings, PermissionRead, dfHandler.GetAuditLogsCount))
+				})
 				r.Route("/global-settings", func(r chi.Router) {
 					r.Get("/", dfHandler.AuthHandler(ResourceSettings, PermissionRead, dfHandler.GetGlobalSettings))
 					r.Patch("/{id}", dfHandler.AuthHandler(ResourceSettings, PermissionWrite, dfHandler.UpdateGlobalSettings))

deepfence_utils/postgresql/queries.sql

@@ -533,7 +533,12 @@ SELECT l.event,
        l.user_role  as role,
        l.created_at
 FROM audit_log l
-ORDER BY l.created_at DESC;
+ORDER BY id DESC
+OFFSET $1 LIMIT $2;
+
+-- name: CountAuditLogs :one
+SELECT count(*)
+FROM audit_log;
 
 -- name: GetAuditLogsLast5Minutes :many
 SELECT l.event,