Skip to content

Commit

Permalink
Merge pull request #3410 from pachyderm/flag-disable-implicit-port-fo…
Browse files Browse the repository at this point in the history 
…rwarding

Flag to disable implicit port forwarding
  • Loading branch information
@ysimonson
ysimonson committed Jan 29, 2019
2 parents eb95e6a + b9a0551 commit 2b3ecb3
Show file tree
Hide file tree
Showing 13 changed files with 191 additions and 196 deletions.
10 changes: 4 additions & 6 deletions src/server/admin/cmds/cmds.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ const (
)

// Cmds returns a slice containing admin commands.
func Cmds(noMetrics *bool) []*cobra.Command {
metrics := !*noMetrics

func Cmds(metrics bool, portForwarding bool) []*cobra.Command {
var noObjects bool
var url string
extract := &cobra.Command{
Expand All @@ -32,7 +30,7 @@ pachctl extract >backup
# Extract to s3:
pachctl extract -u s3://bucket/backup` + codeend,
Run: cmdutil.RunFixedArgs(0, func(args []string) (retErr error) {
c, err := client.NewOnUserMachine(metrics, true, "user")
c, err := client.NewOnUserMachine(metrics, portForwarding, "user")
if err != nil {
return err
}
Expand Down Expand Up @@ -61,7 +59,7 @@ pachctl restore <backup
# Restore from s3:
pachctl restore -u s3://bucket/backup` + codeend,
Run: cmdutil.RunFixedArgs(0, func(args []string) error {
c, err := client.NewOnUserMachine(metrics, true, "user")
c, err := client.NewOnUserMachine(metrics, portForwarding, "user")
if err != nil {
return err
}
Expand All @@ -85,7 +83,7 @@ pachctl restore -u s3://bucket/backup` + codeend,
Short: "Returns info about the pachyderm cluster",
Long: "Returns info about the pachyderm cluster",
Run: cmdutil.RunFixedArgs(0, func(args []string) error {
c, err := client.NewOnUserMachine(metrics, true, "user")
c, err := client.NewOnUserMachine(metrics, portForwarding, "user")
if err != nil {
return err
}
Expand Down
62 changes: 31 additions & 31 deletions src/server/auth/cmds/cmds.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func writePachTokenToCfg(token string) error {
}

// ActivateCmd returns a cobra.Command to activate Pachyderm's auth system
func ActivateCmd() *cobra.Command {
func ActivateCmd(portForwarding bool) *cobra.Command {
var initialAdmin string
activate := &cobra.Command{
Use: "activate",
Expand All @@ -72,7 +72,7 @@ first cluster admin`[1:],
fmt.Println("Retrieving Pachyderm token...")

// Exchange GitHub token for Pachyderm token
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand Down Expand Up @@ -110,7 +110,7 @@ cluster`[1:])

// DeactivateCmd returns a cobra.Command to delete all ACLs, tokens, and admins,
// deactivating Pachyderm's auth system
func DeactivateCmd() *cobra.Command {
func DeactivateCmd(portForwarding bool) *cobra.Command {
deactivate := &cobra.Command{
Use: "deactivate",
Short: "Delete all ACLs, tokens, and admins, and deactivate Pachyderm auth",
Expand All @@ -124,7 +124,7 @@ func DeactivateCmd() *cobra.Command {
if !strings.Contains("yY", confirm[:1]) {
return fmt.Errorf("operation aborted")
}
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand All @@ -139,7 +139,7 @@ func DeactivateCmd() *cobra.Command {
// LoginCmd returns a cobra.Command to login to a Pachyderm cluster with your
// GitHub account. Any resources that have been restricted to the email address
// registered with your GitHub account will subsequently be accessible.
func LoginCmd() *cobra.Command {
func LoginCmd(portForwarding bool) *cobra.Command {
var useOTP bool
login := &cobra.Command{
Use: "login",
Expand All @@ -148,7 +148,7 @@ func LoginCmd() *cobra.Command {
"the account you have with your ID provider (e.g. GitHub, Okta) " +
"account will subsequently be accessible.",
Run: cmdutil.Run(func([]string) error {
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand Down Expand Up @@ -229,13 +229,13 @@ func LogoutCmd() *cobra.Command {
// WhoamiCmd returns a cobra.Command that deletes your local Pachyderm
// credential, logging you out of your cluster. Note that this is not necessary
// to do before logging in as another user, but is useful for testing.
func WhoamiCmd() *cobra.Command {
func WhoamiCmd(portForwarding bool) *cobra.Command {
whoami := &cobra.Command{
Use: "whoami",
Short: "Print your Pachyderm identity",
Long: "Print your Pachyderm identity.",
Run: cmdutil.Run(func([]string) error {
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand All @@ -259,7 +259,7 @@ func WhoamiCmd() *cobra.Command {

// CheckCmd returns a cobra command that sends an "Authorize" RPC to Pachd, to
// determine whether the specified user has access to the specified repo.
func CheckCmd() *cobra.Command {
func CheckCmd(portForwarding bool) *cobra.Command {
check := &cobra.Command{
Use: "check (none|reader|writer|owner) repo",
Short: "Check whether you have reader/writer/etc-level access to 'repo'",
Expand All @@ -275,7 +275,7 @@ func CheckCmd() *cobra.Command {
return err
}
repo := args[1]
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand All @@ -296,7 +296,7 @@ func CheckCmd() *cobra.Command {

// GetCmd returns a cobra command that gets either the ACL for a Pachyderm
// repo or another user's scope of access to that repo
func GetCmd() *cobra.Command {
func GetCmd(portForwarding bool) *cobra.Command {
setScope := &cobra.Command{
Use: "get [username] repo",
Short: "Get the ACL for 'repo' or the access that 'username' has to 'repo'",
Expand All @@ -307,7 +307,7 @@ func GetCmd() *cobra.Command {
"Pachyderm authentication uses GitHub OAuth, so 'username' must be a " +
"GitHub username",
Run: cmdutil.RunBoundedArgs(1, 2, func(args []string) error {
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand Down Expand Up @@ -343,7 +343,7 @@ func GetCmd() *cobra.Command {

// SetScopeCmd returns a cobra command that lets a user set the level of access
// that another user has to a repo
func SetScopeCmd() *cobra.Command {
func SetScopeCmd(portForwarding bool) *cobra.Command {
setScope := &cobra.Command{
Use: "set username (none|reader|writer|owner) repo",
Short: "Set the scope of access that 'username' has to 'repo'",
Expand All @@ -361,7 +361,7 @@ func SetScopeCmd() *cobra.Command {
return err
}
username, repo := args[0], args[2]
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand All @@ -378,13 +378,13 @@ func SetScopeCmd() *cobra.Command {
}

// ListAdminsCmd returns a cobra command that lists the current cluster admins
func ListAdminsCmd() *cobra.Command {
func ListAdminsCmd(portForwarding bool) *cobra.Command {
listAdmins := &cobra.Command{
Use: "list-admins",
Short: "List the current cluster admins",
Long: "List the current cluster admins",
Run: cmdutil.Run(func([]string) error {
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return err
}
Expand All @@ -404,7 +404,7 @@ func ListAdminsCmd() *cobra.Command {

// ModifyAdminsCmd returns a cobra command that modifies the set of current
// cluster admins
func ModifyAdminsCmd() *cobra.Command {
func ModifyAdminsCmd(portForwarding bool) *cobra.Command {
var add []string
var remove []string
modifyAdmins := &cobra.Command{
Expand All @@ -414,7 +414,7 @@ func ModifyAdminsCmd() *cobra.Command {
"separated list of users to grant admin status, and --remove accepts a " +
"comma-separated list of users to revoke admin status",
Run: cmdutil.Run(func([]string) error {
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return err
}
Expand All @@ -440,7 +440,7 @@ func ModifyAdminsCmd() *cobra.Command {

// GetAuthTokenCmd returns a cobra command that lets a user get a pachyderm
// token on behalf of themselves or another user
func GetAuthTokenCmd() *cobra.Command {
func GetAuthTokenCmd(portForwarding bool) *cobra.Command {
var quiet bool
getAuthToken := &cobra.Command{
Use: "get-auth-token username",
Expand All @@ -449,7 +449,7 @@ func GetAuthTokenCmd() *cobra.Command {
"this can only be called by cluster admins",
Run: cmdutil.RunFixedArgs(1, func(args []string) error {
subject := args[0]
c, err := client.NewOnUserMachine(true, true, "user")
c, err := client.NewOnUserMachine(true, portForwarding, "user")
if err != nil {
return fmt.Errorf("could not connect: %v", err)
}
Expand Down Expand Up @@ -498,23 +498,23 @@ func UseAuthTokenCmd() *cobra.Command {

// Cmds returns a list of cobra commands for authenticating and authorizing
// users in an auth-enabled Pachyderm cluster.
func Cmds() []*cobra.Command {
func Cmds(portForwarding bool) []*cobra.Command {
auth := &cobra.Command{
Use: "auth",
Short: "Auth commands manage access to data in a Pachyderm cluster",
Long: "Auth commands manage access to data in a Pachyderm cluster",
}
auth.AddCommand(ActivateCmd())
auth.AddCommand(DeactivateCmd())
auth.AddCommand(LoginCmd())
auth.AddCommand(ActivateCmd(portForwarding))
auth.AddCommand(DeactivateCmd(portForwarding))
auth.AddCommand(LoginCmd(portForwarding))
auth.AddCommand(LogoutCmd())
auth.AddCommand(WhoamiCmd())
auth.AddCommand(CheckCmd())
auth.AddCommand(SetScopeCmd())
auth.AddCommand(GetCmd())
auth.AddCommand(ListAdminsCmd())
auth.AddCommand(ModifyAdminsCmd())
auth.AddCommand(GetAuthTokenCmd())
auth.AddCommand(WhoamiCmd(portForwarding))
auth.AddCommand(CheckCmd(portForwarding))
auth.AddCommand(SetScopeCmd(portForwarding))
auth.AddCommand(GetCmd(portForwarding))
auth.AddCommand(ListAdminsCmd(portForwarding))
auth.AddCommand(ModifyAdminsCmd(portForwarding))
auth.AddCommand(GetAuthTokenCmd(portForwarding))
auth.AddCommand(UseAuthTokenCmd())
auth.AddCommand(GetConfig())
auth.AddCommand(SetConfig())
Expand Down

0 comments on commit 2b3ecb3

Please sign in to comment.