From f30590588e38169e770a9495b8ce069f4b27d21e Mon Sep 17 00:00:00 2001 From: PiMaDaum Date: Sun, 5 Feb 2023 21:57:01 +0100 Subject: [PATCH] Implement CEL filter in list user command --- user/filter.go | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ user/list.go | 9 +++++++ 2 files changed, 78 insertions(+) create mode 100644 user/filter.go diff --git a/user/filter.go b/user/filter.go new file mode 100644 index 0000000..e355e82 --- /dev/null +++ b/user/filter.go @@ -0,0 +1,69 @@ +package user + +import ( + "context" + "fmt" + + "github.com/google/cel-go/cel" + "github.com/passbolt/go-passbolt/api" +) + +// Environments for CEl +var celEnvOptions = []cel.EnvOption{ + cel.Variable("ID", cel.StringType), + cel.Variable("Username", cel.StringType), + cel.Variable("FirstName", cel.StringType), + cel.Variable("LastName", cel.StringType), + cel.Variable("Role", cel.StringType), + cel.Variable("CreatedTimestamp", cel.TimestampType), + cel.Variable("ModifiedTimestamp", cel.TimestampType), +} + +// Filters the slice users by invoke CEL program for each user +func filterUsers(users *[]api.User, celCmd string, ctx context.Context) ([]api.User, error) { + if celCmd == "" { + return *users, nil + } + + env, err := cel.NewEnv(celEnvOptions...) + if err != nil { + return nil, err + } + + ast, issue := env.Compile(celCmd) + if issue.Err() != nil { + return nil, issue.Err() + } + + program, err := env.Program(ast) + if err != nil { + return nil, err + } + + filteredUsers := []api.User{} + for _, user := range *users { + val, _, err := program.ContextEval(ctx, map[string]any{ + "ID": user.ID, + "Username": user.Username, + "FirstName": user.Profile.FirstName, + "LastName": user.Profile.LastName, + "Role": user.Role.Name, + "CreatedTimestamp": user.Created.Time, + "ModifiedTimestamp": user.Modified.Time, + }) + + if err != nil { + return nil, err + } + + if val.Value() == true { + filteredUsers = append(filteredUsers, user) + } + } + + if len(filteredUsers) == 0 { + return nil, fmt.Errorf("No such users found with filter %v!", celCmd) + } + + return filteredUsers, nil +} diff --git a/user/list.go b/user/list.go index 32ff273..c1f3eb1 100644 --- a/user/list.go +++ b/user/list.go @@ -62,6 +62,10 @@ func UserList(cmd *cobra.Command, args []string) error { if err != nil { return err } + celFilter, err := cmd.Flags().GetString("filter") + if err != nil { + return err + } ctx := util.GetContext() @@ -82,6 +86,11 @@ func UserList(cmd *cobra.Command, args []string) error { return fmt.Errorf("Listing User: %w", err) } + users, err = filterUsers(&users, celFilter, ctx) + if err != nil { + return err + } + if jsonOutput { outputUsers := []UserJsonOutput{} for i := range users {