Packaging for Scionlab Next Version

mwfarb · juagargi · commit ee1140fb7637 · 2019-10-03T12:06:36.000+02:00
diff --git a/webapp/lib/config.go b/webapp/lib/config.go
@@ -17,15 +17,6 @@ import (
 	. "github.com/netsec-ethz/scion-apps/webapp/util"
 )
 
-// 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")
-
 // default params for localhost testing
 var serIaDef = "1-ff00:0:112"
 var cliPortDef = "30001"
@@ -68,11 +59,11 @@ func ReadUserSetting(srcpath string) UserSetting {
 }
 
 // ScanLocalIAs will load list of locally available IAs
-func ScanLocalIAs() []string {
+func ScanLocalIAs(scionRoot string) []string {
 	var localIAs []string
 	var reIaFilePathCap = `\/ISD([0-9]+)\/AS(\w+)`
 	re := regexp.MustCompile(reIaFilePathCap)
-	var searchPath = path.Join(GOPATH, SCIONROOT, "gen")
+	var searchPath = path.Join(scionRoot, "gen")
 	filepath.Walk(searchPath, func(path string, f os.FileInfo, _ error) error {
 		if f != nil && f.IsDir() {
 			capture := re.FindStringSubmatch(path)
diff --git a/webapp/lib/image.go b/webapp/lib/image.go
@@ -72,8 +72,8 @@ func findNewestFileExt(dir, extRegEx string) (imgFilename string, imgTimestamp i
 }
 
 // FindImageInfoHandler locating most recent image and writing text info data about it.
-func FindImageInfoHandler(w http.ResponseWriter, r *http.Request) {
-	filesDir := path.Join(GOPATH, LABROOT, "webapp/data/images")
+func FindImageInfoHandler(w http.ResponseWriter, r *http.Request, staticRoot string) {
+	filesDir := path.Join(staticRoot, "data/images")
 	imgFilename, _ := findNewestFileExt(filesDir, regexImageFiles)
 	if imgFilename == "" {
 		return
@@ -83,8 +83,8 @@ func FindImageInfoHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 // FindImageHandler locating most recent image formatting it for graphic display in response.
-func FindImageHandler(w http.ResponseWriter, r *http.Request, browserAddr string, port int) {
-	filesDir := path.Join(GOPATH, LABROOT, "webapp/data/images")
+func FindImageHandler(w http.ResponseWriter, r *http.Request, staticRoot string, browserAddr string, port int) {
+	filesDir := path.Join(staticRoot, "data/images")
 	imgFilename, _ := findNewestFileExt(filesDir, regexImageFiles)
 	if imgFilename == "" {
 		fmt.Fprint(w, "Error: Unable to find image file locally.")
diff --git a/webapp/lib/sciond.go b/webapp/lib/sciond.go
@@ -82,7 +82,7 @@ func getNetworkByIA(iaCli string) (*snet.SCIONNetwork, error) {
 // sciond data sources and calls
 
 // PathTopoHandler handles requests for paths, returning results from sciond.
-func PathTopoHandler(w http.ResponseWriter, r *http.Request) {
+func PathTopoHandler(w http.ResponseWriter, r *http.Request, scionRoot string) {
 	r.ParseForm()
 	SIa := r.PostFormValue("ia_ser")
 	CIa := r.PostFormValue("ia_cli")
@@ -116,7 +116,7 @@ func PathTopoHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Since segments data is supplimentary to paths data, if segments data
 	// fails, provide the error, but we must still allow paths data to return.
-	segments, err := getSegmentsJSON(*clientCCAddr)
+	segments, err := getSegmentsJSON(*clientCCAddr, scionRoot)
 	if CheckError(err) {
 		returnPathHandler(w, paths, nil, err)
 		return
@@ -126,9 +126,9 @@ func PathTopoHandler(w http.ResponseWriter, r *http.Request) {
 	returnPathHandler(w, paths, segments, err)
 }
 
-func getSegmentsJSON(local snet.Addr) ([]byte, error) {
+func getSegmentsJSON(local snet.Addr, scionRoot string) ([]byte, error) {
 	// load segments from paths database
-	var dbSrcFile = findDBFilename(local.IA)
+	var dbSrcFile = findDBFilename(local.IA, scionRoot)
 	dbTmpFile, err := copyDBToTemp(dbSrcFile)
 	if err != nil {
 		return nil, err
@@ -168,15 +168,14 @@ func getSegmentsJSON(local snet.Addr) ([]byte, error) {
 	return jsonSegsInfo, nil
 }
 
-func findDBFilename(ia addr.IA) string {
-	filenames, err := filepath.Glob(filepath.Join(
-		GOPATH, SCIONROOT, "gen-cache", "ps*path.db"))
+func findDBFilename(ia addr.IA, scionRoot string) string {
+	filenames, err := filepath.Glob(filepath.Join(scionRoot, "gen-cache", "ps*path.db"))
 	CheckError(err)
 	if len(filenames) == 1 {
 		return filenames[0]
 	}
 	pathDBFileName := fmt.Sprintf("ps%s-1.path.db", ia.FileFmt(false))
-	return filepath.Join(GOPATH, SCIONROOT, "gen-cache", pathDBFileName)
+	return filepath.Join(scionRoot, "gen-cache", pathDBFileName)
 }
 
 // returns the name of the created file
@@ -289,10 +288,10 @@ func AsTopoHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 // TrcHandler handles requests for all local trust root data.
-func TrcHandler(w http.ResponseWriter, r *http.Request) {
+func TrcHandler(w http.ResponseWriter, r *http.Request, scionRoot string) {
 	r.ParseForm()
 	CIa := r.PostFormValue("src")
-	raw, err := loadJSONCerts(CIa, "*.trc")
+	raw, err := loadJSONCerts(CIa, "*.trc", scionRoot)
 	if CheckError(err) {
 		returnError(w, err)
 		return
@@ -302,10 +301,10 @@ func TrcHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 // CrtHandler handles requests for all local certificate data.
-func CrtHandler(w http.ResponseWriter, r *http.Request) {
+func CrtHandler(w http.ResponseWriter, r *http.Request, scionRoot string) {
 	r.ParseForm()
 	CIa := r.PostFormValue("src")
-	raw, err := loadJSONCerts(CIa, "*.crt")
+	raw, err := loadJSONCerts(CIa, "*.crt", scionRoot)
 	if CheckError(err) {
 		returnError(w, err)
 		return
@@ -314,14 +313,13 @@ func CrtHandler(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, string(raw))
 }
 
-func loadJSONCerts(src, pattern string) ([]byte, error) {
+func loadJSONCerts(src, pattern string, scionRoot string) ([]byte, error) {
 	ia, err := addr.IAFromString(src)
 	if err != nil {
 		return nil, err
 	}
-	certDir := path.Join(GOPATH, SCIONROOT,
-		fmt.Sprintf("gen/ISD%d/AS%s/endhost/certs", ia.I, ia.A.FileFmt()))
-	cacheDir := path.Join(GOPATH, SCIONROOT, "gen-cache")
+	certDir := path.Join(scionRoot, fmt.Sprintf("gen/ISD%d/AS%s/endhost/certs", ia.I, ia.A.FileFmt()))
+	cacheDir := path.Join(scionRoot, "gen-cache")
 	files, err := filepath.Glob(fmt.Sprintf("%s/%s", certDir, pattern))
 	if err != nil {
 		return nil, err
diff --git a/webapp/tests/health/beaconstest.sh b/webapp/tests/health/beaconstest.sh
@@ -12,7 +12,7 @@ iaFile=$(echo $1 | sed "s/:/_/g")
 echo "IA found: $iaFile"
 
 # format log file and beacons grep string
-logfile=~/go/src/github.com/scionproto/scion/logs/bs${iaFile}-1.DEBUG
+logfile=$SC/logs/bs${iaFile}-1.DEBUG
 echo "Log: $logfile"
 
 # seek last log entry for verified PCBs
diff --git a/webapp/webapp.go b/webapp/webapp.go
@@ -30,16 +30,24 @@ import (
 	. "github.com/netsec-ethz/scion-apps/webapp/util"
 )
 
+// GOPATH is the root of the GOPATH environment.
+var GOPATH = os.Getenv("GOPATH")
+
 // browseRoot is browse-only, consider security (def: cwd)
 var browseRoot = flag.String("r", ".",
 	"Root path to browse from, CAUTION: read-access granted from -a and -p.")
 
-// staticRoot for serving/writing static data (def: cwd)
-var staticRoot = flag.String("s", ".",
+// staticRoot for serving/writing static data
+var staticRoot = flag.String("s", path.Join(GOPATH, "src/github.com/netsec-ethz/scion-apps/webapp"),
 	"Static path of web server files (local repo scion-apps/webapp).")
 
-// cwdPath - this is where images are going, this is runtime (record, no settings)
-var cwdPath = "."
+// scionRoot is the root location of the scion infrastructure.
+var scionRoot = flag.String("i", path.Join(GOPATH, "src/github.com/scionproto/scion"),
+	"the root location of the scion infrastructure.")
+
+// appsRoot is the root location of scionlab apps.
+var appsRoot = flag.String("l", path.Join(GOPATH, "bin"),
+	"the root location of scionlab apps.")
 
 var addr = flag.String("a", "127.0.0.1", "Address of server host.")
 var port = flag.Int("p", 8000, "Port of server host.")
@@ -154,7 +162,7 @@ func main() {
 
 // load list of locally available IAs and determine user choices
 func initLocalIaOptions() {
-	localIAs = lib.ScanLocalIAs()
+	localIAs = lib.ScanLocalIAs(*scionRoot)
 	settings = lib.ReadUserSetting(*staticRoot)
 
 	// if read myia not in list, pick default
@@ -188,7 +196,7 @@ func initServeHandlers() {
 
 	http.HandleFunc("/command", commandHandler)
 	http.HandleFunc("/imglast", findImageHandler)
-	http.HandleFunc("/txtlast", lib.FindImageInfoHandler)
+	http.HandleFunc("/txtlast", findImageInfoHandler)
 	http.HandleFunc("/getnodes", getNodesHandler)
 	http.HandleFunc("/getbwbytime", getBwByTimeHandler)
 	http.HandleFunc("/healthcheck", healthCheckHandler)
@@ -203,10 +211,10 @@ func initServeHandlers() {
 	http.HandleFunc("/labels", lib.LabelsHandler)
 	http.HandleFunc("/locations", lib.LocationsHandler)
 	http.HandleFunc("/geolocate", lib.GeolocateHandler)
-	http.HandleFunc("/getpathtopo", lib.PathTopoHandler)
+	http.HandleFunc("/getpathtopo", getPathInfoHandler)
 	http.HandleFunc("/getastopo", lib.AsTopoHandler)
-	http.HandleFunc("/getcrt", lib.CrtHandler)
-	http.HandleFunc("/gettrc", lib.TrcHandler)
+	http.HandleFunc("/getcrt", getCrtInfoHandler)
+	http.HandleFunc("/gettrc", getTrcInfoHandler)
 }
 
 func logRequestHandler(handler http.Handler) http.Handler {
@@ -536,13 +544,13 @@ func getClientCwd(app string) string {
 	var cwd string
 	switch app {
 	case "sensorapp":
-		cwd = path.Join(lib.GOPATH, lib.LABROOT, ".")
+		cwd = path.Join(*staticRoot, ".")
 	case "camerapp":
-		cwd = path.Join(lib.GOPATH, lib.LABROOT, "webapp/data/images")
+		cwd = path.Join(*staticRoot, "data/images")
 	case "bwtester":
-		cwd = path.Join(lib.GOPATH, lib.LABROOT, ".")
+		cwd = path.Join(*staticRoot, ".")
 	case "echo", "traceroute":
-		cwd = path.Join(lib.GOPATH, lib.SCIONROOT, "bin")
+		cwd = path.Join(*scionRoot, "bin")
 	}
 	return cwd
 }
@@ -552,13 +560,13 @@ func getClientLocationBin(app string) string {
 	var binname string
 	switch app {
 	case "sensorapp":
-		binname = path.Join(lib.GOPATH, "bin/sensorfetcher")
+		binname = path.Join(*appsRoot, "sensorfetcher")
 	case "camerapp":
-		binname = path.Join(lib.GOPATH, "bin/imagefetcher")
+		binname = path.Join(*appsRoot, "imagefetcher")
 	case "bwtester":
-		binname = path.Join(lib.GOPATH, "bin/bwtestclient")
+		binname = path.Join(*appsRoot, "bwtestclient")
 	case "echo", "traceroute":
-		binname = path.Join(lib.GOPATH, lib.SCIONROOT, "bin/scmp")
+		binname = path.Join(*scionRoot, "bin/scmp")
 	}
 	return binname
 }
@@ -703,7 +711,23 @@ func getTracerouteByTimeHandler(w http.ResponseWriter, r *http.Request) {
 
 // Handles locating most recent image formatting it for graphic display in response.
 func findImageHandler(w http.ResponseWriter, r *http.Request) {
-	lib.FindImageHandler(w, r, browserAddr, *port)
+	lib.FindImageHandler(w, r, *staticRoot, browserAddr, *port)
+}
+
+func findImageInfoHandler(w http.ResponseWriter, r *http.Request) {
+	lib.FindImageInfoHandler(w, r, *staticRoot)
+}
+
+func getTrcInfoHandler(w http.ResponseWriter, r *http.Request) {
+	lib.TrcHandler(w, r, *scionRoot)
+}
+
+func getCrtInfoHandler(w http.ResponseWriter, r *http.Request) {
+	lib.CrtHandler(w, r, *scionRoot)
+}
+
+func getPathInfoHandler(w http.ResponseWriter, r *http.Request) {
+	lib.PathTopoHandler(w, r, *scionRoot)
 }
 
 func getNodesHandler(w http.ResponseWriter, r *http.Request) {
