Added new Uint64 GraphQL scalar, added Interval field to Beacon (#396)

spellshift · Dec 11, 2023 · 98d9604 · 98d9604
1 parent 92e0007
commit 98d9604
Show file tree

Hide file tree

Showing 23 changed files with 737 additions and 11 deletions.
diff --git a/tavern/internal/c2/server.go b/tavern/internal/c2/server.go
@@ -72,6 +72,7 @@ func (srv *Server) ClaimTasks(ctx context.Context, req *c2pb.ClaimTasksRequest)
 		SetAgentIdentifier(req.Beacon.Agent.Identifier).
 		SetHostID(hostID).
 		SetLastSeenAt(now).
+		SetInterval(req.Beacon.Interval).
 		OnConflict().
 		UpdateNewValues().
 		ID(ctx)

diff --git a/tavern/internal/c2/testdata/claimTasks/NoTasks.yml b/tavern/internal/c2/testdata/claimTasks/NoTasks.yml
@@ -10,4 +10,5 @@ requests:
           platform: 1
         agent:
           identifier: test-case
+        interval: 300
     expected: {}
diff --git a/tavern/internal/ent/beacon.go b/tavern/internal/ent/beacon.go
diff --git a/tavern/internal/ent/beacon/beacon.go b/tavern/internal/ent/beacon/beacon.go
diff --git a/tavern/internal/ent/beacon/where.go b/tavern/internal/ent/beacon/where.go
diff --git a/tavern/internal/ent/beacon_create.go b/tavern/internal/ent/beacon_create.go
diff --git a/tavern/internal/ent/beacon_update.go b/tavern/internal/ent/beacon_update.go
diff --git a/tavern/internal/ent/gql_collection.go b/tavern/internal/ent/gql_collection.go