feat: SSH into containers through Node

insonmnia/node/config.go

@@ -9,6 +9,7 @@ import (
 	"github.com/sonm-io/core/insonmnia/logging"
 	"github.com/sonm-io/core/insonmnia/matcher"
 	"github.com/sonm-io/core/insonmnia/npp"
+	"github.com/sonm-io/core/insonmnia/ssh"
 	"github.com/sonm-io/core/optimus"
 	"github.com/sonm-io/core/util/debug"
 )
@@ -31,6 +32,7 @@ type Config struct {
 	Matcher           *matcher.YAMLConfig      `yaml:"matcher"`
 	Predictor         *optimus.PredictorConfig `yaml:"predictor"`
 	Debug             *debug.Config            `yaml:"debug"`
+	SSH               *ssh.ProxyServerConfig   `yaml:"ssh"`
 }
 
 // NewConfig loads localNode config from given .yaml file

insonmnia/node/mod.go

@@ -62,6 +62,10 @@ func New(ctx context.Context, cfg *Config, options ...Option) (*Node, error) {
 		)
 	}
 
+	if cfg.SSH != nil {
+		serverOptions = append(serverOptions, WithSSH(*cfg.SSH, transportCredentials, remoteOptions.eth.Market(), log.Sugar()))
+	}
+
 	server, err := newServer(cfg.Node, services, serverOptions...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to build Node instance: %s", err)

insonmnia/node/options.go

@@ -5,7 +5,9 @@ import (
 	"crypto/sha256"
 
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/sonm-io/core/blockchain"
 	"github.com/sonm-io/core/insonmnia/auth"
+	"github.com/sonm-io/core/insonmnia/ssh"
 	"github.com/sonm-io/core/util/rest"
 	"github.com/sonm-io/core/util/xgrpc"
 	"go.uber.org/zap"
@@ -37,12 +39,14 @@ type serverOptions struct {
 	allowREST         bool
 	optionsREST       []rest.Option
 	exposeGRPCMetrics bool
+	sshProxy          SSHServer
 	log               *zap.Logger
 }
 
 func newServerOptions() *serverOptions {
 	return &serverOptions{
-		log: zap.NewNop(),
+		sshProxy: &ssh.NilSSHProxyServer{},
+		log:      zap.NewNop(),
 	}
 }
 
@@ -89,6 +93,19 @@ func WithGRPCServerMetrics() ServerOption {
 	}
 }
 
+func WithSSH(cfg ssh.ProxyServerConfig, credentials credentials.TransportCredentials, market blockchain.MarketAPI, log *zap.SugaredLogger) ServerOption {
+	return func(o *serverOptions) error {
+		server, err := ssh.NewSSHProxyServer(cfg, credentials, market, log)
+		if err != nil {
+			return err
+		}
+
+		o.sshProxy = server
+
+		return nil
+	}
+}
+
 func WithServerLog(log *zap.Logger) ServerOption {
 	return func(o *serverOptions) error {
 		o.log = log

insonmnia/node/server.go

@@ -54,6 +54,10 @@ type Services interface {
 	Run(ctx context.Context) error
 }
 
+type SSHServer interface {
+	Serve(ctx context.Context) error
+}
+
 // Server is a server for LocalNode instance.
 //
 // Its responsibility is to manage network part, i.e. creating TCP servers and
@@ -68,6 +72,7 @@ type Server struct {
 	// Servers for processing requests.
 	serverGRPC *grpc.Server
 	serverREST *rest.Server
+	serverSSH  SSHServer
 
 	log *zap.SugaredLogger
 }
@@ -111,7 +116,8 @@ func newServer(cfg nodeConfig, services Services, options ...ServerOption) (*Ser
 			GRPC: toLocalAddrs(listenersGRPC),
 			REST: toLocalAddrs(listenersREST),
 		},
-		services: services,
+		services:  services,
+		serverSSH: opts.sshProxy,
 	}
 
 	if opts.allowGRPC {
@@ -178,7 +184,9 @@ func (m *Server) Serve(ctx context.Context) error {
 	wg.Go(func() error {
 		return m.services.Run(ctx)
 	})
-	// TODO: Also add debug server and ssh.
+	wg.Go(func() error {
+		return m.serverSSH.Serve(ctx)
+	})
 
 	<-ctx.Done()
 

insonmnia/npp/dial.go

@@ -4,6 +4,7 @@ package npp
 
 import (
 	"context"
+	"fmt"
 	"net"
 	"time"
 
@@ -105,6 +106,11 @@ func (m *Dialer) DialContext(ctx context.Context, addr auth.Addr) (net.Conn, err
 		}
 	}
 
+	if m.relayDialer == nil {
+		log.Warn("failed to connect using NPP - all methods failed")
+		return nil, fmt.Errorf("failed to connect using NPP - all methods failed")
+	}
+
 	log.Debug("connecting using Relay")
 	channel := make(chan connTuple)
 	go func() {

insonmnia/npp/options.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/sonm-io/core/insonmnia/npp/relay"
 	"github.com/sonm-io/core/insonmnia/npp/rendezvous"
+	"github.com/sonm-io/core/proto"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/credentials"
 )
@@ -23,6 +24,7 @@ type options struct {
 	nppMaxBackoffInterval time.Duration
 	relayListener         *relay.Listener
 	relayDialer           *relay.Dialer
+	protocol              string
 }
 
 func newOptions() *options {
@@ -31,6 +33,7 @@ func newOptions() *options {
 		nppBacklog:            128,
 		nppMinBackoffInterval: 500 * time.Millisecond,
 		nppMaxBackoffInterval: 8000 * time.Millisecond,
+		protocol:              sonm.DefaultNPPProtocol,
 	}
 }
 
@@ -49,7 +52,7 @@ func WithRendezvous(cfg rendezvous.Config, credentials credentials.TransportCred
 			for _, addr := range cfg.Endpoints {
 				client, err := newRendezvousClient(ctx, addr, credentials)
 				if err == nil {
-					return newNATPuncher(ctx, cfg, client, o.log)
+					return newNATPuncher(ctx, cfg, client, o.protocol, o.log)
 				}
 			}
 
@@ -112,3 +115,10 @@ func WithRelayDialer(dialer *relay.Dialer) Option {
 		return nil
 	}
 }
+
+func WithProtocol(protocol string) Option {
+	return func(o *options) error {
+		o.protocol = protocol
+		return nil
+	}
+}

insonmnia/npp/puncher.go

@@ -52,14 +52,15 @@ type natPuncher struct {
 
 	client          *rendezvousClient
 	pending         *lane.Queue
+	protocol        string
 	listener        net.Listener
 	listenerChannel chan connTuple
 
 	maxAttempts int
 	timeout     time.Duration
 }
 
-func newNATPuncher(ctx context.Context, cfg rendezvous.Config, client *rendezvousClient, log *zap.Logger) (NATPuncher, error) {
+func newNATPuncher(ctx context.Context, cfg rendezvous.Config, client *rendezvousClient, proto string, log *zap.Logger) (NATPuncher, error) {
 	// It's important here to reuse the Rendezvous client local address for
 	// successful NAT penetration in the case of cone NAT.
 	listener, err := reuseport.Listen(protocol, client.LocalAddr().String())
@@ -74,6 +75,7 @@ func newNATPuncher(ctx context.Context, cfg rendezvous.Config, client *rendezvou
 		log:             log,
 		client:          client,
 		pending:         lane.NewQueue(),
+		protocol:        proto,
 		listenerChannel: channel,
 		listener:        listener,
 
@@ -165,7 +167,7 @@ func (m *natPuncher) resolve(ctx context.Context, addr common.Address) (*sonm.Re
 	}
 
 	request := &sonm.ConnectRequest{
-		Protocol:     protocol,
+		Protocol:     m.protocol,
 		PrivateAddrs: []*sonm.Addr{},
 		ID:           addr.Bytes(),
 	}
@@ -185,6 +187,7 @@ func (m *natPuncher) publish(ctx context.Context) (*sonm.RendezvousReply, error)
 	}
 
 	request := &sonm.PublishRequest{
+		Protocol:     m.protocol,
 		PrivateAddrs: []*sonm.Addr{},
 	}
 

insonmnia/ssh/config.go

@@ -0,0 +1,11 @@
+package ssh
+
+import (
+	"github.com/sonm-io/core/insonmnia/npp"
+)
+
+// ProxyServerConfig specifies SSH proxy server configuration.
+type ProxyServerConfig struct {
+	Addr string     `yaml:"endpoint" required:"true"`
+	NPP  npp.Config `yaml:"npp" required:"true"`
+}