-
-
Notifications
You must be signed in to change notification settings - Fork 593
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR adds support for SSH access through the NetBird network without managing SSH skeys. NetBird client app has an embedded SSH server (Linux/Mac only) and a netbird ssh command.
- Loading branch information
Showing
32 changed files
with
1,702 additions
and
349 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "github.com/netbirdio/netbird/client/internal" | ||
| "github.com/netbirdio/netbird/client/proto" | ||
| nbssh "github.com/netbirdio/netbird/client/ssh" | ||
| "github.com/netbirdio/netbird/util" | ||
| log "github.com/sirupsen/logrus" | ||
| "github.com/spf13/cobra" | ||
| "os" | ||
| "os/signal" | ||
| "strings" | ||
| "syscall" | ||
| ) | ||
|
|
||
| var ( | ||
| port int | ||
| user = "netbird" | ||
| host string | ||
| ) | ||
|
|
||
| var sshCmd = &cobra.Command{ | ||
| Use: "ssh", | ||
| Args: func(cmd *cobra.Command, args []string) error { | ||
| if len(args) < 1 { | ||
| return errors.New("requires a host argument") | ||
| } | ||
|
|
||
| split := strings.Split(args[0], "@") | ||
| if len(split) == 2 { | ||
| user = split[0] | ||
| host = split[1] | ||
| } else { | ||
| host = args[0] | ||
| } | ||
|
|
||
| return nil | ||
| }, | ||
| Short: "connect to a remote SSH server", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| SetFlagsFromEnvVars() | ||
|
|
||
| cmd.SetOut(cmd.OutOrStdout()) | ||
|
|
||
| err := util.InitLog(logLevel, "console") | ||
| if err != nil { | ||
| return fmt.Errorf("failed initializing log %v", err) | ||
| } | ||
|
|
||
| if !util.IsAdmin() { | ||
| cmd.Printf("error: you must have Administrator privileges to run this command\n") | ||
| return nil | ||
| } | ||
|
|
||
| ctx := internal.CtxInitState(cmd.Context()) | ||
|
|
||
| conn, err := DialClientGRPCServer(ctx, daemonAddr) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to connect to daemon error: %v\n"+ | ||
| "If the daemon is not running please run: "+ | ||
| "\nnetbird service install \nnetbird service start\n", err) | ||
| } | ||
|
|
||
| defer func() { | ||
| err := conn.Close() | ||
| if err != nil { | ||
| log.Warnf("failed closing dameon gRPC client connection %v", err) | ||
| return | ||
| } | ||
| }() | ||
| client := proto.NewDaemonServiceClient(conn) | ||
|
|
||
| status, err := client.Status(ctx, &proto.StatusRequest{}) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to get daemon status: %v", err) | ||
| } | ||
|
|
||
| if status.Status != string(internal.StatusConnected) { | ||
| // todo maybe automatically start it? | ||
| cmd.Printf("You are disconnected from the NetBird network. Please run the UP command first to connect: \n\n" + | ||
| " netbird up \n\n") | ||
| return nil | ||
| } | ||
|
|
||
| config, err := internal.ReadConfig("", "", configPath, nil) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sig := make(chan os.Signal, 1) | ||
| signal.Notify(sig, syscall.SIGTERM, syscall.SIGINT) | ||
| sshctx, cancel := context.WithCancel(ctx) | ||
|
|
||
| go func() { | ||
| if err := runSSH(sshctx, host, []byte(config.SSHKey)); err != nil { | ||
| log.Print(err) | ||
| } | ||
| cancel() | ||
| }() | ||
|
|
||
| select { | ||
| case <-sig: | ||
| cancel() | ||
| case <-sshctx.Done(): | ||
| } | ||
|
|
||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| func runSSH(ctx context.Context, addr string, pemKey []byte) error { | ||
| c, err := nbssh.DialWithKey(fmt.Sprintf("%s:%d", addr, port), user, pemKey) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| go func() { | ||
| <-ctx.Done() | ||
| err = c.Close() | ||
| if err != nil { | ||
| return | ||
| } | ||
| }() | ||
|
|
||
| err = c.OpenTerminal() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func init() { | ||
| sshCmd.PersistentFlags().IntVarP(&port, "port", "p", nbssh.DefaultSSHPort, "Sets remote SSH port. Defaults to "+fmt.Sprint(nbssh.DefaultSSHPort)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.