mirror of
https://github.com/passbolt/go-passbolt-cli.git
synced 2025-05-15 03:58:21 +00:00
Outsource the resources filter function
to seperate file
This commit is contained in:
PiMaDaum
parent
9bdc4a96ca
commit
e5bb6eceff
2 changed files with 105 additions and 93 deletions
105
resource/filter.go
Normal file
105
resource/filter.go
Normal file
|
|
@ -0,0 +1,105 @@
|
||||||
|
package resource
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/cel-go/cel"
|
||||||
|
"github.com/google/cel-go/common/types"
|
||||||
|
"github.com/google/cel-go/common/types/ref"
|
||||||
|
"github.com/passbolt/go-passbolt/api"
|
||||||
|
"github.com/passbolt/go-passbolt/helper"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Environments for CEl
|
||||||
|
var celEnvOptions = []cel.EnvOption{
|
||||||
|
cel.Variable("ID", cel.StringType),
|
||||||
|
cel.Variable("FolderParentID", cel.StringType),
|
||||||
|
cel.Variable("Name", cel.StringType),
|
||||||
|
cel.Variable("Username", cel.StringType),
|
||||||
|
cel.Variable("URI", cel.StringType),
|
||||||
|
cel.Variable("Password", cel.StringType),
|
||||||
|
cel.Variable("Description", cel.StringType),
|
||||||
|
cel.Variable("CreatedTimestamp", cel.TimestampType),
|
||||||
|
cel.Variable("ModifiedTimestamp", cel.TimestampType),
|
||||||
|
cel.Function("parseTimestamp",
|
||||||
|
cel.Overload("parse_timestamp_string",
|
||||||
|
[]*cel.Type{cel.StringType},
|
||||||
|
cel.TimestampType,
|
||||||
|
cel.UnaryBinding(func(timeStampInput ref.Val) ref.Val {
|
||||||
|
timeStampString := fmt.Sprintf("%s", timeStampInput.Value())
|
||||||
|
timeStamp, err := time.Parse(time.R, timeStampString)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Error while parsing timestamp: %v\n", err)
|
||||||
|
}
|
||||||
|
return types.Timestamp{Time: timeStamp}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filters the slice resources by invoke CEL program for each resource
|
||||||
|
func filterResources(resources *[]api.Resource, celCmd string, ctx context.Context, client *api.Client) ([]api.Resource, error) {
|
||||||
|
if celCmd == "" {
|
||||||
|
return *resources, 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
|
||||||
|
}
|
||||||
|
|
||||||
|
filteredResources := []api.Resource{}
|
||||||
|
for _, resource := range *resources {
|
||||||
|
val, _, err := program.ContextEval(ctx, map[string]any{
|
||||||
|
"Id": resource.ID,
|
||||||
|
"FolderParentID": resource.FolderParentID,
|
||||||
|
"Name": resource.Name,
|
||||||
|
"Username": resource.Username,
|
||||||
|
"URI": resource.URI,
|
||||||
|
"Password": func() ref.Val {
|
||||||
|
_, _, _, _, pass, _, err := helper.GetResource(ctx, client, resource.ID)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Get Resource %v", err)
|
||||||
|
return types.String("")
|
||||||
|
}
|
||||||
|
return types.String(pass)
|
||||||
|
},
|
||||||
|
"Description": func() ref.Val {
|
||||||
|
_, _, _, _, _, descr, err := helper.GetResource(ctx, client, resource.ID)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Get Resource %v", err)
|
||||||
|
return types.String("")
|
||||||
|
}
|
||||||
|
return types.String(descr)
|
||||||
|
},
|
||||||
|
"CreatedTimestamp": resource.Created.Time,
|
||||||
|
"ModifiedTimestamp": resource.Modified.Time,
|
||||||
|
})
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if val.Value() == true {
|
||||||
|
filteredResources = append(filteredResources, resource)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(filteredResources) == 0 {
|
||||||
|
return nil, fmt.Errorf("No such Resources found with filter %v!", celCmd)
|
||||||
|
}
|
||||||
|
return filteredResources, nil
|
||||||
|
}
|
||||||
|
|
@ -8,9 +8,6 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alessio/shellescape"
|
"github.com/alessio/shellescape"
|
||||||
"github.com/google/cel-go/cel"
|
|
||||||
"github.com/google/cel-go/common/types"
|
|
||||||
"github.com/google/cel-go/common/types/ref"
|
|
||||||
"github.com/passbolt/go-passbolt-cli/util"
|
"github.com/passbolt/go-passbolt-cli/util"
|
||||||
"github.com/passbolt/go-passbolt/api"
|
"github.com/passbolt/go-passbolt/api"
|
||||||
"github.com/passbolt/go-passbolt/helper"
|
"github.com/passbolt/go-passbolt/helper"
|
||||||
|
|
@ -28,33 +25,6 @@ var ResourceListCmd = &cobra.Command{
|
||||||
RunE: ResourceList,
|
RunE: ResourceList,
|
||||||
}
|
}
|
||||||
|
|
||||||
var celEnvOptions = []cel.EnvOption{
|
|
||||||
cel.Variable("ID", cel.StringType),
|
|
||||||
cel.Variable("FolderParentID", cel.StringType),
|
|
||||||
cel.Variable("Name", cel.StringType),
|
|
||||||
cel.Variable("Username", cel.StringType),
|
|
||||||
cel.Variable("URI", cel.StringType),
|
|
||||||
cel.Variable("Password", cel.StringType),
|
|
||||||
cel.Variable("Description", cel.StringType),
|
|
||||||
cel.Variable("CreatedTimestamp", cel.TimestampType),
|
|
||||||
cel.Variable("ModifiedTimestamp", cel.TimestampType),
|
|
||||||
cel.Function("parseTimestamp",
|
|
||||||
cel.Overload("parse_timestamp_string",
|
|
||||||
[]*cel.Type{cel.StringType},
|
|
||||||
cel.TimestampType,
|
|
||||||
cel.UnaryBinding(func(timeStampInput ref.Val) ref.Val {
|
|
||||||
timeStampString := fmt.Sprintf("%s", timeStampInput.Value())
|
|
||||||
timeStamp, err := time.Parse(`2006-01-02+15:04:05`, timeStampString)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("Error while parsing timestamp: %v\n", err)
|
|
||||||
}
|
|
||||||
return types.Timestamp{Time: timeStamp}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
ResourceListCmd.Flags().Bool("favorite", false, "Resources that are marked as favorite")
|
ResourceListCmd.Flags().Bool("favorite", false, "Resources that are marked as favorite")
|
||||||
ResourceListCmd.Flags().Bool("own", false, "Resources that are owned by me")
|
ResourceListCmd.Flags().Bool("own", false, "Resources that are owned by me")
|
||||||
|
|
@ -196,66 +166,3 @@ func ResourceList(cmd *cobra.Command, args []string) error {
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func filterResources(resources *[]api.Resource, celCmd string, ctx context.Context, client *api.Client) ([]api.Resource, error) {
|
|
||||||
if celCmd == "" {
|
|
||||||
return *resources, 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
|
|
||||||
}
|
|
||||||
|
|
||||||
filteredResources := []api.Resource{}
|
|
||||||
for _, resource := range *resources {
|
|
||||||
val, _, err := program.ContextEval(ctx, map[string]any{
|
|
||||||
"Id": resource.ID,
|
|
||||||
"FolderParentID": resource.FolderParentID,
|
|
||||||
"Name": resource.Name,
|
|
||||||
"Username": resource.Username,
|
|
||||||
"URI": resource.URI,
|
|
||||||
"Password": func() ref.Val {
|
|
||||||
_, _, _, _, pass, _, err := helper.GetResource(ctx, client, resource.ID)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("Get Resource %v", err)
|
|
||||||
return types.String("")
|
|
||||||
}
|
|
||||||
return types.String(pass)
|
|
||||||
},
|
|
||||||
"Description": func() ref.Val {
|
|
||||||
_, _, _, _, _, descr, err := helper.GetResource(ctx, client, resource.ID)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("Get Resource %v", err)
|
|
||||||
return types.String("")
|
|
||||||
}
|
|
||||||
return types.String(descr)
|
|
||||||
},
|
|
||||||
"CreatedTimestamp": resource.Created.Time,
|
|
||||||
"ModifiedTimestamp": resource.Modified.Time,
|
|
||||||
})
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if val.Value() == true {
|
|
||||||
filteredResources = append(filteredResources, resource)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(filteredResources) == 0 {
|
|
||||||
return nil, fmt.Errorf("No such Resources found with filter %v!", celCmd)
|
|
||||||
}
|
|
||||||
return filteredResources, nil
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue