Skip to content

Commit f373792

Browse files
speatzlespeatzle
committed
add shellescapse, update deps
1 parent bf4a0c8 commit f373792

File tree

10 files changed

+182
-85
lines changed

10 files changed

+182
-85
lines changed

‎folder/get.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/alessio/shellescape"
78
"github.com/speatzle/go-passbolt-cli/util"
89
"github.com/speatzle/go-passbolt/helper"
910
"github.com/spf13/cobra"
@@ -47,6 +48,6 @@ func FolderGet(cmd *cobra.Command, args []string) error {
4748
return fmt.Errorf("Getting Folder: %w", err)
4849
}
4950
fmt.Printf("FolderParentID: %v\n", folderParentID)
50-
fmt.Printf("Name: %v\n", name)
51+
fmt.Printf("Name: %v\n", shellescape.StripUnsafe(name))
5152
return nil
5253
}

‎folder/list.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8+
"github.com/alessio/shellescape"
89
"github.com/speatzle/go-passbolt-cli/util"
910
"github.com/speatzle/go-passbolt/api"
1011
"github.com/spf13/cobra"
@@ -73,7 +74,7 @@ func FolderList(cmd *cobra.Command, args []string) error {
7374
case "folderparentid":
7475
entry[i] = folder.FolderParentID
7576
case "name":
76-
entry[i] = folder.Name
77+
entry[i] = shellescape.StripUnsafe(folder.Name)
7778
default:
7879
cmd.SilenceUsage = false
7980
return fmt.Errorf("Unknown Column: %v", columns[i])

‎go.mod‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ module github.com/speatzle/go-passbolt-cli
33
go 1.16
44

55
require (
6-
github.com/ProtonMail/gopenpgp/v2 v2.3.0 // indirect
7-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
6+
github.com/ProtonMail/gopenpgp/v2 v2.3.1 // indirect
7+
github.com/alessio/shellescape v1.4.1
88
github.com/gookit/color v1.5.0 // indirect
99
github.com/pterm/pterm v0.12.33
1010
github.com/speatzle/go-passbolt v0.5.2
11-
github.com/spf13/cobra v1.2.1
12-
github.com/spf13/viper v1.9.0
13-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
14-
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 // indirect
11+
github.com/spf13/cobra v1.3.0
12+
github.com/spf13/viper v1.10.1
13+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
14+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
1515
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
16-
gopkg.in/ini.v1 v1.64.0 // indirect
1716
)
1817

1918
// replace github.com/speatzle/go-passbolt => ../go-passbolt

‎go.sum‎

Lines changed: 143 additions & 53 deletions
Large diffs are not rendered by default.

‎group/get.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8+
"github.com/alessio/shellescape"
89
"github.com/pterm/pterm"
910
"github.com/speatzle/go-passbolt-cli/util"
1011
"github.com/speatzle/go-passbolt/helper"
@@ -68,11 +69,11 @@ func GroupGet(cmd *cobra.Command, args []string) error {
6869
case "isgroupmanager":
6970
entry[i] = fmt.Sprint(membership.IsGroupManager)
7071
case "username":
71-
entry[i] = fmt.Sprint(membership.Username)
72+
entry[i] = shellescape.StripUnsafe(membership.Username)
7273
case "userfirstname":
73-
entry[i] = fmt.Sprint(membership.UserFirstName)
74+
entry[i] = shellescape.StripUnsafe(membership.UserFirstName)
7475
case "userlastname":
75-
entry[i] = fmt.Sprint(membership.UserLastName)
76+
entry[i] = shellescape.StripUnsafe(membership.UserLastName)
7677
default:
7778
cmd.SilenceUsage = false
7879
return fmt.Errorf("Unknown Column: %v", columns[i])

‎group/list.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8+
"github.com/alessio/shellescape"
89
"github.com/speatzle/go-passbolt-cli/util"
910
"github.com/speatzle/go-passbolt/api"
1011
"github.com/spf13/cobra"
@@ -71,7 +72,7 @@ func GroupList(cmd *cobra.Command, args []string) error {
7172
case "id":
7273
entry[i] = resource.ID
7374
case "name":
74-
entry[i] = resource.Name
75+
entry[i] = shellescape.StripUnsafe(resource.Name)
7576
default:
7677
cmd.SilenceUsage = false
7778
return fmt.Errorf("Unknown Column: %v", columns[i])

‎resource/get.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/alessio/shellescape"
78
"github.com/speatzle/go-passbolt-cli/util"
89
"github.com/speatzle/go-passbolt/helper"
910
"github.com/spf13/cobra"
@@ -47,10 +48,10 @@ func ResourceGet(cmd *cobra.Command, args []string) error {
4748
return fmt.Errorf("Getting Resource: %w", err)
4849
}
4950
fmt.Printf("FolderParentID: %v\n", folderParentID)
50-
fmt.Printf("Name: %v\n", name)
51-
fmt.Printf("Username: %v\n", username)
52-
fmt.Printf("URI: %v\n", uri)
53-
fmt.Printf("Password: %v\n", password)
54-
fmt.Printf("Description: %v\n", description)
51+
fmt.Printf("Name: %v\n", shellescape.StripUnsafe(name))
52+
fmt.Printf("Username: %v\n", shellescape.StripUnsafe(username))
53+
fmt.Printf("URI: %v\n", shellescape.StripUnsafe(uri))
54+
fmt.Printf("Password: %v\n", shellescape.StripUnsafe(password))
55+
fmt.Printf("Description: %v\n", shellescape.StripUnsafe(description))
5556
return nil
5657
}

‎resource/list.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8+
"github.com/alessio/shellescape"
89
"github.com/speatzle/go-passbolt-cli/util"
910
"github.com/speatzle/go-passbolt/api"
1011
"github.com/speatzle/go-passbolt/helper"
@@ -87,23 +88,23 @@ func ResourceList(cmd *cobra.Command, args []string) error {
8788
case "folderparentid":
8889
entry[i] = resource.FolderParentID
8990
case "name":
90-
entry[i] = resource.Name
91+
entry[i] = shellescape.StripUnsafe(resource.Name)
9192
case "username":
92-
entry[i] = resource.Username
93+
entry[i] = shellescape.StripUnsafe(resource.Username)
9394
case "uri":
94-
entry[i] = resource.URI
95+
entry[i] = shellescape.StripUnsafe(resource.URI)
9596
case "password":
9697
_, _, _, _, pass, _, err := helper.GetResource(ctx, client, resource.ID)
9798
if err != nil {
9899
return fmt.Errorf("Get Resource %w", err)
99100
}
100-
entry[i] = pass
101+
entry[i] = shellescape.StripUnsafe(pass)
101102
case "description":
102103
_, _, _, _, _, desc, err := helper.GetResource(ctx, client, resource.ID)
103104
if err != nil {
104105
return fmt.Errorf("Get Resource %w", err)
105106
}
106-
entry[i] = desc
107+
entry[i] = shellescape.StripUnsafe(desc)
107108
default:
108109
cmd.SilenceUsage = false
109110
return fmt.Errorf("Unknown Column: %v", columns[i])

‎user/get.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/alessio/shellescape"
78
"github.com/speatzle/go-passbolt-cli/util"
89
"github.com/speatzle/go-passbolt/helper"
910
"github.com/spf13/cobra"
@@ -38,18 +39,18 @@ func UserGet(cmd *cobra.Command, args []string) error {
3839
defer client.Logout(context.TODO())
3940
cmd.SilenceUsage = true
4041

41-
username, firstname, lastname, role, err := helper.GetUser(
42+
role, username, firstname, lastname, err := helper.GetUser(
4243
ctx,
4344
client,
4445
id,
4546
)
4647
if err != nil {
4748
return fmt.Errorf("Getting User: %w", err)
4849
}
49-
fmt.Printf("Username: %v\n", username)
50-
fmt.Printf("FirstName: %v\n", firstname)
51-
fmt.Printf("LastName: %v\n", lastname)
52-
fmt.Printf("Role: %v\n", role)
50+
fmt.Printf("Username: %v\n", shellescape.StripUnsafe(username))
51+
fmt.Printf("FirstName: %v\n", shellescape.StripUnsafe(firstname))
52+
fmt.Printf("LastName: %v\n", shellescape.StripUnsafe(lastname))
53+
fmt.Printf("Role: %v\n", shellescape.StripUnsafe(role))
5354

5455
return nil
5556
}

‎user/list.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8+
"github.com/alessio/shellescape"
89
"github.com/speatzle/go-passbolt-cli/util"
910
"github.com/speatzle/go-passbolt/api"
1011
"github.com/spf13/cobra"
@@ -84,13 +85,13 @@ func UserList(cmd *cobra.Command, args []string) error {
8485
case "id":
8586
entry[i] = user.ID
8687
case "username":
87-
entry[i] = user.Username
88+
entry[i] = shellescape.StripUnsafe(user.Username)
8889
case "firstname":
89-
entry[i] = user.Profile.FirstName
90+
entry[i] = shellescape.StripUnsafe(user.Profile.FirstName)
9091
case "lastname":
91-
entry[i] = user.Profile.LastName
92+
entry[i] = shellescape.StripUnsafe(user.Profile.LastName)
9293
case "role":
93-
entry[i] = user.Role.Name
94+
entry[i] = shellescape.StripUnsafe(user.Role.Name)
9495
default:
9596
cmd.SilenceUsage = false
9697
return fmt.Errorf("Unknown Column: %v", columns[i])

0 commit comments

Comments
 (0)