Mock time (#2)

2025-12-06 15:22:47 +01:00 · 2021-12-27 00:17:44 +01:00
parent 0286574692
commit 1fade14ba5
19 changed files with 916 additions and 969 deletions
--- a/database/artifact.go
+++ b/database/artifact.go
@@ -3,12 +3,12 @@ package database
 import (
 	"context"
 	"fmt"
-	"time"

 	"github.com/arangodb/go-driver"

 	"github.com/SecurityBrewery/catalyst/database/busdb"
 	"github.com/SecurityBrewery/catalyst/generated/models"
+	"github.com/SecurityBrewery/catalyst/time"
 )

 func (db *Database) ArtifactGet(ctx context.Context, id int64, name string) (*models.Artifact, error) {
--- a/database/busdb/busdb.go
+++ b/database/busdb/busdb.go
@@ -9,11 +9,6 @@ import (
 	"github.com/SecurityBrewery/catalyst/generated/models"
 )

-type Hook interface {
-	PublishAction(action string, context, msg map[string]interface{}) error
-	PublishUpdate(col, id string) error
-}
-
 // BusDatabase
 //  1. Save entry to log
 //  2. Send update ticket to bus
--- a/database/busdb/log.go
+++ b/database/busdb/log.go
@@ -3,23 +3,23 @@ package busdb
 import (
 	"context"
 	"errors"
-	"time"

 	"github.com/arangodb/go-driver"

 	"github.com/SecurityBrewery/catalyst/generated/models"
+	"github.com/SecurityBrewery/catalyst/time"
 )

 const LogCollectionName = "logs"

-func (db *BusDatabase) LogCreate(ctx context.Context, id, message string) (*models.LogEntry, error) {
+func (db *BusDatabase) LogCreate(ctx context.Context, reference, message string) (*models.LogEntry, error) {
 	user, ok := UserFromContext(ctx)
 	if !ok {
 		return nil, errors.New("no user in context")
 	}

 	logentry := &models.LogEntry{
-		Reference: id,
+		Reference: reference,
 		Created:   time.Now(),
 		Creator:   user.ID,
 		Message:   message,
--- a/database/playbook.go
+++ b/database/playbook.go
@@ -3,7 +3,6 @@ package database
 import (
 	"context"
 	"errors"
-	"time"

 	"github.com/arangodb/go-driver"
 	"github.com/iancoleman/strcase"
@@ -12,6 +11,7 @@ import (

 	"github.com/SecurityBrewery/catalyst/database/busdb"
 	"github.com/SecurityBrewery/catalyst/generated/models"
+	"github.com/SecurityBrewery/catalyst/time"
 )

 type PlaybookYAML struct {
--- a/database/ticket.go
+++ b/database/ticket.go
@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"time"

 	"github.com/arangodb/go-driver"
 	"github.com/xeipuuv/gojsonschema"
@@ -18,6 +17,7 @@ import (
 	"github.com/SecurityBrewery/catalyst/database/busdb"
 	"github.com/SecurityBrewery/catalyst/generated/models"
 	"github.com/SecurityBrewery/catalyst/index"
+	"github.com/SecurityBrewery/catalyst/time"
 )

 func toTicket(ticketForm *models.TicketForm) (interface{}, error) {
--- a/database/ticket_field.go
+++ b/database/ticket_field.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"time"

 	"github.com/arangodb/go-driver"
 	"github.com/iancoleman/strcase"
@@ -13,6 +12,7 @@ import (
 	"github.com/SecurityBrewery/catalyst/database/busdb"
 	"github.com/SecurityBrewery/catalyst/generated/models"
 	"github.com/SecurityBrewery/catalyst/pointer"
+	"github.com/SecurityBrewery/catalyst/time"
 )

 func (db *Database) AddArtifact(ctx context.Context, id int64, artifact *models.Artifact) (*models.TicketWithTickets, error) {
@@ -31,9 +31,9 @@ func (db *Database) AddArtifact(ctx context.Context, id int64, artifact *models.

 	query := `LET d = DOCUMENT(@@collection, @ID)
 	` + ticketFilterQuery + `
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "artifacts": PUSH(NOT_NULL(d.artifacts, []), @artifact) } IN @@collection
+	UPDATE d WITH { "modified": @now, "artifacts": PUSH(NOT_NULL(d.artifacts, []), @artifact) } IN @@collection
 	RETURN NEW`
-	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"artifact": artifact}, ticketFilterVars), &busdb.Operation{
+	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"artifact": artifact, "now": time.Now().UTC()}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
 			driver.DocumentID(fmt.Sprintf("%s/%d", TicketCollectionName, id)),
@@ -71,9 +71,9 @@ func (db *Database) RemoveArtifact(ctx context.Context, id int64, name string) (
 	FOR a IN NOT_NULL(d.artifacts, [])
 	FILTER a.name == @name
 	LET newartifacts = REMOVE_VALUE(d.artifacts, a)
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "artifacts": newartifacts } IN @@collection
+	UPDATE d WITH { "modified": @now, "artifacts": newartifacts } IN @@collection
 	RETURN NEW`
-	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"name": name}, ticketFilterVars), &busdb.Operation{
+	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"name": name, "now": time.Now().UTC()}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
 			driver.DocumentID(fmt.Sprintf("%s/%d", TicketCollectionName, id)),
@@ -122,9 +122,9 @@ func (db *Database) AddComment(ctx context.Context, id int64, comment *models.Co

 	query := `LET d = DOCUMENT(@@collection, @ID)
 	` + ticketFilterQuery + `
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "comments": PUSH(NOT_NULL(d.comments, []), @comment) } IN @@collection
+	UPDATE d WITH { "modified": @now, "comments": PUSH(NOT_NULL(d.comments, []), @comment) } IN @@collection
 	RETURN NEW`
-	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"comment": comment}, ticketFilterVars), &busdb.Operation{
+	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"comment": comment, "now": time.Now().UTC()}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
 			driver.DocumentID(fmt.Sprintf("%s/%d", TicketCollectionName, id)),
@@ -141,9 +141,9 @@ func (db *Database) RemoveComment(ctx context.Context, id int64, commentID int64

 	query := `LET d = DOCUMENT(@@collection, @ID)
 	` + ticketFilterQuery + `
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "comments": REMOVE_NTH(d.comments, @commentID) } IN @@collection
+	UPDATE d WITH { "modified": @now, "comments": REMOVE_NTH(d.comments, @commentID) } IN @@collection
 	RETURN NEW`
-	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"commentID": commentID}, ticketFilterVars), &busdb.Operation{
+	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"commentID": commentID, "now": time.Now().UTC()}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
 			driver.DocumentID(fmt.Sprintf("%s/%d", TicketCollectionName, id)),
@@ -160,9 +160,9 @@ func (db *Database) SetReferences(ctx context.Context, id int64, references []*m

 	query := `LET d = DOCUMENT(@@collection, @ID)
 	` + ticketFilterQuery + `
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "references": @references } IN @@collection
+	UPDATE d WITH { "modified": @now, "references": @references } IN @@collection
 	RETURN NEW`
-	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"references": references}, ticketFilterVars), &busdb.Operation{
+	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"references": references, "now": time.Now().UTC()}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
 			driver.DocumentID(fmt.Sprintf("%s/%d", TicketCollectionName, id)),
@@ -179,9 +179,9 @@ func (db *Database) LinkFiles(ctx context.Context, id int64, files []*models.Fil

 	query := `LET d = DOCUMENT(@@collection, @ID)
 	` + ticketFilterQuery + `
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "files": @files } IN @@collection
+	UPDATE d WITH { "modified": @now, "files": @files } IN @@collection
 	RETURN NEW`
-	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"files": files}, ticketFilterVars), &busdb.Operation{
+	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{"files": files, "now": time.Now().UTC()}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
 			driver.DocumentID(fmt.Sprintf("%s/%d", TicketCollectionName, id)),
@@ -216,12 +216,13 @@ func (db *Database) AddTicketPlaybook(ctx context.Context, id int64, playbookTem
 	FILTER d._key == @ID
 	LET newplaybook =  ZIP( [@playbookID], [@playbook] )
 	LET newplaybooks = MERGE(NOT_NULL(d.playbooks, {}), newplaybook)
-	LET newticket = MERGE(d, { "modified": DATE_ISO8601(DATE_NOW()), "playbooks": newplaybooks })
+	LET newticket = MERGE(d, { "modified": @now, "playbooks": newplaybooks })
 	REPLACE d WITH newticket IN @@collection
 	RETURN NEW`
 	ticket, err := db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{
 		"playbook":   pb,
 		"playbookID": findName(parentTicket.Playbooks, playbookID),
+		"now":        time.Now().UTC(),
 	}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
@@ -277,10 +278,11 @@ func (db *Database) RemoveTicketPlaybook(ctx context.Context, id int64, playbook
 	` + ticketFilterQuery + `
 	FILTER d._key == @ID
 	LET newplaybooks = UNSET(d.playbooks, @playbookID)
-	REPLACE d WITH MERGE(d, { "modified": DATE_ISO8601(DATE_NOW()), "playbooks": newplaybooks }) IN @@collection
+	REPLACE d WITH MERGE(d, { "modified": @now, "playbooks": newplaybooks }) IN @@collection
 	RETURN NEW`
 	return db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{
 		"playbookID": playbookID,
+		"now":        time.Now().UTC(),
 	}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
--- a/database/ticket_task.go
+++ b/database/ticket_task.go
@@ -5,13 +5,13 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"time"

 	"github.com/arangodb/go-driver"
 	"github.com/google/uuid"

 	"github.com/SecurityBrewery/catalyst/database/busdb"
 	"github.com/SecurityBrewery/catalyst/generated/models"
+	"github.com/SecurityBrewery/catalyst/time"
 )

 func (db *Database) TaskGet(ctx context.Context, id int64, playbookID string, taskID string) (*models.TicketWithTickets, *models.PlaybookResponse, *models.TaskWithContext, error) {
@@ -65,13 +65,14 @@ func (db *Database) TaskComplete(ctx context.Context, id int64, playbookID strin
 	LET newplaybook = MERGE(playbook, {"tasks": newtasks})
 	LET newplaybooks = MERGE(d.playbooks, { @playbookID: newplaybook } )
 	
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "playbooks": newplaybooks } IN @@collection
+	UPDATE d WITH { "modified": @now, "playbooks": newplaybooks } IN @@collection
 	RETURN NEW`
 	ticket, err := db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{
 		"playbookID": playbookID,
 		"taskID":     taskID,
 		"data":       data,
 		"closed":     time.Now().UTC(),
+		"now":        time.Now().UTC(),
 	}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
@@ -118,6 +119,8 @@ func (db *Database) TaskUpdate(ctx context.Context, id int64, playbookID string,
 		return nil, err
 	}

+	task.Created = time.Now().UTC()
+
 	query := `LET d = DOCUMENT(@@collection, @ID)
 	` + ticketFilterQuery + `
 	LET playbook = d.playbooks[@playbookID]
@@ -125,12 +128,13 @@ func (db *Database) TaskUpdate(ctx context.Context, id int64, playbookID string,
 	LET newplaybook = MERGE(playbook, {"tasks": newtasks})
 	LET newplaybooks = MERGE(d.playbooks, { @playbookID: newplaybook } )
 	
-	UPDATE d WITH { "modified": DATE_ISO8601(DATE_NOW()), "playbooks": newplaybooks } IN @@collection
+	UPDATE d WITH { "modified": @now, "playbooks": newplaybooks } IN @@collection
 	RETURN NEW`
 	ticket, err := db.ticketGetQuery(ctx, id, query, mergeMaps(map[string]interface{}{
 		"playbookID": playbookID,
 		"taskID":     taskID,
 		"task":       task,
+		"now":        time.Now().UTC(),
 	}, ticketFilterVars), &busdb.Operation{
 		OperationType: busdb.Update,
 		Ids: []driver.DocumentID{
--- a/database/user.go
+++ b/database/user.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"time"

 	"github.com/arangodb/go-driver"
 	"github.com/gin-gonic/gin"
@@ -16,6 +15,7 @@ import (
 	"github.com/SecurityBrewery/catalyst/generated/models"
 	"github.com/SecurityBrewery/catalyst/pointer"
 	"github.com/SecurityBrewery/catalyst/role"
+	"github.com/SecurityBrewery/catalyst/time"
 )

 var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_")