Skip to content

feat: add command and extra option #10

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.

Sign up for GitHub

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

Open
jaimeph wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add command and extra option #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions internal/cmd/connect/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ const (

var (
localPortForwarding string
command string
options []string
)

func NewCommand() *cobra.Command {
Expand All @@ -34,11 +36,18 @@ func NewCommand() *cobra.Command {
Short: descriptionShort,
Long: strings.ReplaceAll(descriptionLong, "\t", ""),

PreRun: func(cmd *cobra.Command, args []string) {
if cmd.Flags().Changed("local-port-forwarding") && cmd.Flags().Changed("command") {
fancy.Fatalf(CommandArgsConflict1ErrorMessage)
}
},
Run: RunCommand,
}

cmd.Flags().StringVarP(&localPortForwarding, "local-port-forwarding", "l", "",
`local port forwarding, [local_address:]local_port:destination_host:destination_port. Examples: -l 8080:localhost:80`)
cmd.Flags().StringVarP(&command, "command", "c", "", `command to execute on the remote machine. Examples: -c "ls /home/<user>/"`)
cmd.Flags().StringArrayVarP(&options, "option", "o", []string{}, `allow to add more connection options. Examples: -o ControlMaster=auto`)

return cmd
}
Expand Down Expand Up @@ -162,13 +171,22 @@ func RunCommand(cmd *cobra.Command, args []string) {
"-A", targetSessionSshUsername + "@127.0.0.1",
"-i", temporaryPrivatekeyFile}

for _, option := range options {
sshConnectionArgs = append(sshConnectionArgs, "-o", option)
}

if localPortForwarding != "" {
sshConnectionArgs = append(sshConnectionArgs, "-L", localPortForwarding)
// This line prevents the insterative shell from opening and keeps the server in background.
sshConnectionArgs = append(sshConnectionArgs, "-N")
fancy.Printf(SshLocalPortForwardingInfoMessage)
}

// Must be the last argument
if command != "" {
sshConnectionArgs = append(sshConnectionArgs, command)
}

sshCommand := exec.Command("ssh", sshConnectionArgs...)

sshCommand.Stdin = os.Stdin
Expand Down
5 changes: 5 additions & 0 deletions internal/cmd/connect/ssh/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,9 @@ const (

Press following combination to kill the connection once you don't need it:
{Bold}{White}console ~$ {Green}Cntrl + C {Reset}`

// CommandArgsConflict1ErrorMessage is the message thrown when the user is trying to establish a connection
// with both --local-port-forwarding (-l) and --command (-c) flags
CommandArgsConflict1ErrorMessage = `
{Red}You cannot use --local-port-forwarding (-l) and --command (-c) together.`
)