Merge pull request #89 from capeprivacy/eric/add-nil-check

add error check around response handling

capetest/capetest.go

@@ -3,6 +3,7 @@ package capetest
 import (
 	"crypto/tls"
 	"encoding/json"
+	"fmt"
 	"net/http"
 
 	log "github.com/sirupsen/logrus"
@@ -52,14 +53,18 @@ func websocketDial(url string, insecure bool) (*websocket.Conn, *http.Response,
 
 func CapeTest(testReq TestRequest, endpoint string, insecure bool) (*RunResults, error) {
 	conn, resp, err := websocketDial(endpoint, insecure)
-	defer resp.Body.Close()
 	if err != nil {
 		log.Error("error dialing websocket", err)
-		var e ErrorMsg
-		if err := json.NewDecoder(resp.Body).Decode(&e); err != nil {
-			return nil, err
+		// This check is necessary because we don't necessarily return an http response from sentinel.
+		// Http error code and message is returned if network routing fails.
+		if resp != nil {
+			var e ErrorMsg
+			if err := json.NewDecoder(resp.Body).Decode(&e); err != nil {
+				return nil, err
+			}
+			resp.Body.Close()
+			return nil, fmt.Errorf("error code: %d, reason: %s", resp.StatusCode, e.Error)
 		}
-		log.Errorf("error code: %d, reason: %s", resp.StatusCode, e.Error)
 		return nil, err
 	}
 

cmd/cape/cmd/deploy.go

@@ -178,14 +178,18 @@ func doDeploy(url string, name string, reader io.Reader, insecure bool) (string,
 	s.Start()
 
 	conn, res, err := websocketDial(endpoint, insecure)
-	defer res.Body.Close()
 	if err != nil {
 		log.Error("error dialing websocket", err)
-		var e ErrorMsg
-		if err := json.NewDecoder(res.Body).Decode(&e); err != nil {
-			return "", err
+		// This check is necessary because we don't necessarily return an http response from sentinel.
+		// Http error code and message is returned if network routing fails.
+		if res != nil {
+			var e ErrorMsg
+			if err := json.NewDecoder(res.Body).Decode(&e); err != nil {
+				return "", err
+			}
+			res.Body.Close()
+			return "", fmt.Errorf("error code: %d, reason: %s", res.StatusCode, e.Error)
 		}
-		log.Errorf("error code: %d, reason: %s", res.StatusCode, e.Error)
 		return "", err
 	}
 

cmd/cape/cmd/run.go

@@ -114,14 +114,18 @@ func doRun(url string, functionID string, data []byte, insecure bool) ([]byte, e
 	endpoint := fmt.Sprintf("%s/v1/run/%s", url, functionID)
 
 	c, res, err := websocketDial(endpoint, insecure)
-	defer res.Body.Close()
 	if err != nil {
 		log.Error("error dialing websocket", err)
-		var e ErrorMsg
-		if err := json.NewDecoder(res.Body).Decode(&e); err != nil {
-			return nil, err
+		// This check is necessary because we don't necessarily return an http response from sentinel.
+		// Http error code and message is returned if network routing fails.
+		if res != nil {
+			var e ErrorMsg
+			if err := json.NewDecoder(res.Body).Decode(&e); err != nil {
+				return nil, err
+			}
+			res.Body.Close()
+			return nil, fmt.Errorf("error code: %d, reason: %s", res.StatusCode, e.Error)
 		}
-		log.Errorf("error code: %d, reason: %s", res.StatusCode, e.Error)
 		return nil, err
 	}
 	nonce, err := crypto.GetNonce()
@@ -140,15 +144,6 @@ func doRun(url string, functionID string, data []byte, insecure bool) ([]byte, e
 		log.Println("error writing deploy request")
 		return nil, err
 	}
-	// Try to read message
-	t, socketMsg, err := c.ReadMessage()
-	if err != nil {
-		log.Error("failed to fetch response", err)
-	}
-
-	if t == websocket.CloseMessage {
-		log.Errorf("failed to run with: %s", string(socketMsg))
-	}
 
 	var msg Message
 	err = c.ReadJSON(&msg)