Merge pull request #129 from dedis/proxy-errors

Fixes error handling on the proxy

Author: nkcr

proxy/dkg.go

@@ -85,7 +85,7 @@ func (d dkg) Actor(w http.ResponseWriter, r *http.Request) {
 
 	actor, found := d.d.GetActor(electionIDBuf)
 	if !found {
-		BadRequestError(w, r, xerrors.New("actor not found"), nil)
+		NotFoundErr(w, r, xerrors.New("actor not found"), nil)
 		return
 	}
 
@@ -168,5 +168,8 @@ func (d dkg) EditDKGActor(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "failed to compute pubshares: "+err.Error(), http.StatusInternalServerError)
 			return
 		}
+	default:
+		BadRequestError(w, r, xerrors.Errorf("invalid action: %s", req.Action), nil)
+		return
 	}
 }

proxy/election.go

@@ -243,6 +243,9 @@ func (h *election) EditElection(w http.ResponseWriter, r *http.Request) {
 		h.combineShares(electionID, w, r)
 	case "cancel":
 		h.cancelElection(electionID, w, r)
+	default:
+		BadRequestError(w, r, xerrors.Errorf("invalid action: %s", req.Action), nil)
+		return
 	}
 }
 

proxy/mod.go

@@ -107,6 +107,11 @@ func ForbiddenError(w http.ResponseWriter, r *http.Request, err error, args map[
 	httpErr(w, r, err, http.StatusForbidden, "not authorized / forbidden", args)
 }
 
+// NotFoundErr sets a not found error
+func NotFoundErr(w http.ResponseWriter, r *http.Request, err error, args map[string]interface{}) {
+	httpErr(w, r, err, http.StatusNotFound, "not found", args)
+}
+
 func httpErr(w http.ResponseWriter, r *http.Request, err error, code uint, title string, args map[string]interface{}) {
 	if args == nil {
 		args = make(map[string]interface{})
@@ -127,7 +132,7 @@ func httpErr(w http.ResponseWriter, r *http.Request, err error, code uint, title
 
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Header().Set("X-Content-Type-Options", "nosniff")
-	w.WriteHeader(http.StatusInternalServerError)
+	w.WriteHeader(int(code))
 	fmt.Fprintln(w, string(buf))
 }
 

proxy/shuffle.go

@@ -9,6 +9,7 @@ import (
 	shuffleSrv "github.com/dedis/d-voting/services/shuffle"
 	"github.com/gorilla/mux"
 	"go.dedis.ch/kyber/v3"
+	"golang.org/x/xerrors"
 )
 
 // NewShuffle returns a new initialized shuffle
@@ -65,5 +66,8 @@ func (s shuffle) EditShuffle(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "failed to shuffle: "+err.Error(), http.StatusInternalServerError)
 			return
 		}
+	default:
+		BadRequestError(w, r, xerrors.Errorf("invalid action: %s", req.Action), nil)
+		return
 	}
 }

runNode.sh

@@ -16,6 +16,7 @@ tmux list-sessions | rg "^$s:" >/dev/null 2>&1 && { echo >&2 "A session with the
 
 tmux new-session -d -s $s
 
+make build
 
 from=1
 to=$1
@@ -25,7 +26,7 @@ do
 echo $from
 tmux new-window -t $s
 window=$from
-tmux send-keys -t $s:$window "LLVL=info ./memcoin --config /tmp/node$from start --postinstall --promaddr :$((9099 + $from)) --proxyaddr :$((9079 + $from)) --proxykey $pk --listen tcp://0.0.0.0:$((2000 + $from)) --public //localhost:$((2000 + $from))" C-m
+tmux send-keys -t $s:$window "PROXY_LOG=info LLVL=info ./memcoin --config /tmp/node$from start --postinstall --promaddr :$((9099 + $from)) --proxyaddr :$((9079 + $from)) --proxykey $pk --listen tcp://0.0.0.0:$((2000 + $from)) --public //localhost:$((2000 + $from))" C-m
 ((from++))
 
 done