zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-04 16:33:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-12-22 06:42:33 -05:00
parent 54691d94cf
commit bce2f8a45c
7 changed files with 105 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/node.go
View File

@@ -95,6 +95,14 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
}
}
host, err := logic.GetHost(result.HostID.String())
if err != nil {
errorResponse.Code = http.StatusBadRequest
errorResponse.Message = err.Error()
logger.Log(0, request.Header.Get("user"),
"error retrieving host: ", err.Error())
logic.ReturnErrorResponse(response, request, errorResponse)
return
}
err = bcrypt.CompareHashAndPassword([]byte(host.HostPass), []byte(authRequest.Password))
if err != nil {
@@ -485,7 +493,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
ServerConfig: server,
PeerIDs: peerUpdate.PeerIDs,
}
if node.Proxy {
if host.ProxyEnabled {
proxyPayload, err := logic.GetPeersForProxy(&node, false)
if err == nil {
response.ProxyUpdate = proxyPayload
@@ -985,6 +993,12 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return
}
host, err := logic.GetHost(node.HostID.String())
if err != nil {
logger.Log(0, "error retrieving host for node", node.ID.String(), err.Error())
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return
}
if r.Header.Get("ismaster") != "yes" {
username := r.Header.Get("user")
if username != "" && !doesUserOwnNode(username, params["network"], nodeid) {
@@ -996,7 +1010,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to delete node"), "internal"))
return
}
if node.Proxy {
if host.ProxyEnabled {
mq.ProxyUpdate(&manager.ProxyManagerPayload{
Action: manager.DeleteNetwork,
Network: node.Network,