Merge pull request #208 from evanlinjin/fix/dmsgpty-ui-https-#206

Updated hypervisor to work with TLS and updated to latest dmsg.

cmd/hypervisor/commands/root.go

@@ -61,9 +61,17 @@ var rootCmd = &cobra.Command{
 			prepareDmsg(hv, conf)
 		}
 
-		// Serve HTTP.
-		log.WithField("http_addr", conf.HTTPAddr).Info("Serving HTTP.")
-		if err := http.ListenAndServe(conf.HTTPAddr, hv); err != nil {
+		// Serve HTTP(s).
+		log := log.
+			WithField("addr", conf.HTTPAddr).
+			WithField("tls", conf.EnableTLS)
+		log.Info("Serving hypervisor...")
+		if conf.EnableTLS {
+			err = http.ListenAndServeTLS(conf.HTTPAddr, conf.TLSCertFile, conf.TLSKeyFile, hv)
+		} else {
+			err = http.ListenAndServe(conf.HTTPAddr, hv)
+		}
+		if err != nil {
 			log.WithError(err).Fatal("Hypervisor exited with error.")
 		}
 		log.Info("Good bye!")

cmd/skywire-cli/commands/mdisc/root.go

@@ -62,11 +62,11 @@ var availableServersCmd = &cobra.Command{
 
 func printAvailableServers(entries []*disc.Entry) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 5, ' ', tabwriter.TabIndent)
-	_, err := fmt.Fprintln(w, "version\tregistered\tpublic-key\taddress\tport\tconns")
+	_, err := fmt.Fprintln(w, "version\tregistered\tpublic-key\taddress\tavailable-sessions")
 	internal.Catch(err)
 	for _, entry := range entries {
-		_, err := fmt.Fprintf(w, "%s\t%d\t%s\t%s\t%s\t%d\n",
-			entry.Version, entry.Timestamp, entry.Static, entry.Server.Address, entry.Server.Port, entry.Server.AvailableConnections)
+		_, err := fmt.Fprintf(w, "%s\t%d\t%s\t%s\t%d\n",
+			entry.Version, entry.Timestamp, entry.Static, entry.Server.Address, entry.Server.AvailableSessions)
 		internal.Catch(err)
 	}
 	internal.Catch(w.Flush())

go.mod

@@ -3,7 +3,7 @@ module github.com/SkycoinProject/skywire-mainnet
 go 1.13
 
 require (
-	github.com/SkycoinProject/dmsg v0.0.0-20200305081343-7a67392d759d
+	github.com/SkycoinProject/dmsg v0.0.0-20200306131535-fabb2c8177e9
 	github.com/SkycoinProject/skycoin v0.27.0
 	github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5

go.sum

@@ -1,8 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/SkycoinProject/dmsg v0.0.0-20200305081343-7a67392d759d h1:2vjoH2HOsRRvqvXQb2K4uQnqaMRJnYiDpsfCRxixzvs=
-github.com/SkycoinProject/dmsg v0.0.0-20200305081343-7a67392d759d/go.mod h1:DzykXMLlx6Fx0fGjZsCIRas/MIvxW8DZpmDA6f2nCRk=
+github.com/SkycoinProject/dmsg v0.0.0-20200306131535-fabb2c8177e9 h1:ce/1vcQhEX+8TkwX4PUUE2BVHA4sHNCPf8af7OVhPVE=
+github.com/SkycoinProject/dmsg v0.0.0-20200306131535-fabb2c8177e9/go.mod h1:DzykXMLlx6Fx0fGjZsCIRas/MIvxW8DZpmDA6f2nCRk=
 github.com/SkycoinProject/skycoin v0.26.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo=
 github.com/SkycoinProject/skycoin v0.27.0 h1:N3IHxj8ossHOcsxLYOYugT+OaELLncYHJHxbbYLPPmY=
 github.com/SkycoinProject/skycoin v0.27.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo=

pkg/hypervisor/config.go

@@ -51,6 +51,9 @@ type Config struct {
 	DmsgDiscovery string        `json:"dmsg_discovery"` // Dmsg discovery address.
 	DmsgPort      uint16        `json:"dmsg_port"`      // Dmsg port to serve on.
 	HTTPAddr      string        `json:"http_addr"`      // HTTP address to serve API/web UI on.
+	EnableTLS     bool          `json:"enable_tls"`     // Whether to enable TLS.
+	TLSCertFile   string        `json:"tls_cert_file"`  // TLS cert file location.
+	TLSKeyFile    string        `json:"tls_key_file"`   // TLS key file location.
 }
 
 func makeConfig(testenv bool) Config {

pkg/snet/snettest/env.go

@@ -136,7 +136,7 @@ func createDmsgSrv(t *testing.T, dc disc.APIClient) (srv *dmsg.Server, srvErr <-
 	require.NoError(t, err)
 	l, err := nettest.NewLocalListener("tcp")
 	require.NoError(t, err)
-	srv = dmsg.NewServer(pk, sk, dc)
+	srv = dmsg.NewServer(pk, sk, dc, 100)
 	errCh := make(chan error, 1)
 	go func() {
 		errCh <- srv.Serve(l, "")