fixed: bad paths, bad IA search, bad dir check order, removed .webapp

fix runtime dir

fix runtime dir

remove .webapp

remove error when loading settings

found missing IA issue, better check order, format

Author: mwfarb

webapp/README.md

@@ -15,8 +15,8 @@ To run the Go Web UI at a specific address `-a` and port `-p` like 0.0.0.0:8000
 webapp \
 -a 0.0.0.0 \
 -p 8000 \
--r /var/www/webapp/web/data \
--srvroot /var/www/webapp/web \
+-r /var/lib/scion/webapp/web/data \
+-srvroot /var/lib/scion/webapp/web \
 -sabin /usr/bin \
 -sroot /etc/scion \
 -sbin /usr/bin \
@@ -68,31 +68,31 @@ webapp
 ```
 
 ## Dependancies
-A list of dependencies for `webapp` can be found at [dependencies.md](./dependencies.md). 
+A list of dependencies for `webapp` can be found at [dependencies.md](./dependencies.md).
 
 ## Help
 ```shell
 Usage of webapp:
   -a string
-    	Address of server host. (default "127.0.0.1")
+        Address of server host. (default "127.0.0.1")
   -p int
-    	Port of server host. (default 8000)
+        Port of server host. (default 8000)
   -r string
-    	Root path to read/browse from, CAUTION: read-access granted from -a and -p. (default ".")
+        Root path to read/browse from, CAUTION: read-access granted from -a and -p. (default ".")
   -sabin string
-    	Path to execute the installed scionlab apps binaries (default "/home/ubuntu/go/bin")
+        Path to execute the installed scionlab apps binaries (default "/home/ubuntu/go/bin")
   -sbin string
-    	Path to execute SCION bin directory of infrastructure tools (default "/home/ubuntu/go/src/github.com/scionproto/scion/bin")
+        Path to execute SCION bin directory of infrastructure tools (default "/home/ubuntu/go/src/github.com/scionproto/scion/bin")
   -sgen string
-    	Path to read SCION gen directory of infrastructure config (default "/home/ubuntu/go/src/github.com/scionproto/scion/gen")
+        Path to read SCION gen directory of infrastructure config (default "/home/ubuntu/go/src/github.com/scionproto/scion/gen")
   -sgenc string
-    	Path to read SCION gen-cache directory of infrastructure run-time config (default "/home/ubuntu/go/src/github.com/scionproto/scion/gen-cache")
+        Path to read SCION gen-cache directory of infrastructure run-time config (default "/home/ubuntu/go/src/github.com/scionproto/scion/gen-cache")
   -slogs string
-    	Path to read SCION logs directory of infrastructure logging (default "/home/ubuntu/go/src/github.com/scionproto/scion/logs")
+        Path to read SCION logs directory of infrastructure logging (default "/home/ubuntu/go/src/github.com/scionproto/scion/logs")
   -sroot string
-    	Path to read SCION root directory of infrastructure (default "/home/ubuntu/go/src/github.com/scionproto/scion")
+        Path to read SCION root directory of infrastructure (default "/home/ubuntu/go/src/github.com/scionproto/scion")
   -srvroot string
