mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
deprecated ability to edit networks
This commit is contained in:
Matthew R Kasun
parent
d604667057
commit
34eb699752
|
|
@ -1,72 +0,0 @@
|
|||
package network
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/gravitl/netmaker/cli/functions"
|
||||
"github.com/gravitl/netmaker/models"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var networkUpdateCmd = &cobra.Command{
|
||||
Use: "update [NETWORK NAME]",
|
||||
Short: "Update a Network",
|
||||
Long: `Update a Network`,
|
||||
Args: cobra.ExactArgs(1),
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
var (
|
||||
networkName = args[0]
|
||||
network = &models.Network{}
|
||||
)
|
||||
if networkDefinitionFilePath != "" {
|
||||
content, err := os.ReadFile(networkDefinitionFilePath)
|
||||
if err != nil {
|
||||
log.Fatal("Error when opening file: ", err)
|
||||
}
|
||||
if err := json.Unmarshal(content, network); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
} else {
|
||||
network.NetID = networkName
|
||||
network.AddressRange = address
|
||||
if address6 != "" {
|
||||
network.AddressRange6 = address6
|
||||
network.IsIPv6 = "yes"
|
||||
}
|
||||
if udpHolePunch {
|
||||
network.DefaultUDPHolePunch = "yes"
|
||||
}
|
||||
if defaultACL {
|
||||
network.DefaultACL = "yes"
|
||||
}
|
||||
network.DefaultInterface = defaultInterface
|
||||
network.DefaultListenPort = int32(defaultListenPort)
|
||||
network.NodeLimit = int32(nodeLimit)
|
||||
network.DefaultKeepalive = int32(defaultKeepalive)
|
||||
if allowManualSignUp {
|
||||
network.AllowManualSignUp = "yes"
|
||||
}
|
||||
network.DefaultExtClientDNS = defaultExtClientDNS
|
||||
network.DefaultMTU = int32(defaultMTU)
|
||||
}
|
||||
functions.PrettyPrint(functions.UpdateNetwork(networkName, network))
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
networkUpdateCmd.Flags().StringVar(&networkDefinitionFilePath, "file", "", "Path to network_definition.json")
|
||||
networkUpdateCmd.Flags().StringVar(&address, "ipv4_addr", "", "IPv4 address of the network")
|
||||
networkUpdateCmd.Flags().StringVar(&address6, "ipv6_addr", "", "IPv6 address of the network")
|
||||
networkUpdateCmd.Flags().BoolVar(&udpHolePunch, "udp_hole_punch", false, "Enable UDP Hole Punching ?")
|
||||
networkUpdateCmd.Flags().BoolVar(&defaultACL, "default_acl", false, "Enable default Access Control List ?")
|
||||
networkUpdateCmd.Flags().StringVar(&defaultInterface, "interface", "", "Name of the network interface")
|
||||
networkUpdateCmd.Flags().StringVar(&defaultExtClientDNS, "ext_client_dns", "", "IPv4 address of DNS server to be used by external clients")
|
||||
networkUpdateCmd.Flags().IntVar(&defaultListenPort, "listen_port", 0, "Default wireguard port each node will attempt to use")
|
||||
networkUpdateCmd.Flags().IntVar(&nodeLimit, "node_limit", 0, "Maximum number of nodes that can be associated with this network")
|
||||
networkUpdateCmd.Flags().IntVar(&defaultKeepalive, "keep_alive", 0, "Keep Alive in seconds")
|
||||
networkUpdateCmd.Flags().IntVar(&defaultMTU, "mtu", 0, "MTU size")
|
||||
networkUpdateCmd.Flags().BoolVar(&allowManualSignUp, "manual_signup", false, "Allow manual signup ?")
|
||||
rootCmd.AddCommand(networkUpdateCmd)
|
||||
}
|
||||
|
|
@ -22,7 +22,6 @@ func networkHandlers(r *mux.Router) {
|
|||
r.HandleFunc("/api/networks", logic.SecurityCheck(false, http.HandlerFunc(getNetworks))).Methods(http.MethodGet)
|
||||
r.HandleFunc("/api/networks", logic.SecurityCheck(true, checkFreeTierLimits(networks_l, http.HandlerFunc(createNetwork)))).Methods(http.MethodPost)
|
||||
r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(false, http.HandlerFunc(getNetwork))).Methods(http.MethodGet)
|
||||
r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(false, http.HandlerFunc(updateNetwork))).Methods(http.MethodPut)
|
||||
r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(true, http.HandlerFunc(deleteNetwork))).Methods(http.MethodDelete)
|
||||
r.HandleFunc("/api/networks/{networkname}/keyupdate", logic.SecurityCheck(true, http.HandlerFunc(keyUpdate))).Methods(http.MethodPost)
|
||||
// ACLs
|
||||
|
|
@ -142,103 +141,6 @@ func keyUpdate(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
}
|
||||
|
||||
// swagger:route PUT /api/networks/{networkname} networks updateNetwork
|
||||
//
|
||||
// Update a network.
|
||||
//
|
||||
// Schemes: https
|
||||
//
|
||||
// Security:
|
||||
// oauth
|
||||
//
|
||||
// Responses:
|
||||
// 200: networkBodyResponse
|
||||
func updateNetwork(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
var params = mux.Vars(r)
|
||||
var network models.Network
|
||||
netname := params["networkname"]
|
||||
|
||||
network, err := logic.GetParentNetwork(netname)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"), "failed to get network info: ",
|
||||
err.Error())
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
return
|
||||
}
|
||||
var newNetwork models.Network
|
||||
err = json.NewDecoder(r.Body).Decode(&newNetwork)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"), "error decoding request body: ",
|
||||
err.Error())
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||
return
|
||||
}
|
||||
rangeupdate4, rangeupdate6, holepunchupdate, groupsDelta, userDelta, err := logic.UpdateNetwork(&network, &newNetwork)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"), "failed to update network: ",
|
||||
err.Error())
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||
return
|
||||
}
|
||||
|
||||
if len(groupsDelta) > 0 {
|
||||
for _, g := range groupsDelta {
|
||||
users, err := logic.GetGroupUsers(g)
|
||||
if err == nil {
|
||||
for _, user := range users {
|
||||
logic.AdjustNetworkUserPermissions(&user, &newNetwork)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(userDelta) > 0 {
|
||||
for _, uname := range userDelta {
|
||||
user, err := logic.GetReturnUser(uname)
|
||||
if err == nil {
|
||||
logic.AdjustNetworkUserPermissions(&user, &newNetwork)
|
||||
}
|
||||
}
|
||||
}
|
||||
if rangeupdate4 {
|
||||
err = logic.UpdateNetworkNodeAddresses(network.NetID)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"),
|
||||
fmt.Sprintf("failed to update network [%s] ipv4 addresses: %v",
|
||||
network.NetID, err.Error()))
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
return
|
||||
}
|
||||
}
|
||||
if rangeupdate6 {
|
||||
err = logic.UpdateNetworkNodeAddresses6(network.NetID)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"),
|
||||
fmt.Sprintf("failed to update network [%s] ipv6 addresses: %v",
|
||||
network.NetID, err.Error()))
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
return
|
||||
}
|
||||
}
|
||||
if rangeupdate4 || rangeupdate6 || holepunchupdate {
|
||||
nodes, err := logic.GetNetworkNodes(network.NetID)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"),
|
||||
fmt.Sprintf("failed to get network [%s] nodes: %v",
|
||||
network.NetID, err.Error()))
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
return
|
||||
}
|
||||
for _, node := range nodes {
|
||||
runUpdates(&node, true)
|
||||
}
|
||||
}
|
||||
|
||||
logger.Log(1, r.Header.Get("user"), "updated network", netname)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(newNetwork)
|
||||
}
|
||||
|
||||
// swagger:route PUT /api/networks/{networkname}/acls networks updateNetworkACL
|
||||
//
|
||||
// Update a network ACL (Access Control List).
|
||||
|
|
|
|||
15
release.md
15
release.md
|
|
@ -1,20 +1,9 @@
|
|||
# Netmaker v0.18.6
|
||||
# Netmaker v0.18.7
|
||||
|
||||
## whats new
|
||||
- no new features
|
||||
- deprecated editing of network parameters
|
||||
|
||||
## whats fixed
|
||||
- a few ext client/ingress issues
|
||||
- viewing addresses (UI)
|
||||
- when deleting an ingress gateway, ext clients are now removed from peers immediately
|
||||
- ext client peers should be populated immediately after creation
|
||||
- ext clients no longer reset public key when disabled/enabled
|
||||
- can delete an ingress without clients
|
||||
- removed unnecessary host update
|
||||
- host nat type is now collected from clients
|
||||
- fix peer update issue where caclulation was happening to frequently
|
||||
- nm-quick && nm-upgrade
|
||||
- EMQX image change && api routes
|
||||
|
||||
## known issues
|
||||
- Caddy does not handle netmaker exporter well for EE
|
||||
|
|
|
|||
Loading…
Reference in a new issue