Upgrading the status cmd

Author: daonb

go.mod

@@ -6,7 +6,6 @@ require (
 	git.rootprojects.org/root/go-gitver/v2 v2.0.2
 	github.com/coreos/go-semver v0.3.1
 	github.com/creack/pty v1.1.20
-	github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5
 	github.com/google/uuid v1.3.1
 	github.com/gorilla/websocket v1.4.2
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
@@ -30,6 +29,7 @@ require (
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dchest/uniuri v1.2.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/kr/pretty v0.3.1 // indirect

go.sum

@@ -17,8 +17,8 @@ github.com/creack/pty v1.1.20/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 h1:RAV05c0xOkJ3dZGS0JFybxFKZ2WMLabgx3uXnd7rpGs=
-github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4=
+github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=
+github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=

sock.go

@@ -14,6 +14,7 @@ import (
 	"runtime"
 	"strings"
 	"sync"
+	"text/tabwriter"
 	"time"
 
 	"github.com/dchest/uniuri"
@@ -41,6 +42,15 @@ type LiveOffer struct {
 	p  *peers.Peer
 	id string
 }
+type CandidatePairValues struct {
+	FP             string `json:"fp"`
+	LocalAddr      string `json:"local_addr"` // IP:Port
+	LocalProtocol  string `json:"local_proto"`
+	LocalType      string `json:"local_type"`
+	RemoteAddr     string `json:"remote_addr"`
+	RemoteProtocol string `json:"remote_proto"`
+	RemoteType     string `json:"remote_type"`
+}
 
 const socketFileName = "webexec.sock"
 
@@ -194,19 +204,63 @@ func StartSocketServer(lc fx.Lifecycle, s *sockServer, params SocketStartParams)
 }
 
 func (s *sockServer) handleStatus(w http.ResponseWriter, r *http.Request) {
-	if r.Method == "GET" {
-		w.Write([]byte("READY"))
+	Logger.Info("Got status request")
+	if r.Method != "GET" {
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		return
 	}
-	/* TODO: return status of all connected peers
 	if len(peers.Peers) == 0 {
 		fmt.Println("No peers connected")
-	} else {
-		fmt.Println("Connected peers:")
-		for _, peer := range peers.Peers {
-			fmt.Printf("  %s", peer.FP)
+		return
+	}
+	var ret []CandidatePairValues
+	fmt.Println("Connected peers:")
+	for _, peer := range peers.Peers {
+		if peer.PC == nil {
+			continue
 		}
+		stats := peer.PC.GetStats()
+		for _, report := range stats {
+			pairStats, ok := report.(webrtc.ICECandidatePairStats)
+			if !ok || pairStats.Type != webrtc.StatsTypeCandidatePair {
+				continue
+			}
+			// check if it is selected
+			if pairStats.State != webrtc.StatsICECandidatePairStateSucceeded {
+				continue
+			}
+			local, ok := stats[pairStats.LocalCandidateID].(webrtc.ICECandidateStats)
+			if !ok {
+				http.Error(w, "Failed to get local candidate", http.StatusInternalServerError)
+				return
+			}
+			remote, ok := stats[pairStats.RemoteCandidateID].(webrtc.ICECandidateStats)
+			if !ok {
+				http.Error(w, "Failed to get remote candidate", http.StatusInternalServerError)
+				return
+			}
+			ret = append(ret, CandidatePairValues{
+				FP:             peer.FP,
+				LocalAddr:      fmt.Sprintf("%s:%d", local.IP, local.Port),
+				LocalProtocol:  local.Protocol,
+				LocalType:      local.CandidateType.String(),
+				RemoteAddr:     fmt.Sprintf("%s:%d", remote.IP, remote.Port),
+				RemoteProtocol: remote.Protocol,
+				RemoteType:     remote.CandidateType.String(),
+			})
+			break
+		}
+	}
+	if ret == nil {
+		// no peers are connected, return an empty response
+		ret = []CandidatePairValues{}
+	}
+	b, err := json.Marshal(ret)
+	if err != nil {
+		http.Error(w, "Failed to marshal response", http.StatusInternalServerError)
+		return
 	}
-	*/
+	w.Write(b)
 }
 func (s *sockServer) handleLayout(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "GET" {
@@ -401,3 +455,13 @@ func writeClipboard(data []byte, mimeType string) error {
 	}
 	return cmd.Wait()
 }
+
+// const ELLIPSIS = "\uf141"
+func writeICEPairsHeader(w *tabwriter.Writer) {
+	fmt.Fprintln(w, "Finger\uf141\tAddr\tProtocol\tType\t\uf141\tAddr\tProtocol\tType")
+}
+func (p *CandidatePairValues) Write(w *tabwriter.Writer) {
+	fp := fmt.Sprintf("%s\uf141", string([]rune(p.FP)[:6]))
+	fmt.Fprintln(w, strings.Join([]string{fp, p.LocalAddr, p.LocalProtocol,
+		p.LocalType, "->", p.RemoteAddr, p.RemoteProtocol, p.RemoteType}, "\t"))
+}

webexec.go

@@ -18,6 +18,7 @@ import (
 	"strings"
 	"sync"
 	"syscall"
+	"text/tabwriter"
 	"time"
 
 	"github.com/coreos/go-semver/semver"
@@ -345,6 +346,17 @@ func restart(c *cli.Context) error {
 	return start(c)
 }
 
+// newSocketClient creates a new http client for the unix socket
+func newSocketClient() http.Client {
+	return http.Client{
+		Transport: &http.Transport{
+			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
+				return net.Dial("unix", GetSockFP())
+			},
+		},
+	}
+}
+
 // accept function accepts offers to connect
 func accept(c *cli.Context) error {
 	certs, err := GetCerts()
@@ -355,7 +367,7 @@ func accept(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	fp := GetSockFP()
+
 	pid, err := getAgentPid()
 	if err != nil {
 		return err
@@ -373,13 +385,7 @@ func accept(c *cli.Context) error {
 			return fmt.Errorf("Failed to fork agent: %s", err)
 		}
 	}
-	httpc := http.Client{
-		Transport: &http.Transport{
-			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
-				return net.Dial("unix", fp)
-			},
-		},
-	}
+	httpc := newSocketClient()
 	// First get the agent's status and print to the clist
 	var msg string
 	var r *http.Response
@@ -523,7 +529,7 @@ func getAgentPid() (int, error) {
 	}
 	return pidf.Read()
 }
-func status(c *cli.Context) error {
+func statusCMD(c *cli.Context) error {
 	pid, err := getAgentPid()
 	if err != nil {
 		return err
@@ -540,6 +546,28 @@ func status(c *cli.Context) error {
 	} else {
 		fmt.Printf("Fingerprint:  %s\n", fp)
 	}
+	httpc := newSocketClient()
+	resp, err := httpc.Get("http://unix/status")
+	if err != nil {
+		return fmt.Errorf("Failed to get the agent's status: %s", err)
+	}
+	var pairs []CandidatePairValues
+	// read the response into pair usin json.NewDecoder
+	err = json.NewDecoder(resp.Body).Decode(&pairs)
+	if err != nil {
+		if err == io.EOF {
+			fmt.Println("No connected peers")
+			return nil
+		}
+		return fmt.Errorf("Failed to decode the agent's status: %s", err)
+	}
+	fmt.Println("\nConnected peers:")
+	w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
+	writeICEPairsHeader(w)
+	for _, pair := range pairs {
+		pair.Write(w)
+	}
+	w.Flush()
 	return nil
 }
 func initCMD(c *cli.Context) error {
@@ -767,7 +795,7 @@ func main() {
 			}, {
 				Name:   "status",
 				Usage:  "webexec agent's status",
-				Action: status,
+				Action: statusCMD,
 			}, {
 				Name:   "stop",
 				Usage:  "stop the user's agent",