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

fix enrollment key join on existing networks

Browse Source
This commit is contained in:
abhishek9686
2025-05-27 22:55:16 +05:30
parent 6879d1d676
commit f538e80f76
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/enrollmentkeys.go
View File

@@ -402,12 +402,17 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
host, err := logic.GetHost(newHost.ID.String())
if err != nil {
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
return
}
// ready the response // ready the response
server := logic.GetServerInfo() server := logic.GetServerInfo()
server.TrafficKey = key server.TrafficKey = key
response := models.RegisterResponse{ response := models.RegisterResponse{
ServerConf: server, ServerConf: server,
RequestedHost: newHost, RequestedHost: *host,
} }
for _, netID := range enrollmentKey.Networks { for _, netID := range enrollmentKey.Networks {
logic.LogEvent(&models.Event{ logic.LogEvent(&models.Event{
@@ -428,9 +433,9 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) {
}) })
} }
logger.Log(0, newHost.Name, newHost.ID.String(), "registered with Netmaker") logger.Log(0, host.Name, host.ID.String(), "registered with Netmaker")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(&response) json.NewEncoder(w).Encode(&response)
// notify host of changes, peer and node updates // notify host of changes, peer and node updates
go auth.CheckNetRegAndHostUpdate(enrollmentKey.Networks, &newHost, enrollmentKey.Relay, enrollmentKey.Groups) go auth.CheckNetRegAndHostUpdate(enrollmentKey.Networks, host, enrollmentKey.Relay, enrollmentKey.Groups)
} }