-    	Path to read/write web server files. (default "/home/ubuntu/go/src/github.com/netsec-ethz/scion-apps/webapp/web")
+        Path to read/write web server files. (default "/home/ubuntu/go/src/github.com/netsec-ethz/scion-apps/webapp/web")
 ```
 
 ## Related Links

webapp/dependencies.md

@@ -5,8 +5,8 @@
 webapp \
 -a 0.0.0.0 \
 -p 8000 \
--r /var/www/webapp/web/data \
--srvroot /var/www/webapp/web \
+-r /var/lib/scion/webapp/web/data \
+-srvroot /var/lib/scion/webapp/web \
 -sabin /usr/bin \
 -sroot /etc/scion \
 -sbin /usr/bin \

webapp/lib/config.go

@@ -68,11 +68,10 @@ func ReadUserSetting(options *CmdOptions) UserSetting {
 	cliUserFp := path.Join(options.StaticRoot, cfgFileCliUser)
 
 	// no problem when user settings not set yet
-	raw, err := ioutil.ReadFile(cliUserFp)
-	log.Debug("ReadClientsUser", "settings", string(raw))
-	if !CheckError(err) {
-		json.Unmarshal([]byte(raw), &settings)
-	}
+	raw, _ := ioutil.ReadFile(cliUserFp)
+	log.Debug("ReadUserSetting from saved", "settings", string(raw))
+	json.Unmarshal([]byte(raw), &settings)
+
 	return settings
 }
 
@@ -81,7 +80,7 @@ func ScanLocalIAs(options *CmdOptions) []string {
 	var localIAs []string
 	var reIaFilePathCap = `\/ISD([0-9]+)\/AS(\w+)`
 	re := regexp.MustCompile(reIaFilePathCap)
-	var searchPath = path.Join(options.ScionRoot, "gen")
+	var searchPath = options.ScionGen
 	filepath.Walk(searchPath, func(path string, f os.FileInfo, _ error) error {
 		if f != nil && f.IsDir() {
 			capture := re.FindStringSubmatch(path)

webapp/webapp.go

@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"html/template"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
@@ -73,7 +72,6 @@ var addr = flag.String("a", "127.0.0.1", "Address of server host.")
 var port = flag.Int("p", 8000, "Port of server host.")
 var cmdBufLen = 1024
 var browserAddr = "127.0.0.1"
-var rootmarker = ".webapp"
 var settings lib.UserSetting
 var id = "webapp"
 
@@ -134,13 +132,15 @@ func main() {
 	options = lib.CmdOptions{*staticRoot, *browseRoot, *appsRoot, *scionRoot, *scionBin, *scionGen, *scionGenCache, *scionLogs}
 	// correct static files are required for the app to serve them, else fail
 	if _, err := os.Stat(path.Join(options.StaticRoot, "static")); os.IsNotExist(err) {
-		log.Error("-s flag must be set with local repo: scion-apps/webapp")
+		log.Error("-s flag must be set with local repo: scion-apps/webapp/web")
 		CheckFatal(err)
 		return
 	}
+	checkPath(options.StaticRoot)
 
 	// logging
 	logDirPath := ensurePath(options.StaticRoot, "logs")
+	checkPath(options.ScionLogs)
 	log.Root().SetHandler(log.MultiHandler(
 		log.LvlFilterHandler(log.LvlDebug,
 			log.StreamHandler(os.Stderr, fmt15.Fmt15Format(fmt15.ColorMap))),
@@ -149,15 +149,6 @@ func main() {
 				fmt15.Fmt15Format(nil)))))
 	log.Info("======================> Webapp started")
 
-	checkPath(options.StaticRoot)
-	checkPath(options.BrowseRoot)
-	checkPath(options.AppsRoot)
-	checkPath(options.ScionRoot)
-	checkPath(options.ScionBin)
-	checkPath(options.ScionGen)
-	checkPath(options.ScionGenCache)
-	checkPath(options.ScionLogs)
-
 	// prepare templates
 	templates = prepareTemplates(options.StaticRoot)
 	// open and manage database
@@ -175,14 +166,18 @@ func main() {
 	ensurePath(options.StaticRoot, "data")
 	ensurePath(options.StaticRoot, "data/images")
 
+	checkPath(options.ScionRoot)
+	checkPath(options.ScionGen)
+	checkPath(options.ScionGenCache)
 	initLocalIaOptions()
 	log.Info("IA loaded:", "myIa", settings.MyIA)
 
 	// generate client/server default
 	lib.GenClientNodeDefaults(&options, settings.MyIA)
 	lib.GenServerNodeDefaults(&options, localIAs)
 
-	refreshRootDirectory()
+	checkPath(options.AppsRoot)
+	checkPath(options.ScionBin)
 	appsBuildCheck("bwtester")
 	appsBuildCheck("camerapp")
 	appsBuildCheck("sensorapp")
@@ -191,6 +186,7 @@ func main() {
 
 	initServeHandlers()
 	log.Info(fmt.Sprintf("Browser access: at http://%s:%d.", browserAddr, *port))
+	checkPath(options.BrowseRoot)
 	log.Info("File browser root:", "root", options.BrowseRoot)
 	log.Info(fmt.Sprintf("Listening on %s:%d...", *addr, *port))
 	err = http.ListenAndServe(fmt.Sprintf("%s:%d", *addr, *port), logRequestHandler(http.DefaultServeMux))
@@ -581,13 +577,13 @@ func getClientCwd(app string) string {
 	var cwd string
 	switch app {
 	case "sensorapp":
-		cwd = path.Join(options.StaticRoot, ".")
+		cwd = path.Join(options.StaticRoot, "data")
 	case "camerapp":
 		cwd = path.Join(options.StaticRoot, "data/images")
 	case "bwtester":
-		cwd = path.Join(options.StaticRoot, ".")
+		cwd = path.Join(options.StaticRoot, "data")
 	case "echo", "traceroute":
-		cwd = path.Join(options.ScionRoot, "bin")
+		cwd = path.Join(options.ScionBin, ".")
 	}
 	return cwd
 }
@@ -788,33 +784,3 @@ func setUserOptionsHandler(w http.ResponseWriter, r *http.Request) {
 	lib.GenClientNodeDefaults(&options, settings.MyIA)
 	log.Info("IA set:", "myIa", settings.MyIA)
 }
-
-// Used to workaround cache-control issues by ensuring root specified by user
-// has updated last modified date by writing a .webapp file
-func refreshRootDirectory() {
-	cliFp := path.Join(options.StaticRoot, options.BrowseRoot, rootmarker)
-	err := ioutil.WriteFile(cliFp, []byte(``), 0644)
-	CheckError(err)
-}
-
-// FileBrowseResponseWriter holds modified response headers
-type FileBrowseResponseWriter struct {
-	http.ResponseWriter
-}
-
-// WriteHeader prevents caching directory listings based on directory last modified date.
-// This is especially a problem in Chrome, and can serve the browser stale listings.
-func (w FileBrowseResponseWriter) WriteHeader(code int) {
-	if code == 200 {
-		w.Header().Add("Cache-Control", "no-cache, no-store, must-revalidate, proxy-revalidate")
-	}
-	w.ResponseWriter.WriteHeader(code)
-}
-
-// Handles custom filtering of file browsing content
-func fileBrowseHandler(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		rw := FileBrowseResponseWriter{w}
-		h.ServeHTTP(rw, r)
-	})
-}