multi: allow querying actions by group ID

Author: ellemouton

cmd/litcli/actions.go

@@ -35,9 +35,9 @@ var listActionsCommand = cli.Command{
 		},
 		cli.StringFlag{
 			Name: "session_id",
-			Usage: "The session ID to filter the actions by. If " +
-				"left empty, then all actions will be " +
-				"returned.",
+			Usage: "The hex encoded session ID to filter the " +
+				"actions by. If left empty, then all actions " +
+				"will be returned.",
 		},
 		cli.Uint64Flag{
 			Name: "start_timestamp",
@@ -84,6 +84,16 @@ var listActionsCommand = cli.Command{
 				"index_offset is the index of the action in " +
 				"the db regardless of filter.",
 		},
+		cli.StringFlag{
+			Name: "group_id",
+			Usage: "The hex encoded group ID to filter the " +
+				"actions by. The group ID is the same for " +
+				"all sessions that have been linked. If a " +
+				"session has no linked sessions then the " +
+				"group ID will be the same as the " +
+				"session ID. This flag will be ignored if " +
+				"the `session_id` flag is set.",
+		},
 	},
 }
 
@@ -109,6 +119,14 @@ func listActions(ctx *cli.Context) error {
 		}
 	}
 
+	var groupID []byte
+	if ctx.String("group_id") != "" {
+		groupID, err = hex.DecodeString(ctx.String("group_id"))
+		if err != nil {
+			return err
+		}
+	}
+
 	resp, err := client.ListActions(
 		ctxb, &litrpc.ListActionsRequest{
 			SessionId:      sessionID,
@@ -122,6 +140,7 @@ func listActions(ctx *cli.Context) error {
 			CountTotal:     ctx.Bool("count_total"),
 			StartTimestamp: ctx.Uint64("start_timestamp"),
 			EndTimestamp:   ctx.Uint64("end_timestamp"),
+			GroupId:        groupID,
 		},
 	)
 	if err != nil {

litrpc/firewall.pb.go

@@ -120,6 +120,11 @@ message ListActionsRequest {
     considered.
     */
     uint64 end_timestamp = 11 [jstype = JS_STRING];
+
+    /*
+    If specified, then only actions under the given group will be queried.
+    */
+    bytes group_id = 12;
 }
 
 message ListActionsResponse {

litrpc/firewall.proto

@@ -197,6 +197,11 @@
           "type": "string",
           "format": "uint64",
           "description": "If specified, then only actions created before the given timestamp will be\nconsidered."
+        },
+        "group_id": {
+          "type": "string",
+          "format": "byte",
+          "description": "If specified, then only actions under the given group will be queried."
         }
       }
     },

litrpc/firewall.swagger.json

@@ -725,6 +725,16 @@ func (s *sessionRpcServer) ListActions(_ context.Context,
 		if err != nil {
 			return nil, err
 		}
+	} else if req.GroupId != nil {
+		groupID, err := session.IDFromBytes(req.GroupId)
+		if err != nil {
+			return nil, err
+		}
+
+		actions, err = db.ListGroupActions(groupID, filterFn)
+		if err != nil {
+			return nil, err
+		}
 	} else {
 		actions, lastIndex, totalCount, err = db.ListActions(
 			filterFn, query,