mirror of
https://github.com/passbolt/go-passbolt-cli.git
synced 2025-09-13 06:59:07 +00:00
Always Decrypt Resource
This commit is contained in:
parent
570197bdfa
commit
ae3d822c30
2 changed files with 22 additions and 34 deletions
|
@ -5,8 +5,6 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/google/cel-go/cel"
|
"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"
|
||||||
|
@ -38,28 +36,20 @@ func filterResources(resources *[]api.Resource, celCmd string, ctx context.Conte
|
||||||
|
|
||||||
filteredResources := []api.Resource{}
|
filteredResources := []api.Resource{}
|
||||||
for _, resource := range *resources {
|
for _, resource := range *resources {
|
||||||
|
// TODO We should decrypt the secret only when required for performance reasonse
|
||||||
|
_, name, username, uri, pass, desc, err := helper.GetResource(ctx, client, resource.ID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("Get Resource %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
val, _, err := (*program).ContextEval(ctx, map[string]any{
|
val, _, err := (*program).ContextEval(ctx, map[string]any{
|
||||||
"Id": resource.ID,
|
"Id": resource.ID,
|
||||||
"FolderParentID": resource.FolderParentID,
|
"FolderParentID": resource.FolderParentID,
|
||||||
"Name": resource.Name,
|
"Name": name,
|
||||||
"Username": resource.Username,
|
"Username": username,
|
||||||
"URI": resource.URI,
|
"URI": uri,
|
||||||
"Password": func() ref.Val {
|
"Password": pass,
|
||||||
_, _, _, _, pass, _, err := helper.GetResource(ctx, client, resource.ID)
|
"Description": desc,
|
||||||
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,
|
"CreatedTimestamp": resource.Created.Time,
|
||||||
"ModifiedTimestamp": resource.Modified.Time,
|
"ModifiedTimestamp": resource.Modified.Time,
|
||||||
})
|
})
|
||||||
|
|
|
@ -118,6 +118,12 @@ func ResourceList(cmd *cobra.Command, args []string) error {
|
||||||
data := pterm.TableData{columns}
|
data := pterm.TableData{columns}
|
||||||
|
|
||||||
for _, resource := range resources {
|
for _, resource := range resources {
|
||||||
|
// TODO We should decrypt the secret only when required for performance reasonse
|
||||||
|
_, name, username, uri, pass, desc, err := helper.GetResource(ctx, client, resource.ID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Get Resource %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
entry := make([]string, len(columns))
|
entry := make([]string, len(columns))
|
||||||
for i := range columns {
|
for i := range columns {
|
||||||
switch strings.ToLower(columns[i]) {
|
switch strings.ToLower(columns[i]) {
|
||||||
|
@ -126,22 +132,14 @@ func ResourceList(cmd *cobra.Command, args []string) error {
|
||||||
case "folderparentid":
|
case "folderparentid":
|
||||||
entry[i] = resource.FolderParentID
|
entry[i] = resource.FolderParentID
|
||||||
case "name":
|
case "name":
|
||||||
entry[i] = shellescape.StripUnsafe(resource.Name)
|
entry[i] = shellescape.StripUnsafe(name)
|
||||||
case "username":
|
case "username":
|
||||||
entry[i] = shellescape.StripUnsafe(resource.Username)
|
entry[i] = shellescape.StripUnsafe(username)
|
||||||
case "uri":
|
case "uri":
|
||||||
entry[i] = shellescape.StripUnsafe(resource.URI)
|
entry[i] = shellescape.StripUnsafe(uri)
|
||||||
case "password":
|
case "password":
|
||||||
_, _, _, _, pass, _, err := helper.GetResource(ctx, client, resource.ID)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Get Resource %w", err)
|
|
||||||
}
|
|
||||||
entry[i] = shellescape.StripUnsafe(pass)
|
entry[i] = shellescape.StripUnsafe(pass)
|
||||||
case "description":
|
case "description":
|
||||||
_, _, _, _, _, desc, err := helper.GetResource(ctx, client, resource.ID)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Get Resource %w", err)
|
|
||||||
}
|
|
||||||
entry[i] = shellescape.StripUnsafe(desc)
|
entry[i] = shellescape.StripUnsafe(desc)
|
||||||
case "createdtimestamp":
|
case "createdtimestamp":
|
||||||
entry[i] = resource.Created.Format(time.RFC3339)
|
entry[i] = resource.Created.Format(time.RFC3339)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue