mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
Merge pull request #2117 from gravitl/GRA-1388-adapt-migrate
GR-1388 adapt migrate
This commit is contained in:
commit
78b367cf0c
|
@ -2,19 +2,17 @@ package controller
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
|
||||||
"github.com/gravitl/netmaker/database"
|
"github.com/gravitl/netmaker/database"
|
||||||
"github.com/gravitl/netmaker/logger"
|
"github.com/gravitl/netmaker/logger"
|
||||||
"github.com/gravitl/netmaker/logic"
|
"github.com/gravitl/netmaker/logic"
|
||||||
"github.com/gravitl/netmaker/models"
|
"github.com/gravitl/netmaker/models"
|
||||||
|
"github.com/gravitl/netmaker/servercfg"
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
)
|
)
|
||||||
|
|
||||||
// swagger:route PUT /api/nodes/{network}/{nodeid}/migrate nodes migrateNode
|
// swagger:route PUT /api/v1/nodes/migrate nodes migrateNode
|
||||||
//
|
//
|
||||||
// Used to migrate a legacy node.
|
// Used to migrate a legacy node.
|
||||||
//
|
//
|
||||||
|
@ -26,7 +24,6 @@ import (
|
||||||
// Responses:
|
// Responses:
|
||||||
// 200: nodeJoinResponse
|
// 200: nodeJoinResponse
|
||||||
func migrate(w http.ResponseWriter, r *http.Request) {
|
func migrate(w http.ResponseWriter, r *http.Request) {
|
||||||
// we decode our body request params
|
|
||||||
data := models.MigrationData{}
|
data := models.MigrationData{}
|
||||||
err := json.NewDecoder(r.Body).Decode(&data)
|
err := json.NewDecoder(r.Body).Decode(&data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -34,70 +31,56 @@ func migrate(w http.ResponseWriter, r *http.Request) {
|
||||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
params := mux.Vars(r)
|
|
||||||
//check authorization
|
var networksToAdd = []string{}
|
||||||
record, err := database.FetchRecord(database.NODES_TABLE_NAME, data.LegacyNodeID)
|
for i := range data.LegacyNodes {
|
||||||
if err != nil {
|
legacyNode := data.LegacyNodes[i]
|
||||||
logger.Log(0, "no record for legacy node", data.LegacyNodeID, err.Error())
|
record, err := database.FetchRecord(database.NODES_TABLE_NAME, legacyNode.ID)
|
||||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
if err != nil {
|
||||||
return
|
logger.Log(0, "no record for legacy node", legacyNode.ID, err.Error())
|
||||||
|
continue
|
||||||
|
} else {
|
||||||
|
var oldLegacyNode models.LegacyNode
|
||||||
|
if err = json.Unmarshal([]byte(record), &oldLegacyNode); err != nil {
|
||||||
|
logger.Log(0, "error decoding legacy node", err.Error())
|
||||||
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := bcrypt.CompareHashAndPassword([]byte(oldLegacyNode.Password), []byte(legacyNode.Password)); err != nil {
|
||||||
|
logger.Log(0, "error decoding legacy password", err.Error())
|
||||||
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "unauthorized"))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
networksToAdd = append(networksToAdd, oldLegacyNode.Network)
|
||||||
|
_ = database.DeleteRecord(database.NODES_TABLE_NAME, oldLegacyNode.ID)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var legacyNode models.LegacyNode
|
if len(networksToAdd) == 0 {
|
||||||
if err = json.Unmarshal([]byte(record), &legacyNode); err != nil {
|
logger.Log(0, "no valid networks to migrate for host", data.NewHost.Name)
|
||||||
logger.Log(0, "error decoding legacy node", err.Error())
|
|
||||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := bcrypt.CompareHashAndPassword([]byte(legacyNode.Password), []byte(data.Password)); err != nil {
|
|
||||||
logger.Log(0, "error decoding legacy password", err.Error())
|
|
||||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "unauthorized"))
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "unauthorized"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
network, err := logic.GetNetwork(params["network"])
|
if !logic.HostExists(&data.NewHost) {
|
||||||
if err != nil {
|
if err = logic.CreateHost(&data.NewHost); err != nil {
|
||||||
logger.Log(0, "error retrieving network: ", err.Error())
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
return
|
||||||
return
|
|
||||||
}
|
|
||||||
key, err := logic.CreateAccessKey(models.AccessKey{}, network)
|
|
||||||
if err != nil {
|
|
||||||
logger.Log(0, "error creating key: ", err.Error())
|
|
||||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
data.JoinData.Key = key.Value
|
|
||||||
payload, err := json.Marshal(data.JoinData)
|
|
||||||
if err != nil {
|
|
||||||
logger.Log(0, "error encoding data: ", err.Error())
|
|
||||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
r.Body = io.NopCloser(strings.NewReader(string(payload)))
|
|
||||||
r.ContentLength = int64(len(string(payload)))
|
|
||||||
logger.Log(3, "deleteing legacy node", data.LegacyNodeID, legacyNode.ID, legacyNode.Name)
|
|
||||||
if err := database.DeleteRecord(database.NODES_TABLE_NAME, data.LegacyNodeID); err != nil {
|
|
||||||
logger.Log(0, "error deleting legacy node", legacyNode.Name, err.Error())
|
|
||||||
}
|
|
||||||
createNode(w, r)
|
|
||||||
//newly created node has same node id as legacy node allowing using legacyNode.ID in gateway creation
|
|
||||||
logger.Log(3, "re-creating legacy gateways")
|
|
||||||
if legacyNode.IsIngressGateway == "yes" {
|
|
||||||
if _, err := logic.CreateIngressGateway(legacyNode.Network, legacyNode.ID, false); err != nil {
|
|
||||||
logger.Log(0, "error creating ingress gateway during migration", err.Error())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if legacyNode.IsEgressGateway == "yes" {
|
key, keyErr := logic.RetrievePublicTrafficKey()
|
||||||
if _, err := logic.CreateEgressGateway(legacyNode.EgressGatewayRequest); err != nil {
|
if keyErr != nil {
|
||||||
logger.Log(0, "error creating egress gateway during migration", err.Error())
|
logger.Log(0, "error retrieving key:", keyErr.Error())
|
||||||
}
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||||
|
return
|
||||||
}
|
}
|
||||||
if legacyNode.IsRelay == "yes" {
|
server := servercfg.GetServerInfo()
|
||||||
if _, _, err := logic.CreateRelay(models.RelayRequest{
|
server.TrafficKey = key
|
||||||
NodeID: legacyNode.ID,
|
response := models.RegisterResponse{
|
||||||
NetID: legacyNode.Network,
|
ServerConf: server,
|
||||||
RelayAddrs: legacyNode.RelayAddrs,
|
RequestedHost: data.NewHost,
|
||||||
}); err != nil {
|
|
||||||
logger.Log(0, "error creating relay during migration", err.Error())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
json.NewEncoder(w).Encode(&response)
|
||||||
|
logger.Log(0, "successfully migrated host", data.NewHost.Name, data.NewHost.ID.String())
|
||||||
|
// notify host of changes, peer and node updates
|
||||||
|
go checkNetRegAndHostUpdate(networksToAdd, &data.NewHost)
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,6 @@ func nodeHandlers(r *mux.Router) {
|
||||||
r.HandleFunc("/api/nodes/{network}", authorize(false, true, "network", http.HandlerFunc(getNetworkNodes))).Methods(http.MethodGet)
|
r.HandleFunc("/api/nodes/{network}", authorize(false, true, "network", http.HandlerFunc(getNetworkNodes))).Methods(http.MethodGet)
|
||||||
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(true, true, "node", http.HandlerFunc(getNode))).Methods(http.MethodGet)
|
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(true, true, "node", http.HandlerFunc(getNode))).Methods(http.MethodGet)
|
||||||
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(false, true, "node", http.HandlerFunc(updateNode))).Methods(http.MethodPut)
|
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(false, true, "node", http.HandlerFunc(updateNode))).Methods(http.MethodPut)
|
||||||
r.HandleFunc("/api/nodes/{network}/{nodeid}/migrate", migrate).Methods(http.MethodPost)
|
|
||||||
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(true, true, "node", http.HandlerFunc(deleteNode))).Methods(http.MethodDelete)
|
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(true, true, "node", http.HandlerFunc(deleteNode))).Methods(http.MethodDelete)
|
||||||
r.HandleFunc("/api/nodes/{network}/{nodeid}/createrelay", authorize(false, true, "user", http.HandlerFunc(createRelay))).Methods(http.MethodPost)
|
r.HandleFunc("/api/nodes/{network}/{nodeid}/createrelay", authorize(false, true, "user", http.HandlerFunc(createRelay))).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/api/nodes/{network}/{nodeid}/deleterelay", authorize(false, true, "user", http.HandlerFunc(deleteRelay))).Methods(http.MethodDelete)
|
r.HandleFunc("/api/nodes/{network}/{nodeid}/deleterelay", authorize(false, true, "user", http.HandlerFunc(deleteRelay))).Methods(http.MethodDelete)
|
||||||
|
@ -37,6 +36,7 @@ func nodeHandlers(r *mux.Router) {
|
||||||
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(true, true, "node", http.HandlerFunc(updateNode))).Methods(http.MethodPost)
|
r.HandleFunc("/api/nodes/{network}/{nodeid}", authorize(true, true, "node", http.HandlerFunc(updateNode))).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/api/nodes/{network}", nodeauth(checkFreeTierLimits(node_l, http.HandlerFunc(createNode)))).Methods(http.MethodPost)
|
r.HandleFunc("/api/nodes/{network}", nodeauth(checkFreeTierLimits(node_l, http.HandlerFunc(createNode)))).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/api/nodes/adm/{network}/authenticate", authenticate).Methods(http.MethodPost)
|
r.HandleFunc("/api/nodes/adm/{network}/authenticate", authenticate).Methods(http.MethodPost)
|
||||||
|
r.HandleFunc("/api/v1/nodes/migrate", migrate).Methods(http.MethodPost)
|
||||||
}
|
}
|
||||||
|
|
||||||
// swagger:route POST /api/nodes/adm/{network}/authenticate nodes authenticate
|
// swagger:route POST /api/nodes/adm/{network}/authenticate nodes authenticate
|
||||||
|
|
|
@ -2,7 +2,6 @@ package models
|
||||||
|
|
||||||
// MigrationData struct needed to create new v0.18.0 node from v.0.17.X node
|
// MigrationData struct needed to create new v0.18.0 node from v.0.17.X node
|
||||||
type MigrationData struct {
|
type MigrationData struct {
|
||||||
JoinData JoinData
|
NewHost Host
|
||||||
LegacyNodeID string
|
LegacyNodes []LegacyNode
|
||||||
Password string
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue