Merge pull request #170 from prashanthpai/disallow-deleting-self

Disallow deleting self peer
gluster · Nov 17, 2016 · ac37e33 · ac37e33
2 parents ed1771a + b79b3ae
commit ac37e33
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/commands/peers/deletepeer.go b/commands/peers/deletepeer.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gluster/glusterd2/etcdmgmt"
+	"github.com/gluster/glusterd2/gdctx"
 	"github.com/gluster/glusterd2/peer"
 	"github.com/gluster/glusterd2/rest"
 
@@ -30,6 +31,12 @@ func deletePeerHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Removing self should be disallowed (like in glusterd1)
+	if id == gdctx.MyUUID.String() {
+		rest.SendHTTPError(w, http.StatusBadRequest, "Removing self is disallowed.")
+		return
+	}
+
 	// Validate whether the peer can be deleted
 	rsp, e := ValidateDeletePeer(id, p.Name)
 	if e != nil {