Modified scripts to remove all and setup environment

Author: mwfarb

webapp/lib/health.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
@@ -44,7 +45,7 @@ type ResHealthCheck struct {
 
 // HealthCheckHandler handles calling the default health-check scripts and
 // returning the json-formatted results of each script.
-func HealthCheckHandler(w http.ResponseWriter, r *http.Request, srcpath string, ia string) {
+func HealthCheckHandler(w http.ResponseWriter, r *http.Request, scionRoot string, srcpath string, ia string) {
 	hcResFp := path.Join(srcpath, resFileHealthCheck)
 	// read specified tests from json definition
 	fp := path.Join(srcpath, defFileHealthCheck)
@@ -55,6 +56,27 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request, srcpath string,
 	}
 	log.Debug("HealthCheckHandler", "resFileHealthCheck", string(raw))
 
+	err = os.Setenv("SCION_ROOT", scionRoot+"/")
+	if CheckError(err) {
+		fmt.Fprintf(w, `{ "err": "`+err.Error()+`" }`)
+		return
+	}
+	err = os.Setenv("SCION_BIN", scionRoot+"/bin/")
+	if CheckError(err) {
+		fmt.Fprintf(w, `{ "err": "`+err.Error()+`" }`)
+		return
+	}
+	err = os.Setenv("SCION_GEN", scionRoot+"/gen/")
+	if CheckError(err) {
+		fmt.Fprintf(w, `{ "err": "`+err.Error()+`" }`)
+		return
+	}
+	err = os.Setenv("SCION_LOGS", scionRoot+"/logs/")
+	if CheckError(err) {
+		fmt.Fprintf(w, `{ "err": "`+err.Error()+`" }`)
+		return
+	}
+
 	var tests DefTests
 	err = json.Unmarshal([]byte(raw), &tests)
 	if CheckError(err) {

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=$SC/logs/bs${iaFile}-1.DEBUG
+logfile=$SCION_LOGS/bs${iaFile}-1.DEBUG
 echo "Log: $logfile"
 
 # seek last log entry for verified PCBs

webapp/tests/health/default.json

@@ -25,11 +25,6 @@
    "script": "testVPN.sh",
    "desc": "VPN configuration tests"
   },
-  {
-   "label": "checkrepo",
-   "script": "testVersion.sh",
-   "desc": "Version tests for scion and scion-apps"
-  },
   {
    "label": "checkrunnngstatus",
    "script": "testSCIONRunning.sh",

webapp/tests/health/netcheck.sh

@@ -7,7 +7,7 @@ echo "IA found: $iaFile"
 
 isd=$(echo ${iaFile} | cut -d"-" -f1)
 as=$(echo ${iaFile} | cut -d"-" -f2)
-topologyFile=$SC/gen/ISD$isd/AS$as/endhost/topology.json
+topologyFile=$SCION_GEN/ISD$isd/AS$as/endhost/topology.json
 
 # get remote addresses from interfaces
 ip_dsts=$(cat $topologyFile | python -c "import sys, json

webapp/tests/health/scmpcheck.sh

@@ -12,7 +12,7 @@ echo "IP found: $ip"
 
 isd=$(echo ${iaFile} | cut -d"-" -f1)
 as=$(echo ${iaFile} | cut -d"-" -f2)
-topologyFile=$SC/gen/ISD$isd/AS$as/endhost/topology.json
+topologyFile=$SCION_GEN/ISD$isd/AS$as/endhost/topology.json
 
 # get remote addresses from interfaces, return paired list
 dsts=($(cat $topologyFile | python -c "import sys, json
@@ -28,7 +28,7 @@ do
     # if no response under default scmp ping timeout consider connection failed
     ia_dst="${dsts[i]}"
     ip_dst="${dsts[i+1]}"
-    cmd="$SC/bin/scmp echo -c 1 -timeout 5s -local $ia,[$ip] -remote $ia_dst,[$ip_dst]"
+    cmd="$SCION_BIN/scmp echo -c 1 -timeout 5s -local $ia,[$ip] -remote $ia_dst,[$ip_dst]"
     if [ $isd -lt 16 ]; then
         # local tests
         cmd="$cmd -sciondFromIA"

webapp/tests/health/testSCIONRunning.sh

@@ -9,15 +9,8 @@ error_exit()
 
 
 # check if "./scion.sh status" returns anything, fail if it does
-if [[ -d $SC ]]
-then
-    echo "Variable \$SC is set correctly."
-else
-    error_exit "Variable \$SC is not properly set."
-fi
-
-cd $SC
-status="$(bash $SC/scion.sh status 2>&1)"
+cd $SCION_ROOT
+status="$(bash $SCION_ROOT/scion.sh status 2>&1)"
 if [[ $status ]]
 then
     echo "SCION status has reported a problem: $status."
@@ -61,7 +54,6 @@ isd=$(echo ${iaFile} | cut -d"-" -f1)
 
 if [ $isd -ge 16 ]; then
     # not used for localhost testing
-    check_presence $SC/gen ia
     check_presence /run/shm/sciond default.sock
 fi
 check_presence /run/shm/dispatcher default.sock

webapp/tests/health/testVPN.sh

@@ -26,7 +26,7 @@ fi
 
 # ip address of the tun0 interface
 ipAddress=$(echo "$targetLines" | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b" | head -n1)
-topologyFile=$SC/gen/ISD*/AS*/endhost/topology.json
+topologyFile=$SCION_GEN/ISD*/AS*/endhost/topology.json
 # ip address specified in the topology file. If "bind" parameter present, use that one; "public" if not
 ipTopology=$(cat $topologyFile | python -c "import sys, json
 brs = json.load(sys.stdin)['BorderRouters']

webapp/tests/health/testVersion.sh

@@ -30,7 +30,7 @@ import (
 	. "github.com/netsec-ethz/scion-apps/webapp/util"
 )
 
-// GOPATH is the root of the GOPATH environment.
+// GOPATH is the root of the GOPATH environment (in development).
 var GOPATH = os.Getenv("GOPATH")
 
 // browseRoot is browse-only, consider security (def: cwd)
@@ -694,7 +694,7 @@ func writeCmdOutput(w http.ResponseWriter, reader io.Reader, stdin io.WriteClose
 }
 
 func healthCheckHandler(w http.ResponseWriter, r *http.Request) {
-	lib.HealthCheckHandler(w, r, *staticRoot, settings.MyIA)
+	lib.HealthCheckHandler(w, r, *scionRoot, *staticRoot, settings.MyIA)
 }
 
 func getBwByTimeHandler(w http.ResponseWriter, r *http.Request) {