Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLI-80: users blocks commands #219

Merged
merged 9 commits into from
Apr 23, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var requiredScopes = []string{
"create:clients", "delete:clients", "read:clients", "update:clients",
"create:resource_servers", "delete:resource_servers", "read:resource_servers", "update:resource_servers",
"create:rules", "delete:rules", "read:rules", "update:rules",
"read:client_keys", "read:logs",
"read:client_keys", "read:logs", "read:users", "update:users",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need delete?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not yet, deleting user blocks only require update:users

}

// SecretStore provides access to stored sensitive data.
Expand Down
2 changes: 2 additions & 0 deletions internal/auth0/auth0.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type API struct {
Log LogAPI
ResourceServer ResourceServerAPI
Rule RuleAPI
User UserAPI
}

func NewAPI(m *management.Management) *API {
Expand All @@ -28,6 +29,7 @@ func NewAPI(m *management.Management) *API {
Log: m.Log,
ResourceServer: m.ResourceServer,
Rule: m.Rule,
User: m.User,
}
}

Expand Down
14 changes: 14 additions & 0 deletions internal/auth0/user.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//go:generate mockgen -source=user.go -destination=user_mock.go -package=auth0

package auth0

import "gopkg.in/auth0.v5/management"

type UserAPI interface {
// Retrieves a list of blocked IP addresses of a particular user.
Blocks(id string, opts ...management.RequestOption) ([]*management.UserBlock, error)

// Unblock a user that was blocked due to an excessive amount of incorrectly
// provided credentials.
Unblock(id string, opts ...management.RequestOption) error
}
1 change: 1 addition & 0 deletions internal/cli/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ func Execute() {
rootCmd.AddCommand(rulesCmd(cli))
rootCmd.AddCommand(quickstartsCmd(cli))
rootCmd.AddCommand(apisCmd(cli))
rootCmd.AddCommand(usersCmd(cli))
rootCmd.AddCommand(testCmd(cli))
rootCmd.AddCommand(logsCmd(cli))
rootCmd.AddCommand(logoutCmd(cli))
Expand Down
114 changes: 114 additions & 0 deletions internal/cli/users.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
package cli

import (
"errors"
"fmt"

"github.com/auth0/auth0-cli/internal/ansi"
"github.com/spf13/cobra"
"gopkg.in/auth0.v5/management"
)

func usersCmd(cli *cli) *cobra.Command {
cmd := &cobra.Command{
Use: "users",
Short: "Manage resources for users",
}

cmd.SetUsageTemplate(resourceUsageTemplate())
cmd.AddCommand(userBlocksCmd(cli))
return cmd
}

func userBlocksCmd(cli *cli) *cobra.Command {
cmd := &cobra.Command{
Use: "blocks",
Short: "Manage brute-force protection user blocks.",
}

cmd.SetUsageTemplate(resourceUsageTemplate())
cmd.AddCommand(listUserBlocksCmd(cli))
cmd.AddCommand(deleteUserBlocksCmd(cli))
return cmd
}

func listUserBlocksCmd(cli *cli) *cobra.Command {
var inputs struct {
userID string
}

cmd := &cobra.Command{
Use: "list",
Args: cobra.MaximumNArgs(1),
Short: "List brute-force protection blocks for a given user",
Long: `List brute-force protection blocks for a given user:

auth0 users blocks list <User ID>
cyx marked this conversation as resolved.
Show resolved Hide resolved
`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
inputs.userID = args[0]
cyx marked this conversation as resolved.
Show resolved Hide resolved
} else {
return errors.New("User ID is required.")
}

var userBlocks []*management.UserBlock

err := ansi.Waiting(func() error {
var err error
userBlocks, err = cli.api.User.Blocks(inputs.userID)
return err
})

if err != nil {
return fmt.Errorf("Unable to load user blocks %v, error: %w", inputs.userID, err)
}

cli.renderer.UserBlocksList(userBlocks)
return nil
},
}

return cmd
}

func deleteUserBlocksCmd(cli *cli) *cobra.Command {
var inputs struct {
userID string
}

cmd := &cobra.Command{
Use: "delete",
mhsu-auth0 marked this conversation as resolved.
Show resolved Hide resolved
Args: cobra.MaximumNArgs(1),
Short: "Delete brute-force protection blocks for a given user",
Long: `Delete brute-force protection blocks for a given user:

auth0 users blocks delete <User ID>
`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
inputs.userID = args[0]
mhsu-auth0 marked this conversation as resolved.
Show resolved Hide resolved
} else {
return errors.New("User ID is required.")
}

err := ansi.Spinner("Deleting blocks for user...", func() error {
return cli.api.User.Unblock(inputs.userID)
})

if err != nil {
return err
}

return nil
},
}

return cmd
}
48 changes: 48 additions & 0 deletions internal/display/user_blocks.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package display

import (
"gopkg.in/auth0.v5/management"
)

type userBlockView struct {
Identifier string
IP string
}

func (v *userBlockView) AsTableHeader() []string {
return []string{"Identifier", "IP"}
}

func (v *userBlockView) AsTableRow() []string {
return []string{v.Identifier, v.IP}
}

func (v *userBlockView) KeyValues() [][]string {
return [][]string{
[]string{"Identifier", v.Identifier},
[]string{"IP", v.IP},
}
}

func (r *Renderer) UserBlocksList(userBlocks []*management.UserBlock) {
resource := "user blocks"

r.Heading(resource)

if len(userBlocks) == 0 {
r.EmptyState(resource)
return
}

var res []View

for _, userBlock := range userBlocks {
res = append(res, &userBlockView{
Identifier: *userBlock.Identifier,
IP: *userBlock.IP,
})
}

r.Results(res)

}