Home Explore Help
Sign In
golang
/
netmaker
mirror of https://github.com/gravitl/netmaker
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch 'develop' of https://github.com/gravitl/netmaker into feature_host_relay

Abhishek Kondur 2 years ago
parent
87ae255a58 b6fbcec0b3
commit
b8903ebbde
29 changed files with 339 additions and 283 deletions
Split View Show Diff Stats
  1. 101 53
      auth/templates.go
  2. 3 15
      cli/cmd/acl/allow.go
  3. 3 15
      cli/cmd/acl/deny.go
  4. 1 6
      cli/cmd/acl/list.go
  5. 0 10
      cli/cmd/acl/root.go
  6. 0 10
      cli/cmd/context/root.go
  7. 0 10
      cli/cmd/dns/root.go
  8. 0 10
      cli/cmd/ext_client/root.go
  9. 20 0
      cli/cmd/host/delete.go
  10. 20 0
      cli/cmd/host/list.go
  11. 28 0
      cli/cmd/host/root.go
  12. 65 0
      cli/cmd/host/update.go
  13. 22 0
      cli/cmd/host/update_networks.go
  14. 0 10
      cli/cmd/keys/root.go
  15. 0 10
      cli/cmd/metrics/root.go
  16. 0 12
      cli/cmd/network/root.go
  17. 0 10
      cli/cmd/network_user/root.go
  18. 0 6
      cli/cmd/node/flags.go
  19. 9 7
      cli/cmd/node/list.go
  20. 0 10
      cli/cmd/node/root.go
  21. 27 33
      cli/cmd/node/update.go
  22. 3 14
      cli/cmd/root.go
  23. 0 10
      cli/cmd/server/root.go
  24. 0 10
      cli/cmd/user/root.go
  25. 0 10
      cli/cmd/usergroup/root.go
  26. 33 0
      cli/functions/host.go
  27. 1 1
      go.mod
  28. 2 2
      go.sum
  29. 1 9
      logic/hosts.go

+ 101 - 53
auth/templates.go
View File 

