Update webapp to use make's binary location (#64)

* Update webapp to use make's binary lcoation

* reworked to use cwd

* remove apps build, warn users when missing apps

Author: mwfarb

webapp/lib/config.go

@@ -13,9 +13,12 @@ import (
 	. "github.com/netsec-ethz/scion-apps/webapp/util"
 )
 
-// SCIONROOT is the root location on the scion infrastructure.
+// SCIONROOT is the root location of the scion infrastructure.
 var SCIONROOT = "src/github.com/scionproto/scion"
 
+// LABROOT is the root location of scionlab apps.
+var LABROOT = "src/github.com/netsec-ethz/scion-apps"
+
 // GOPATH is the root of the GOPATH environment.
 var GOPATH = os.Getenv("GOPATH")
 

webapp/static/js/webapp.js

@@ -308,7 +308,7 @@ function manageTestData() {
                 if (d.graph != null) {
                     // write data on graph
                     for (var i = 0; i < d.graph.length; i++) {
-                        if (d.graph[i].Log != null) {
+                        if (d.graph[i].Log != null && d.graph[i].Log != "") {
                             // result returned, display it and reset progress
                             handleEndCmdDisplay(d.graph[i].Log);
                         }

webapp/webapp.go

@@ -4,7 +4,7 @@ package main
 
 import (
 	"bufio"
-	"bytes"
+	"errors"
 	"flag"
 	"fmt"
 	"html/template"
@@ -255,12 +255,12 @@ func parseRequest2BwtestItem(r *http.Request, appSel string) (*model.BwTestItem,
 
 func parseBwTest2Cmd(d *model.BwTestItem, appSel string, pathStr string) []string {
 	var command []string
-	binname := getClientLocationBin(appSel)
+	installpath := getClientLocationBin(appSel)
 	switch appSel {
 	case "bwtester", "camerapp", "sensorapp":
 		optClient := fmt.Sprintf("-c=%s,[%s]:%d", d.CIa, d.CAddr, d.CPort)
 		optServer := fmt.Sprintf("-s=%s,[%s]:%d", d.SIa, d.SAddr, d.SPort)
-		command = append(command, binname, optServer, optClient)
+		command = append(command, installpath, optServer, optClient)
 		if appSel == "bwtester" {
 			bwCS := fmt.Sprintf("-cs=%d,%d,%d,%dbps", d.CSDuration/1000, d.CSPktSize,
 				d.CSPackets, d.CSBandwidth)
@@ -360,6 +360,7 @@ func executeCommand(w http.ResponseWriter, r *http.Request) {
 	// execute scion go client app with client/server commands
 	log.Info("Executing:", "command", strings.Join(command, " "))
 	cmd := exec.Command(command[0], command[1:]...)
+	cmd.Dir = getClientCwd(appSel)
 
 	log.Info("Chosen Path:", "pathStr", pathStr)
 
@@ -373,64 +374,50 @@ func executeCommand(w http.ResponseWriter, r *http.Request) {
 	err = cmd.Start()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to start err=%v", err)
+		if w != nil {
+			w.Write([]byte(err.Error() + "\n"))
+		}
 	}
 	go writeCmdOutput(w, reader, stdin, d, appSel, pathStr, cmd)
 	cmd.Wait()
 }
 
 func appsBuildCheck(app string) {
-	binname := getClientLocationBin(app)
-	installpath := path.Join(lib.GOPATH, "bin", binname)
-	// check for install, and install only if needed
+	installpath := getClientLocationBin(app)
 	if _, err := os.Stat(installpath); os.IsNotExist(err) {
-		filepath := getClientLocationSrc(app)
-		cmd := exec.Command("go", "install")
-		cmd.Dir = path.Dir(filepath)
-		log.Info(fmt.Sprintf("Installing %s...", filepath))
-		var stdout, stderr bytes.Buffer
-		cmd.Stdout = &stdout
-		cmd.Stderr = &stderr
-		err := cmd.Run()
 		CheckError(err)
-		outStr, errStr := string(stdout.Bytes()), string(stderr.Bytes())
-		if len(outStr) > 0 {
-			log.Info(outStr)
-		}
-		if len(errStr) > 0 {
-			log.Error(errStr)
-		}
+		CheckError(errors.New("App missing, build all apps with 'deps.sh' and 'make'."))
 	} else {
 		log.Info(fmt.Sprintf("Existing install, found %s...", app))
 	}
 }
 
-// Parses html selection and returns name of app binary.
-func getClientLocationBin(app string) string {
-	var binname string
+// Parses html selection and returns current working directory for execution.
+func getClientCwd(app string) string {
+	var cwd string
 	switch app {
 	case "sensorapp":
-		binname = "sensorfetcher"
+		cwd = path.Join(lib.GOPATH, lib.LABROOT, "sensorapp/sensorfetcher")
 	case "camerapp":
-		binname = "imagefetcher"
+		cwd = path.Join(lib.GOPATH, lib.LABROOT, "camerapp/imagefetcher")
 	case "bwtester":
-		binname = "bwtestclient"
+		cwd = path.Join(lib.GOPATH, lib.LABROOT, "bwtester/bwtestclient")
 	}
-	return binname
+	return cwd
 }
 
-// Parses html selection and returns location of app source.
-func getClientLocationSrc(app string) string {
-	slroot := "src/github.com/netsec-ethz/scion-apps"
-	var filepath string
+// Parses html selection and returns name of app binary.
+func getClientLocationBin(app string) string {
+	var binname string
 	switch app {
 	case "sensorapp":
-		filepath = path.Join(lib.GOPATH, slroot, "sensorapp/sensorfetcher/sensorfetcher.go")
+		binname = path.Join(lib.GOPATH, lib.LABROOT, "sensorapp/sensorfetcher/sensorfetcher")
 	case "camerapp":
-		filepath = path.Join(lib.GOPATH, slroot, "camerapp/imagefetcher/imagefetcher.go")
+		binname = path.Join(lib.GOPATH, lib.LABROOT, "camerapp/imagefetcher/imagefetcher")
 	case "bwtester":
-		filepath = path.Join(lib.GOPATH, slroot, "bwtester/bwtestclient/bwtestclient.go")
+		binname = path.Join(lib.GOPATH, lib.LABROOT, "bwtester/bwtestclient/bwtestclient")
 	}
-	return filepath
+	return binname
 }
 
 // Handles piping command line output to logs, database, and http response writer.