Browse Source

remove node check from getHosts (#2359)

Matthew R Kasun 2 years ago
parent
commit
9af380fd3b
1 changed files with 31 additions and 31 deletions
  1. 31 31
      controllers/hosts.go

+ 31 - 31
controllers/hosts.go

@@ -52,41 +52,41 @@ func getHosts(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 		return
 	}
 	}
-	isMasterAdmin := r.Header.Get("ismaster") == "yes"
-	user, err := logic.GetUser(r.Header.Get("user"))
-	if err != nil && !isMasterAdmin {
-		logger.Log(0, r.Header.Get("user"), "failed to fetch user: ", err.Error())
-		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
-		return
-	}
+	//isMasterAdmin := r.Header.Get("ismaster") == "yes"
+	//user, err := logic.GetUser(r.Header.Get("user"))
+	//if err != nil && !isMasterAdmin {
+	//	logger.Log(0, r.Header.Get("user"), "failed to fetch user: ", err.Error())
+	//	logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+	//	return
+	//}
 	// return JSON/API formatted hosts
 	// return JSON/API formatted hosts
-	ret := []models.ApiHost{}
+	//ret := []models.ApiHost{}
 	apiHosts := logic.GetAllHostsAPI(currentHosts[:])
 	apiHosts := logic.GetAllHostsAPI(currentHosts[:])
 	logger.Log(2, r.Header.Get("user"), "fetched all hosts")
 	logger.Log(2, r.Header.Get("user"), "fetched all hosts")
-	for _, host := range apiHosts {
-		nodes := host.Nodes
-		// work on the copy
-		host.Nodes = []string{}
-		for _, nid := range nodes {
-			node, err := logic.GetNodeByID(nid)
-			if err != nil {
-				logger.Log(0, r.Header.Get("user"), "failed to fetch node: ", err.Error())
-				// TODO find the reason for the DB error, skip this node for now
-				continue
-			}
-			if !isMasterAdmin && !logic.UserHasNetworksAccess([]string{node.Network}, user) {
-				continue
-			}
-			host.Nodes = append(host.Nodes, nid)
-		}
-		// add to the response only if has perms to some nodes / networks
-		if len(host.Nodes) > 0 {
-			ret = append(ret, host)
-		}
-	}
-	logic.SortApiHosts(ret[:])
+	//for _, host := range apiHosts {
+	//	nodes := host.Nodes
+	//	// work on the copy
+	//	host.Nodes = []string{}
+	//	for _, nid := range nodes {
+	//		node, err := logic.GetNodeByID(nid)
+	//		if err != nil {
+	//			logger.Log(0, r.Header.Get("user"), "failed to fetch node: ", err.Error())
+	//			// TODO find the reason for the DB error, skip this node for now
+	//			continue
+	//		}
+	//		if !isMasterAdmin && !logic.UserHasNetworksAccess([]string{node.Network}, user) {
+	//			continue
+	//		}
+	//		host.Nodes = append(host.Nodes, nid)
+	//	}
+	//	// add to the response only if has perms to some nodes / networks
+	//	if len(host.Nodes) > 0 {
+	//		ret = append(ret, host)
+	//	}
+	//}
+	logic.SortApiHosts(apiHosts[:])
 	w.WriteHeader(http.StatusOK)
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(ret)
+	json.NewEncoder(w).Encode(apiHosts)
 }
 }
 
 
 // swagger:route GET /api/v1/host pull pullHost
 // swagger:route GET /api/v1/host pull pullHost