@@ -10,72 +10,120 @@ type ssoCallbackTemplateConfig struct {
 
 var ssoCallbackTemplate = template.Must(
 
 	template.New("ssocallback").Parse(`<!DOCTYPE html>
 
 	<html lang="en">
 
+	
 	<head>
 
-	  <meta charset="UTF-8">
 
-	  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-	  <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
-	  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
 
-		integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
-	  <title>Netmaker</title>
 
+		<meta charset="UTF-8">
 
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
 
+		<title>Netmaker :: SSO Success</title>
 
+	
+		<style>
 
+			html,
 
+			body {
 
+				margin: 0px;
 
+				padding: 0px;
 
+			}
 
+	
+			body {
 
+				height: 100vh;
 
+				overflow: hidden;
 
+				display: flex;
 
+				flex-flow: column nowrap;
 
+				justify-content: center;
 
+				align-items: center;
 
+			}
 
+	
+			#logo {
 
+				width: 150px;
 
+			}
 
+	
+			h3 {
 
+				margin-bottom: 3rem;
 
+				color: rgb(25, 135, 84);
 
+				font-size: xx-large;
 
+			}
 
+	
+			h4 {
 
+				margin-bottom: 0px;
 
+			}
 
+	
+			p {
 
+				margin-top: 0px;
 
+				margin-bottom: 0px;
 
+			}
 
+		</style>
 
 	</head>
 
-	<style>
 
-	  .text-responsive {
 
-		font-size: calc(100% + 1vw + 1vh);
 
-	  }
 
-	</style>
 
+	
 	<body>
 
-	  <div class="container">
 
-		<div class="row justify-content-center mt-5 p-5 align-items-center text-center">
 
-		  <a href="https://netmaker.io">
 
-			<img src="https://raw.githubusercontent.com/gravitl/netmaker/master/img/netmaker-teal.png" alt="Netmaker"
 
-			  width="75%" height="25%" class="img-fluid">
 
-		  </a>
 
-		</div>
 
-		<div class="row justify-content-center mt-5 p-3 text-center">
 
-		  <div class="col">
 
-			<h2 class="text-responsive">{{.User}} has been successfully {{.Verb}}</h2>
 
-			<br />
 
-			<h2 class="text-responsive">You may now close this window.</h2>
 
-		  </div>
 
-		</div>
 
-	  </div>
 
+		<img
 
+			src="https://raw.githubusercontent.com/gravitl/netmaker-docs/master/images/netmaker-github/netmaker-teal.png"
 
+			alt="netmaker logo"
 
+			id="logo"
 
+		>
 
+		<h3>Server SSO Success</h3>
 
+		<h4>User {{.User}} has been successfully {{.Verb}}.</h4>
 
+		<p>You can close this window now</p>
 
 	</body>
 
+	
 	</html>`),
 
 )
 
 
 var ssoErrCallbackTemplate = template.Must(
 
 	template.New("ssocallback").Parse(`<!DOCTYPE html>
 
 	<html lang="en">
 
+	
 	<head>
 
-	  <meta charset="UTF-8">
 
-	  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-	  <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
-	  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
 
-		integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
-	  <title>Netmaker</title>
 
+		<meta charset="UTF-8">
 
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
 
+		<title>Netmaker :: SSO Error</title>
 
+	
+		<style>
 
+			html, body {
 
+				margin: 0px;
 
+				padding: 0px;
 
+			}
 
+			body {
 
+				height: 100vh;
 
+				overflow: hidden;
 
+				display: flex;
 
+				flex-flow: column nowrap;
 
+				justify-content: center;
 
+				align-items: center;
 
+			}
 
+			#logo {
 
+				width: 150px;
 
+			}
 
+			h3 {
 
+				margin-bottom: 3rem;
 
+				color:rgb(223, 71, 89);
 
+				font-size: xx-large;
 
+			}
 
+			h4 {
 
+				margin-top: 0rem;
 
+			}
 
+			p {
 
+				margin-top: 3rem;
 
+			}
 
+		</style>
 
 	</head>
 
-	<style>
 
-	  .text-responsive {
 
-		font-size: calc(100% + 1vw + 1vh);
 
-		color: red;
 
-	  }
 
-	</style>
 
+
 
 	<body>
 
-	  <div class="container">
 
-		<div class="row justify-content-center mt-5 p-5 align-items-center text-center">
 
-		  <a href="https://netmaker.io">
 
-			<img src="https://raw.githubusercontent.com/gravitl/netmaker/master/img/netmaker-teal.png" alt="Netmaker"
 
-			  width="75%" height="25%" class="img-fluid">
 
-		  </a>
 
-		</div>
 
-		<div class="row justify-content-center mt-5 p-3 text-center">
 
-		  <div class="col">
 
-			<h2 class="text-responsive">{{.User}} unable to join network: {{.Verb}}</h2>
 
-			<br />
 
-			<h2 class="text-responsive">If you feel this is a mistake, please contact your network administrator.</h2>
 
-		  </div>
 
-		</div>
 
-	  </div>
 
+		<img
 
+			src="https://raw.githubusercontent.com/gravitl/netmaker-docs/master/images/netmaker-github/netmaker-teal.png"
 
+			alt="netmaker logo"
 
+			id="logo"
 
+		>
 
+		<h3>Server SSO Error</h3>
 
+		<h4>Error reason: {.Verb}</h4>
 
+		<em>Your Netmaker server may not have SSO configured properly.</em>
 
+		<em>
 
+			Please visit the <a href="https://docs.netmaker.org/oauth.html" target="_blank" rel="noopener">docs</a> for more information.
 
+		</em>
 
+		<p>
 
+			If you feel this is a mistake, please contact your network administrator.
 
+		</p>
 
 	</body>
 
+
 
 	</html>`),
 
 )

+ 3 - 15
cli/cmd/acl/allow.go
View File 

@@ -2,8 +2,6 @@ package acl
 
 
 import (
 
 	"fmt"
 
-	"log"
 
-	"strings"
 
 
 	"github.com/gravitl/netmaker/cli/functions"
 
 	"github.com/gravitl/netmaker/logic/acls"
 
@@ -11,23 +9,13 @@ import (
 
 )
 
 
 var aclAllowCmd = &cobra.Command{
 
-	Use:   "allow [NETWORK NAME] [FROM_NODE_NAME] [TO_NODE_NAME]",
 
+	Use:   "allow [NETWORK NAME] [NODE_1_ID] [NODE_2_ID]",
 
 	Args:  cobra.ExactArgs(3),
 
 	Short: "Allow access from one node to another",
 
 	Long:  `Allow access from one node to another`,
 
 	Run: func(cmd *cobra.Command, args []string) {
 
-		nameIDMap := make(map[string]string)
 
-		for _, node := range *functions.GetNodes(args[0]) {
 
-			nameIDMap[strings.ToLower(node.Name)] = node.ID
 
-		}
 
-		fromNodeID, ok := nameIDMap[strings.ToLower(args[1])]
 
-		if !ok {
 
-			log.Fatalf("Node %s doesn't exist", args[1])
 
-		}
 
-		toNodeID, ok := nameIDMap[strings.ToLower(args[2])]
 
-		if !ok {
 
-			log.Fatalf("Node %s doesn't exist", args[2])
 
-		}
 
+		fromNodeID := args[1]
 
+		toNodeID := args[2]
 
 		payload := acls.ACLContainer(map[acls.AclID]acls.ACL{
 
 			acls.AclID(fromNodeID): map[acls.AclID]byte{
 
 				acls.AclID(toNodeID): acls.Allowed,

+ 3 - 15
cli/cmd/acl/deny.go
View File 

@@ -2,8 +2,6 @@ package acl
 
 
 import (
 
 	"fmt"
 
-	"log"
 
-	"strings"
 
 
 	"github.com/gravitl/netmaker/cli/functions"
 
 	"github.com/gravitl/netmaker/logic/acls"
 
@@ -11,23 +9,13 @@ import (
 
 )
 
 
 var aclDenyCmd = &cobra.Command{
 
-	Use:   "deny [NETWORK NAME] [FROM_NODE_NAME] [TO_NODE_NAME]",
 
+	Use:   "deny [NETWORK NAME] [NODE_1_ID] [NODE_2_ID]",
 
 	Args:  cobra.ExactArgs(3),
 
 	Short: "Deny access from one node to another",
 
 	Long:  `Deny access from one node to another`,
 
 	Run: func(cmd *cobra.Command, args []string) {
 
-		nameIDMap := make(map[string]string)
 
-		for _, node := range *functions.GetNodes(args[0]) {
 
-			nameIDMap[strings.ToLower(node.Name)] = node.ID
 
-		}
 
-		fromNodeID, ok := nameIDMap[strings.ToLower(args[1])]
 
-		if !ok {
 
-			log.Fatalf("Node %s doesn't exist", args[1])
 
-		}
 
-		toNodeID, ok := nameIDMap[strings.ToLower(args[2])]
 
-		if !ok {
 
-			log.Fatalf("Node %s doesn't exist", args[2])
 
-		}
 
+		fromNodeID := args[1]
 
+		toNodeID := args[2]
 
 		payload := acls.ACLContainer(map[acls.AclID]acls.ACL{
 
 			acls.AclID(fromNodeID): map[acls.AclID]byte{
 
 				acls.AclID(toNodeID): acls.NotAllowed,

+ 1 - 6
cli/cmd/acl/list.go
View File 

@@ -16,16 +16,11 @@ var aclListCmd = &cobra.Command{
 
 	Long:  `List all ACLs associated with a network`,
 
 	Run: func(cmd *cobra.Command, args []string) {
 
 		aclSource := (map[acls.AclID]acls.ACL)(*functions.GetACL(args[0]))
 
-		nodes := functions.GetNodes(args[0])
 
-		idNameMap := make(map[string]string)
 
-		for _, node := range *nodes {
 
-			idNameMap[node.ID] = node.Name
 
-		}
 
 		table := tablewriter.NewWriter(os.Stdout)
 
 		table.SetHeader([]string{"From", "To", "Status"})
 
 		for id, acl := range aclSource {
 
 			for k, v := range (map[acls.AclID]byte)(acl) {
 
-				row := []string{idNameMap[string(id)], idNameMap[string(k)]}
 
+				row := []string{string(id), string(k)}
 
 				switch v {
 
 				case acls.NotAllowed:
 
 					row = append(row, "Not Allowed")

+ 0 - 10
cli/cmd/acl/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "acl",
 
 	Short: "Manage Access Control Lists (ACLs)",
 
 	Long:  `Manage Access Control Lists (ACLs)`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 10
cli/cmd/context/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "context",
 
 	Short: "Manage various netmaker server configurations",
 
 	Long:  `Manage various netmaker server configurations`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 10
cli/cmd/dns/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "dns",
 
 	Short: "Manage DNS entries associated with a network",
 
 	Long:  `Manage DNS entries associated with a network`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 10
cli/cmd/ext_client/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "ext_client",
 
 	Short: "Manage External Clients",
 
 	Long:  `Manage External Clients`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 20 - 0
cli/cmd/host/delete.go
View File 

@@ -0,0 +1,20 @@
 
+package host
 
+
 
+import (
 
+	"github.com/gravitl/netmaker/cli/functions"
 
+	"github.com/spf13/cobra"
 
+)
 
+
 
+var hostDeleteCmd = &cobra.Command{
 
+	Use:   "delete HostID",
 
+	Args:  cobra.ExactArgs(1),
 
+	Short: "Delete a host",
 
+	Long:  `Delete a host`,
 
+	Run: func(cmd *cobra.Command, args []string) {
 
+		functions.PrettyPrint(functions.DeleteHost(args[0]))
 
+	},
 
+}
 
+
 
+func init() {
 
+	rootCmd.AddCommand(hostDeleteCmd)
 
+}

+ 20 - 0
cli/cmd/host/list.go
View File 

@@ -0,0 +1,20 @@
 
+package host
 
+
 
+import (
 
+	"github.com/gravitl/netmaker/cli/functions"
 
+	"github.com/spf13/cobra"
 
+)
 
+
 
+var hostListCmd = &cobra.Command{
 
+	Use:   "list",
 
+	Args:  cobra.NoArgs,
 
+	Short: "List all hosts",
 
+	Long:  `List all hosts`,
 
+	Run: func(cmd *cobra.Command, args []string) {
 
+		functions.PrettyPrint(functions.GetHosts())
 
+	},
 
+}
 
+
 
+func init() {
 
+	rootCmd.AddCommand(hostListCmd)
 
+}

+ 28 - 0
cli/cmd/host/root.go
View File 

@@ -0,0 +1,28 @@
 
+package host
 
+
 
+import (
 
+	"os"
 
+
 
+	"github.com/spf13/cobra"
 
+)
 
+
 
+// rootCmd represents the base command when called without any subcommands
 
+var rootCmd = &cobra.Command{
 
+	Use:   "host",
 
+	Short: "Manage hosts",
 
+	Long:  `Manage hosts`,
 
+}
 
+
 
+// GetRoot returns the root subcommand
 
+func GetRoot() *cobra.Command {
 
+	return rootCmd
 
+}
 
+
 
+// Execute adds all child commands to the root command and sets flags appropriately.
 
+// This is called by main.main(). It only needs to happen once to the rootCmd.
 
+func Execute() {
 
+	err := rootCmd.Execute()
 
+	if err != nil {
 
+		os.Exit(1)
 
+	}
 
+}

+ 65 - 0
cli/cmd/host/update.go
View File 

@@ -0,0 +1,65 @@
 
+package host
 
+
 
+import (
 
+	"encoding/json"
 
+	"log"
 
+	"os"
 
+
 
+	"github.com/gravitl/netmaker/cli/functions"
 
+	"github.com/gravitl/netmaker/models"
 
+	"github.com/spf13/cobra"
 
+)
 
+
 
+var (
 
+	apiHostFilePath string
 
+	endpoint        string
 
+	name            string
 
+	listenPort      int
 
+	proxyListenPort int
 
+	mtu             int
 
+	proxyEnabled    bool
 
+	isStatic        bool
 
+	isDefault       bool
 
+)
 
+
 
+var hostUpdateCmd = &cobra.Command{
 
+	Use:   "update HostID",
 
+	Args:  cobra.ExactArgs(1),
 
+	Short: "Update a host",
 
+	Long:  `Update a host`,
 
+	Run: func(cmd *cobra.Command, args []string) {
 
+		apiHost := &models.ApiHost{}
 
+		if apiHostFilePath != "" {
 
+			content, err := os.ReadFile(apiHostFilePath)
 
+			if err != nil {
 
+				log.Fatal("Error when opening file: ", err)
 
+			}
 
+			if err := json.Unmarshal(content, apiHost); err != nil {
 
+				log.Fatal(err)
 
+			}
 
+		} else {
 
+			apiHost.EndpointIP = endpoint
 
+			apiHost.Name = name
 
+			apiHost.ListenPort = listenPort
 
+			apiHost.ProxyListenPort = proxyListenPort
 
+			apiHost.MTU = mtu
 
+			apiHost.ProxyEnabled = proxyEnabled
 
+			apiHost.IsStatic = isStatic
 
+			apiHost.IsDefault = isDefault
 
+		}
 
+		functions.PrettyPrint(functions.UpdateHost(args[0], apiHost))
 
+	},
 
+}
 
+
 
+func init() {
 
+	hostUpdateCmd.Flags().StringVar(&apiHostFilePath, "file", "", "Path to host_definition.json")
 
+	hostUpdateCmd.Flags().StringVar(&endpoint, "endpoint", "", "Endpoint of the Host")
 
+	hostUpdateCmd.Flags().StringVar(&name, "name", "", "Host name")
 
+	hostUpdateCmd.Flags().IntVar(&listenPort, "listen_port", 0, "Listen port of the host")
 
+	hostUpdateCmd.Flags().IntVar(&proxyListenPort, "proxy_listen_port", 0, "Proxy listen port of the host")
 
+	hostUpdateCmd.Flags().IntVar(&mtu, "mtu", 0, "Host MTU size")
 
+	hostUpdateCmd.Flags().BoolVar(&proxyEnabled, "proxy", false, "Enable proxy ?")
 
+	hostUpdateCmd.Flags().BoolVar(&isStatic, "static", false, "Make Host Static ?")
 
+	hostUpdateCmd.Flags().BoolVar(&isDefault, "default", false, "Make Host Default ?")
 
+	rootCmd.AddCommand(hostUpdateCmd)
 
+}

+ 22 - 0
cli/cmd/host/update_networks.go
View File 

@@ -0,0 +1,22 @@
 
+package host
 
+
 
+import (
 
+	"strings"
 
+
 
+	"github.com/gravitl/netmaker/cli/functions"
 
+	"github.com/spf13/cobra"
 
+)
 
+
 
+var hostUpdateNetworksCmd = &cobra.Command{
 
+	Use:   "update_network HostID Networks(comma separated list)",
 
+	Args:  cobra.ExactArgs(2),
 
+	Short: "Update a host's networks",
 
+	Long:  `Update a host's networks`,
 
+	Run: func(cmd *cobra.Command, args []string) {
 
+		functions.PrettyPrint(functions.UpdateHostNetworks(args[0], strings.Split(args[1], ",")))
 
+	},
 
+}
 
+
 
+func init() {
 
+	rootCmd.AddCommand(hostUpdateNetworksCmd)
 
+}

+ 0 - 10
cli/cmd/keys/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "keys",
 
 	Short: "Manage access keys associated with a network",
 
 	Long:  `Manage access keys associated with a network`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 10
cli/cmd/metrics/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "metrics",
 
 	Short: "Fetch metrics of nodes/networks",
 
 	Long:  `Fetch metrics of nodes/networks`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 12
cli/cmd/network/root.go
View File 

@@ -11,9 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "network",
 
 	Short: "Manage Netmaker Networks",
 
 	Long:  `Manage Netmaker Networks`,
 
-	// Uncomment the following line if your bare application
 
-	// has an action associated with it:
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -29,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 10
cli/cmd/network_user/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "network_user",
 
 	Short: "Manage Network Users",
 
 	Long:  `Manage Network Users`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 6
cli/cmd/node/flags.go
View File 

@@ -6,23 +6,17 @@ var (
 
 	failover               bool
 
 	networkName            string
 
 	nodeDefinitionFilePath string
 
-	endpoint               string
 
-	listenPort             int
 
 	address                string
 
 	address6               string
 
 	localAddress           string
 
 	name                   string
 
 	postUp                 string
 
 	postDown               string
 
-	allowedIPs             string
 
 	keepAlive              int
 
 	relayAddrs             string
 
 	egressGatewayRanges    string
 
-	localRange             string
 
-	mtu                    int
 
 	expirationDateTime     int
 
 	defaultACL             bool
 
 	dnsOn                  bool
 
 	disconnect             bool
 
-	networkHub             bool
 
 )

+ 9 - 7
cli/cmd/node/list.go
View File 

@@ -2,6 +2,7 @@ package node
 
 
 import (
 
 	"os"
 
+	"strconv"
 
 
 	"github.com/gravitl/netmaker/cli/functions"
 
 	"github.com/gravitl/netmaker/models"
 
@@ -23,19 +24,20 @@ var nodeListCmd = &cobra.Command{
 
 			data = *functions.GetNodes()
 
 		}
 
 		table := tablewriter.NewWriter(os.Stdout)
 
-		table.SetHeader([]string{"Name", "Addresses", "Version", "Network", "Egress", "Ingress", "Relay", "ID"})
 
+		table.SetHeader([]string{"ID", "Addresses", "Network", "Egress", "Ingress", "Relay"})
 
 		for _, d := range data {
 
 			addresses := ""
 
-			if d.Address != "" {
 
-				addresses += d.Address
 
+			if d.Address.String() != "" {
 
+				addresses += d.Address.String()
 
 			}
 
-			if d.Address6 != "" {
 
-				if d.Address != "" {
 
+			if d.Address6.String() != "" {
 
+				if d.Address.String() != "" {
 
 					addresses += ", "
 
 				}
 
-				addresses += d.Address6
 
+				addresses += d.Address6.String()
 
 			}
 
-			table.Append([]string{d.Name, addresses, d.Version, d.Network, d.IsEgressGateway, d.IsIngressGateway, d.IsRelay, d.ID})
 
+			table.Append([]string{d.ID.String(), addresses, d.Network,
 
+				strconv.FormatBool(d.IsEgressGateway), strconv.FormatBool(d.IsIngressGateway), strconv.FormatBool(d.IsRelay)})
 
 		}
 
 		table.Render()
 
 	},

+ 0 - 10
cli/cmd/node/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "node",
 
 	Short: "Manage nodes associated with a network",
 
 	Long:  `Manage nodes associated with a network`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 27 - 33
cli/cmd/node/update.go
View File 

@@ -3,8 +3,10 @@ package node
 
 import (
 
 	"encoding/json"
 
 	"log"
 
+	"net"
 
 	"os"
 
 	"strings"
 
+	"time"
 
 
 	"github.com/gravitl/netmaker/cli/functions"
 
 	"github.com/gravitl/netmaker/models"
 
@@ -31,45 +33,43 @@ var nodeUpdateCmd = &cobra.Command{
 
 				log.Fatal(err)
 
 			}
 
 		} else {
 
-			if endpoint != "" {
 
-				node.Endpoint = endpoint
 
-				node.IsStatic = "no"
 
+			if address != "" {
 
+				if _, addr, err := net.ParseCIDR(address); err != nil {
 
+					log.Fatal(err)
 
+				} else {
 
+					node.Address = *addr
 
+				}
 
+			}
 
+			if address6 != "" {
 
+				if _, addr6, err := net.ParseCIDR(address6); err != nil {
 
+					log.Fatal(err)
 
+				} else {
 
+					node.Address6 = *addr6
 
+				}
 
+			}
 
+			if localAddress != "" {
 
+				if _, localAddr, err := net.ParseCIDR(localAddress); err != nil {
 
+					log.Fatal(err)
 
+				} else {
 
+					node.LocalAddress = *localAddr
 
+					node.IsLocal = true
 
+				}
 
 			}
 
-			node.ListenPort = int32(listenPort)
 
-			node.Address = address
 
-			node.Address6 = address6
 
-			node.LocalAddress = localAddress
 
-			node.Name = name
 
 			node.PostUp = postUp
 
 			node.PostDown = postDown
 
-			if allowedIPs != "" {
 
-				node.AllowedIPs = strings.Split(allowedIPs, ",")
 
-			}
 
-			node.PersistentKeepalive = int32(keepAlive)
 
+			node.PersistentKeepalive = time.Duration(time.Second * time.Duration(keepAlive))
 
 			if relayAddrs != "" {
 
 				node.RelayAddrs = strings.Split(relayAddrs, ",")
 
 			}
 
 			if egressGatewayRanges != "" {
 
 				node.EgressGatewayRanges = strings.Split(egressGatewayRanges, ",")
 
 			}
 
-			if localRange != "" {
 
-				node.LocalRange = localRange
 
-				node.IsLocal = "yes"
 
-			}
 
-			node.MTU = int32(mtu)
 
-			node.ExpirationDateTime = int64(expirationDateTime)
 
+			node.ExpirationDateTime = time.Unix(int64(expirationDateTime), 0)
 
 			if defaultACL {
 
 				node.DefaultACL = "yes"
 
 			}
 
-			if dnsOn {
 
-				node.DNSOn = "yes"
 
-			}
 
-			if disconnect {
 
-				node.Connected = "no"
 
-			}
 
-			if networkHub {
 
-				node.IsHub = "yes"
 
-			}
 
+			node.DNSOn = dnsOn
 
+			node.Connected = !disconnect
 
 		}
 
 		functions.PrettyPrint(functions.UpdateNode(networkName, nodeID, node))
 
 	},
 
@@ -77,24 +77,18 @@ var nodeUpdateCmd = &cobra.Command{
 
 
 func init() {
 
 	nodeUpdateCmd.Flags().StringVar(&nodeDefinitionFilePath, "file", "", "Filepath of updated node definition in JSON")
 
-	nodeUpdateCmd.Flags().StringVar(&endpoint, "endpoint", "", "Public endpoint of the node")
 
-	nodeUpdateCmd.Flags().IntVar(&listenPort, "listen_port", 0, "Default wireguard port for the node")
 
 	nodeUpdateCmd.Flags().StringVar(&address, "ipv4_addr", "", "IPv4 address of the node")
 
 	nodeUpdateCmd.Flags().StringVar(&address6, "ipv6_addr", "", "IPv6 address of the node")
 
 	nodeUpdateCmd.Flags().StringVar(&localAddress, "local_addr", "", "Locally reachable address of the node")
 
 	nodeUpdateCmd.Flags().StringVar(&name, "name", "", "Node name")
 
 	nodeUpdateCmd.Flags().StringVar(&postUp, "post_up", "", "Commands to run after node is up `;` separated")
 
 	nodeUpdateCmd.Flags().StringVar(&postDown, "post_down", "", "Commands to run after node is down `;` separated")
 
-	nodeUpdateCmd.Flags().StringVar(&allowedIPs, "allowed_addrs", "", "Additional private addresses given to the node (comma separated)")
 
 	nodeUpdateCmd.Flags().IntVar(&keepAlive, "keep_alive", 0, "Interval in which packets are sent to keep connections open with peers")
 
 	nodeUpdateCmd.Flags().StringVar(&relayAddrs, "relay_addrs", "", "Addresses for relaying connections if node acts as a relay")
 
 	nodeUpdateCmd.Flags().StringVar(&egressGatewayRanges, "egress_addrs", "", "Addresses for egressing traffic if node acts as an egress")
 
-	nodeUpdateCmd.Flags().StringVar(&localRange, "local_range", "", "Local range in which the node will look for private addresses to use as an endpoint if `LocalNetwork` is enabled")
 
-	nodeUpdateCmd.Flags().IntVar(&mtu, "mtu", 0, "MTU size")
 
 	nodeUpdateCmd.Flags().IntVar(&expirationDateTime, "expiry", 0, "UNIX timestamp after which node will lose access to the network")
 
 	nodeUpdateCmd.Flags().BoolVar(&defaultACL, "acl", false, "Enable default ACL ?")
 
 	nodeUpdateCmd.Flags().BoolVar(&dnsOn, "dns", false, "Setup DNS entries for peers locally ?")
 
 	nodeUpdateCmd.Flags().BoolVar(&disconnect, "disconnect", false, "Disconnect from the network ?")
 
-	nodeUpdateCmd.Flags().BoolVar(&networkHub, "hub", false, "On a point to site network, this node is the only one which all peers connect to ?")
 
 	rootCmd.AddCommand(nodeUpdateCmd)
 
 }

+ 3 - 14
cli/cmd/root.go
View File 

@@ -7,6 +7,7 @@ import (
 
 	"github.com/gravitl/netmaker/cli/cmd/context"
 
 	"github.com/gravitl/netmaker/cli/cmd/dns"
 
 	"github.com/gravitl/netmaker/cli/cmd/ext_client"
 
+	"github.com/gravitl/netmaker/cli/cmd/host"
 
 	"github.com/gravitl/netmaker/cli/cmd/keys"
 
 	"github.com/gravitl/netmaker/cli/cmd/metrics"
 
 	"github.com/gravitl/netmaker/cli/cmd/network"
 
@@ -23,9 +24,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "nmctl",
 
 	Short: "CLI for interacting with Netmaker Server",
 
 	Long:  `CLI for interacting with Netmaker Server`,
 
-	// Uncomment the following line if your bare application
 
-	// has an action associated with it:
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root of all subcommands
 
@@ -43,17 +41,7 @@ func Execute() {
 
 }
 
 
 func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-
 
-	// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.tctl.yaml)")
 
-
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-
 
-	// IMP: Bind subcommands here
 
+	// Bind subcommands here
 
 	rootCmd.AddCommand(network.GetRoot())
 
 	rootCmd.AddCommand(context.GetRoot())
 
 	rootCmd.AddCommand(keys.GetRoot())
 
@@ -66,4 +54,5 @@ func init() {
 
 	rootCmd.AddCommand(usergroup.GetRoot())
 
 	rootCmd.AddCommand(metrics.GetRoot())
 
 	rootCmd.AddCommand(network_user.GetRoot())
 
+	rootCmd.AddCommand(host.GetRoot())
 
 }

+ 0 - 10
cli/cmd/server/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "server",
 
 	Short: "Get netmaker server information",
 
 	Long:  `Get netmaker server information`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 10
cli/cmd/user/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "user",
 
 	Short: "Manage users and permissions",
 
 	Long:  `Manage users and permissions`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 0 - 10
cli/cmd/usergroup/root.go
View File 

@@ -11,7 +11,6 @@ var rootCmd = &cobra.Command{
 
 	Use:   "usergroup",
 
 	Short: "Manage User Groups",
 
 	Long:  `Manage User Groups`,
 
-	// Run: func(cmd *cobra.Command, args []string) { },
 
 }
 
 
 // GetRoot returns the root subcommand
 
@@ -27,12 +26,3 @@ func Execute() {
 
 		os.Exit(1)
 
 	}
 
 }
 
-
 
-func init() {
 
-	// Here you will define your flags and configuration settings.
 
-	// Cobra supports persistent flags, which, if defined here,
 
-	// will be global for your application.
 
-	// Cobra also supports local flags, which will only run
 
-	// when this action is called directly.
 
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 
-}

+ 33 - 0
cli/functions/host.go
View File 

@@ -0,0 +1,33 @@
 
+package functions
 
+
 
+import (
 
+	"net/http"
 
+
 
+	"github.com/gravitl/netmaker/models"
 
+)
 
+
 
+type hostNetworksUpdatePayload struct {
 
+	Networks []string `json:"networks"`
 
+}
 
+
 
+// GetHosts - fetch all host entries
 
+func GetHosts() *[]models.ApiHost {
 
+	return request[[]models.ApiHost](http.MethodGet, "/api/hosts", nil)
 
+}
 
+
 
+// DeleteHost - delete a host
 
+func DeleteHost(hostID string) *models.ApiHost {
 
+	return request[models.ApiHost](http.MethodDelete, "/api/hosts/"+hostID, nil)
 
+}
 
+
 
+// UpdateHost - update a host
 
+func UpdateHost(hostID string, body *models.ApiHost) *models.ApiHost {
 
+	return request[models.ApiHost](http.MethodPut, "/api/hosts/"+hostID, body)
 
+}
 
+
 
+// UpdateHostNetworks - update a host's networks
 
+func UpdateHostNetworks(hostID string, networks []string) *hostNetworksUpdatePayload {
 
+	return request[hostNetworksUpdatePayload](http.MethodPut, "/api/hosts/"+hostID+"/networks", &hostNetworksUpdatePayload{
 
+		Networks: networks,
 
+	})
 
+}

+ 1 - 1
go.mod
View File 

@@ -28,7 +28,7 @@ require (
 
 
 require (
 
 	filippo.io/edwards25519 v1.0.0
 
-	github.com/c-robinson/iplib v1.0.3
 
+	github.com/c-robinson/iplib v1.0.6
 
 	github.com/go-ping/ping v1.1.0
 
 	github.com/posthog/posthog-go v0.0.0-20211028072449-93c17c49e2b0
 
 )

+ 2 - 2
go.sum
View File 

@@ -62,8 +62,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 
-github.com/c-robinson/iplib v1.0.3 h1:NG0UF0GoEsrC1/vyfX1Lx2Ss7CySWl3KqqXh3q4DdPU=
 
-github.com/c-robinson/iplib v1.0.3/go.mod h1:i3LuuFL1hRT5gFpBRnEydzw8R6yhGkF4szNDIbF8pgo=
 
+github.com/c-robinson/iplib v1.0.6 h1:FfZV9BWNrah3BgLCFl5/nDXe4RbOi/C9n+DeXFOv5CQ=
 
+github.com/c-robinson/iplib v1.0.6/go.mod h1:i3LuuFL1hRT5gFpBRnEydzw8R6yhGkF4szNDIbF8pgo=
 
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

+ 1 - 9
logic/hosts.go
View File 

@@ -146,15 +146,7 @@ func UpsertHost(h *models.Host) error {
 
 // RemoveHost - removes a given host from server
 
 func RemoveHost(h *models.Host) error {
 
 	if len(h.Nodes) > 0 {
 
-		for i := range h.Nodes {
 
-			id := h.Nodes[i]
 
-			n, err := GetNodeByID(id)
 
-			if err == nil {
 
-				if err = DissasociateNodeFromHost(&n, h); err != nil {
 
-					return err // must remove associated nodes before removing a host
 
-				}
 
-			}
 
-		}
 
+		return fmt.Errorf("host still has associated nodes")
 
 	}
 
 	return database.DeleteRecord(database.HOSTS_TABLE_NAME, h.ID.String())
 
 }