Add basic SCP protocol

Author: ammario

README.md

@@ -20,3 +20,4 @@ $ coder sync ~/Projects/cdr/enterprise my-env:~/enterprise
 
 - The `coder login` flow will not work when the CLI is ran from a different network
 than the browser. #1
+- Windows doesn't work out of the box. The `scp` utility is required in PATH.

cmd/coder/login.go

@@ -11,9 +11,9 @@ import (
 	"go.coder.com/cli"
 	"go.coder.com/flog"
 
-	"cdr.dev/coder/internal/client"
-	"cdr.dev/coder/internal/config"
-	"cdr.dev/coder/internal/loginsrv"
+	"cdr.dev/coder-cli/internal/client"
+	"cdr.dev/coder-cli/internal/config"
+	"cdr.dev/coder-cli/internal/loginsrv"
 )
 
 type loginCmd struct {

cmd/coder/logout.go

@@ -7,7 +7,7 @@ import (
 	"go.coder.com/cli"
 	"go.coder.com/flog"
 
-	"cdr.dev/coder/internal/config"
+	"cdr.dev/coder-cli/internal/config"
 )
 
 type logoutCmd struct {

cmd/coder/main.go

@@ -3,6 +3,10 @@ package main
 import (
 	"github.com/spf13/pflag"
 	"go.coder.com/cli"
+	"log"
+	"os"
+	"net/http"
+	_ "net/http/pprof"
 )
 
 type rootCmd struct {
@@ -24,10 +28,15 @@ func (r *rootCmd) Subcommands() []cli.Command {
 	return []cli.Command{
 		loginCmd{},
 		logoutCmd{},
-		syncCmd{},
+		&syncCmd{},
 	}
 }
 
 func main() {
+	if os.Getenv("PPROF") != "" {
+		go func() {
+			log.Println(http.ListenAndServe("localhost:6060", nil))
+		}()
+	}
 	cli.RunRoot(&rootCmd{})
 }

cmd/coder/sync.go

@@ -1,28 +1,41 @@
 package main
 
 import (
+	"context"
+	"crypto/rand"
+	"io"
+	"io/ioutil"
 	"os"
 	"strings"
 
+	"github.com/cheggaaa/pb/v3"
 	"github.com/spf13/pflag"
 	"go.coder.com/cli"
 	"go.coder.com/flog"
 
-	"cdr.dev/coder/internal/client"
-	"cdr.dev/coder/internal/sync"
+	"cdr.dev/coder-cli/internal/client"
+	"cdr.dev/coder-cli/internal/sync"
+	"cdr.dev/coder-cli/wush"
 )
 
 type syncCmd struct {
+	init      bool
+	benchSize int64
 }
 
-func (cmd syncCmd) Spec() cli.CommandSpec {
+func (cmd *syncCmd) Spec() cli.CommandSpec {
 	return cli.CommandSpec{
 		Name:  "sync",
 		Usage: "[local directory] [<env name>:<remote directory>]",
 		Desc:  "establish a one way directory sync to a remote environment",
 	}
 }
 
+func (cmd *syncCmd) RegisterFlags(fl *pflag.FlagSet) {
+	fl.BoolVarP(&cmd.init, "init", "i", false, "do inititial transfer and exit")
+	fl.Int64Var(&cmd.benchSize, "bench", 0, "bench test the wush endpoint")
+}
+
 // userOrgs gets a list of orgs the user is apart of.
 func userOrgs(user *client.User, orgs []client.Org) []client.Org {
 	var uo []client.Org
@@ -39,7 +52,7 @@ outer:
 	return uo
 }
 
-func (cmd syncCmd) findEnv(client *client.Client, name string) client.Environment {
+func (cmd *syncCmd) findEnv(client *client.Client, name string) client.Environment {
 	me, err := client.Me()
 	if err != nil {
 		flog.Fatal("get self: %+v", err)
@@ -72,8 +85,27 @@ func (cmd syncCmd) findEnv(client *client.Client, name string) client.Environmen
 	panic("unreachable")
 }
 
-//noinspection GoImportUsedAsName
-func (cmd syncCmd) Run(fl *pflag.FlagSet) {
+func (cmd *syncCmd) bench(client *client.Client, env client.Environment) {
+	conn, err := client.Wush(env, "cat")
+	if err != nil {
+		flog.Fatal("wush failed: %v", err)
+	}
+	wc := wush.Dial(context.Background(), conn)
+	bar := pb.New64(cmd.benchSize)
+	bar.Start()
+	go io.Copy(ioutil.Discard, wc.Stdout)
+	io.Copy(
+		bar.NewProxyWriter(wc.Stdin),
+		io.LimitReader(rand.Reader, cmd.benchSize),
+	)
+	wc.Stdin.Close()
+	code, err := wc.Wait()
+	if err != nil || code != 0 {
+		flog.Error("bench: (code %v) %v", code, err)
+	}
+}
+
+func (cmd *syncCmd) Run(fl *pflag.FlagSet) {
 	var (
 		local  = fl.Arg(0)
 		remote = fl.Arg(1)
@@ -97,14 +129,21 @@ func (cmd syncCmd) Run(fl *pflag.FlagSet) {
 		flog.Fatal("remote misformmated")
 	}
 	var (
-		envName    = remoteTokens[0]
-		remotePAth = remoteTokens[1]
+		envName   = remoteTokens[0]
+		remoteDir = remoteTokens[1]
 	)
 
 	env := cmd.findEnv(client, envName)
-	_ = remotePAth
+
+	if cmd.benchSize > 0 {
+		cmd.bench(client, env)
+		return
+	}
 
 	s := sync.Sync{
+		Init:        cmd.init,
+		RemoteDir:   remoteDir,
+		LocalDir:    local,
 		Client:      client,
 		Environment: env,
 	}

go.mod

@@ -1,13 +1,17 @@
-module cdr.dev/coder
+module cdr.dev/coder-cli
 
 go 1.14
 
 require (
+	github.com/cheggaaa/pb/v3 v3.0.4
+	github.com/dustin/go-humanize v1.0.0
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
+	github.com/rjeczalik/notify v0.9.2
 	github.com/spf13/pflag v1.0.5
 	go.coder.com/cli v0.4.0
 	go.coder.com/flog v0.0.0-20190906214207-47dd47ea0512
+	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
 	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	nhooyr.io/websocket v1.8.5

go.sum

@@ -1,3 +1,11 @@
+github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
+github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
+github.com/cheggaaa/pb v1.0.28 h1:kWGpdAcSp3MxMU9CCHOwz/8V0kCHN4+9yQm2MzWuI98=
+github.com/cheggaaa/pb v2.0.7+incompatible h1:gLKifR1UkZ/kLkda5gC0K6c8g+jU2sINPtBeOiNlMhU=
+github.com/cheggaaa/pb/v3 v3.0.4 h1:QZEPYOj2ix6d5oEg63fbHmpolrnNiwjUsk+h74Yt4bM=
+github.com/cheggaaa/pb/v3 v3.0.4/go.mod h1:7rgWxLrAUcFMkvJuv09+DYi7mMUYi8nO9iOWcvGJPfw=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
@@ -12,17 +20,32 @@ github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eT
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
+github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
+github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 go.coder.com/cli v0.4.0 h1:PruDGwm/CPFndyK/eMowZG3vzg5CgohRWeXWCTr3zi8=
 go.coder.com/cli v0.4.0/go.mod h1:hRTOURCR3LJF1FRW9arecgrzX+AHG7mfYMwThPIgq+w=
 go.coder.com/flog v0.0.0-20190906214207-47dd47ea0512 h1:DjCS6dRQh+1PlfiBmnabxfdrzenb0tAwJqFxDEH/s9g=
 go.coder.com/flog v0.0.0-20190906214207-47dd47ea0512/go.mod h1:83JsYgXYv0EOaXjIMnaZ1Fl6ddNB3fJnDZ/8845mUJ8=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

internal/client/env.go

@@ -37,11 +37,10 @@ func (c Client) Wush(env Environment, cmd string, args ...string) (*websocket.Co
 	query.Set("tty", "false")
 	query.Set("stdin", "true")
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
 	defer cancel()
 
 	fullURL := u.String() + "?" + query.Encode()
-	println(fullURL)
 
 	conn, resp, err := websocket.Dial(ctx, fullURL,
 		&websocket.DialOptions{
@@ -51,7 +50,10 @@ func (c Client) Wush(env Environment, cmd string, args ...string) (*websocket.Co
 		},
 	)
 	if err != nil {
-		return nil, bodyError(resp)
+		if resp != nil {
+			return nil, bodyError(resp)
+		}
+		return nil, err
 	}
 	return conn, nil
 }

internal/sync/debugwriter.go

@@ -0,0 +1,21 @@
+package sync
+
+import (
+	"fmt"
+	"io"
+	"os"
+)
+
+type debugWriter struct {
+	Prefix string
+	W io.Writer
+}
+
+func (w debugWriter) Write(p []byte) (n int, err error) {
+	if os.Getenv("DEBUG") == "" {
+		return len(p), nil
+	}
+	_, err = fmt.Fprintf(w.W, "%v: %q\n", w.Prefix, p)
+	return len(p), err
+}
+