×
diff --git a/html/layout.html b/html/layout.html
index c0b0075..2fc86f8 100644
--- a/html/layout.html
+++ b/html/layout.html
@@ -19,8 +19,7 @@
-->
-
-
+
{{template "Header" . }}
{{template "buttonbar"}}
{{template "Sidebar" .}}
@@ -29,6 +28,7 @@
{{template "Networks" .}}
{{template "Nodes" .}}
{{template "Keys" .}}
+ {{template "ExtClient" .}}
{{ template "script" }}
diff --git a/html/login.html b/html/login.html
index f4fceeb..6f7f60c 100644
--- a/html/login.html
+++ b/html/login.html
@@ -1,27 +1,32 @@
{{define "Login"}}
-
-
-
Login
-
-
-
-
-
-
-
{{.message}}
-
Please log in
-
-
-
-
+
+
+
Login
+
+
+
+
+
+
+
+
{{end}}
diff --git a/html/networks.html b/html/networks.html
index 116d05b..1d2b5bf 100644
--- a/html/networks.html
+++ b/html/networks.html
@@ -2,34 +2,35 @@
{{range .Networks}}
-
- - {{.DisplayName}} {{.AddressRange}}
-
+
{{ end }}
- {{ range .Networks }}
-
- {{ end }}
+ {{ range .Networks }}
+
+ {{ end }}
{{ end }}
diff --git a/html/nodes.html b/html/nodes.html
index c08c783..88f58a0 100644
--- a/html/nodes.html
+++ b/html/nodes.html
@@ -1,23 +1,140 @@
{{ define "Nodes" }}
-
+
- {{range .Nodes}}
-
{{.Name}} {{.Endpoint}} {{.Address}}
+ {{range .Nodes}}
+
+ {{if eq .IsEgressGateway "yes" }}
+
+ {{ else }}
+
+ {{end}}
+ {{if eq .IsIngressGateway "yes"}}
+
+ {{ else }}
+
{{end}}
+ {{end}}
{{range .Nodes}}
{{end}}
{{ end }}
+{{ define "Egress" }}
+
+
+
+
+
+
+
+
+ {{template "Header"}}
+
+
+
+
+
Make {{.Name}} into Gateway
+
+
+
+
+
+
+
+
+
+
+{{template "script"}}
+{{end}}
+
+{{define "EditNode"}}
+
+
+
+
+
+
+
+
+ {{template "Header"}}
+
+
+
Edit Node {{.Name}}
+
+
+
+
+
+
+{{end}}
+
+
+
+
+
+
+
+
+
diff --git a/html/script.html b/html/script.html
index 621a1e5..98f9731 100644
--- a/html/script.html
+++ b/html/script.html
@@ -1,7 +1,17 @@
{{define "script"}}
-{{end}}
+ {{end}}
diff --git a/html/sidebar.html b/html/sidebar.html
index 2dabb49..47fee09 100644
--- a/html/sidebar.html
+++ b/html/sidebar.html
@@ -2,9 +2,9 @@
{{end}}
diff --git a/main.go b/main.go
index 8b9a3e4..616128b 100644
--- a/main.go
+++ b/main.go
@@ -1,4 +1,10 @@
-//©2021 Matthew R Kasun mkasun@nusak.ca
+//Copyright ©2021 Matthew R Kasun mkasun@nusak.ca
+
+//Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+// http://www.apache.org/licenses/LICENSE-2.0
+
+//Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
package main
@@ -13,6 +19,7 @@ import (
"github.com/gin-gonic/gin"
controller "github.com/gravitl/netmaker/controllers"
"github.com/gravitl/netmaker/database"
+ "github.com/gravitl/netmaker/servercfg"
)
var Data PageData
@@ -26,11 +33,13 @@ func main() {
}
func SetupRouter() *gin.Engine {
+ fmt.Println("using database: ", servercfg.GetDB())
if err := database.InitializeDatabase(); err != nil {
- log.Fatal("Error connecting to Database", err)
+ log.Fatal("Error connecting to Database:\n", err)
}
router := gin.Default()
store := memstore.NewStore([]byte("secret"))
+
router.Use(sessions.Sessions("netmaker", store))
router.LoadHTMLGlob("html/*")
router.Static("images", "./images")
@@ -46,10 +55,29 @@ func SetupRouter() *gin.Engine {
private.POST("/edit_network", EditNetwork)
private.POST("/delete_network", DeleteNetwork)
private.POST("/update_network", UpdateNetwork)
+ private.GET("/refreshkeys/:net", RefreshKeys)
private.POST("/create_key", NewKey)
private.POST("/delete_key", DeleteKey)
private.POST("/create_user", CreateUser)
private.POST("/delete_user", DeleteUser)
+ private.GET("/edit_user", EditUser)
+ private.POST("/update_user/:user", UpdateUser)
+ private.POST("/edit_node", EditNode)
+ private.POST("/delete_node", DeleteNode)
+ private.POST("/update_node/:net/:mac", UpdateNode)
+ private.GET("/node_health", NodeHealth)
+ private.POST("/create_egress/:net/:mac", CreateEgress)
+ private.POST("/process_egress/:net/:mac", ProcessEgress)
+ private.POST("/delete_egress/:net/:mac", DeleteEgress)
+ private.POST("/create_ingress/:net/:mac", CreateIngress)
+ private.POST("/delete_ingress/:net/:mac", DeleteIngress)
+ private.POST("/create_ingress_client/:net/:mac", CreateIngressClient)
+ private.POST("/delete_ingress_client/:net/:id", DeleteIngressClient)
+ private.POST("/edit_ingress_client/:net/:id", EditIngressClient)
+ private.POST("/get_qr/:net/:id", GetQR)
+ private.POST("/get_client_config/:net/:id", GetClientConfig)
+ private.POST("/update_client/:net/:id", UpdateClient)
+
private.GET("/logout", LogOut)
}
return router
@@ -57,7 +85,10 @@ func SetupRouter() *gin.Engine {
func AuthRequired(c *gin.Context) {
session := sessions.Default(c)
- fmt.Println("checking authorization\n", session)
+ options := session.Options
+
+ fmt.Println("checking authorization\n", options)
+ fmt.Printf("type %v value %s\n", options, options)
loggedIn := session.Get("loggedIn")
fmt.Println("loggedIn status: ", loggedIn)
if loggedIn != true {
@@ -75,7 +106,7 @@ func AuthRequired(c *gin.Context) {
} else {
message := session.Get("error")
fmt.Println("user exists --- message\n", message)
- c.HTML(http.StatusOK, "Login", gin.H{"messge": message})
+ c.HTML(http.StatusUnauthorized, "Login", gin.H{"messge": message})
c.Abort()
}
}
diff --git a/screenshots/netmaker-gui-browser.png b/screenshots/netmaker-gui-browser.png
new file mode 100644
index 0000000..c38d828
Binary files /dev/null and b/screenshots/netmaker-gui-browser.png differ
diff --git a/screenshots/netmaker-gui-phone.png b/screenshots/netmaker-gui-phone.png
new file mode 100644
index 0000000..6ce22d8
Binary files /dev/null and b/screenshots/netmaker-gui-phone.png differ
diff --git a/screenshots/netmaker-gui-ui.png b/screenshots/netmaker-gui-ui.png
new file mode 100644
index 0000000..f9440f8
Binary files /dev/null and b/screenshots/netmaker-gui-ui.png differ
diff --git a/types.go b/types.go
index b35c560..14ab85d 100644
--- a/types.go
+++ b/types.go
@@ -3,138 +3,113 @@ package main
import (
"fmt"
+ "github.com/gin-contrib/sessions"
+ "github.com/gin-gonic/gin"
controller "github.com/gravitl/netmaker/controllers"
+ "github.com/gravitl/netmaker/functions"
"github.com/gravitl/netmaker/models"
)
-type User struct {
- UserName string
- Password string
- IsAdmin bool
-}
-
-type ErrorResponse struct {
- Code int
- Message string
-}
-
-type Success struct {
- Code int
- Message string
- Response Auth
-}
-
-type Auth struct {
- UserName string
- AuthToken string
+type NodeStatus struct {
+ Mac string
+ Status string
+ Color string
}
//PageData -contains data for html template
type PageData struct {
- Page string
- Networks []models.Network
- Nodes []models.Node
- Users []models.ReturnUser
+ Page string
+ Message string
+ Admin bool
+ Networks []models.Network
+ Nodes []models.Node
+ Users []models.ReturnUser
+ ExtClients []models.ExtClient
}
//Initializes (fetches) page data from backend
-func (data *PageData) Init(page string) {
+func (data *PageData) Init(page string, c *gin.Context) {
data.Page = page
+ session := sessions.Default(c)
+ user := session.Get("username").(string)
+ isAdmin := session.Get("isAdmin").(bool)
+ data.Message = session.Get("message").(string)
+ data.Admin = isAdmin
+ allowedNets := session.Get("networks").([]string)
networks, err := models.GetNetworks()
if err != nil {
//panic(err)
fmt.Println("error geting network data", err)
}
- data.Networks = networks
+ extclients, err := functions.GetAllExtClients()
+ if err != nil {
+ fmt.Println("error getting external client data", err)
+ }
nodes, err := models.GetAllNodes()
if err != nil {
fmt.Println("error getting node data", err)
}
- data.Nodes = nodes
users, err := controller.GetUsers()
if err != nil {
fmt.Println("error getting user data", err)
}
- data.Users = users
-
-}
+ if isAdmin {
+ data.Networks = networks
+ data.Nodes = nodes
+ data.Users = users
+ data.ExtClients = extclients
+ } else {
+ var nets []models.Network
+ for _, network := range networks {
+ if SliceContains(allowedNets, network.NetID) {
+ nets = append(nets, network)
+ }
+ data.Networks = nets
+ }
+ var hosts []models.Node
+ for _, node := range nodes {
+ if SliceContains(allowedNets, node.Network) {
+ hosts = append(hosts, node)
+ }
+ data.Nodes = hosts
+ }
+ user := models.ReturnUser{user, allowedNets, isAdmin}
+ data.Users = append([]models.ReturnUser{}, user)
-//NetSummary - contains summary network data for html template
-type NetSummary struct {
- Name string
- ID string
- Address string
- NodeModified string
- NetModified string
- Keys []models.AccessKey
- //AddressRange string
- //NodeLastModified string
- //NetworkLastModified string
-}
+ var clients []models.ExtClient
+ for _, client := range extclients {
+ if SliceContains(allowedNets, client.Network) {
+ clients = append(clients, client)
+ }
+ data.ExtClients = clients
+ }
+ }
-//NodeSummary - contains summary node data for html template
-type NodeSummary struct {
- Name string
- Network string
- PublicIP string
- SubNet string
- // PublicIP string
- // SubNetIP string
- // Status string
- // PublicKey string
- // ListenPort string
- // LastCheckin string
}
-//NetDetail - contains detailed network data for html template
-//type NetDetail struct {
-// Name string
-// AddressRange string
-// IP6Address string
-// LocalRange string
-// DisplayName string
-// NodeLastModified string
-// NetworkLastModified string
-// DefaultInterface string
-// DefaultPort string
-// PostUp string
-// PostDown string
-// KeepAlive string
-// CheckinInterval string
-// DualStack bool
-// SaveConfig bool
-// UDPHolePunch bool
-// KeyRequired bool
-//}
+func GetAllExtClients() []models.ExtClient {
+ var clients []models.ExtClient
+ var client models.ExtClient
+ client.ClientID = "clientid"
+ client.Description = "description"
+ client.PrivateKey = "private key"
+ client.PublicKey = "my public key"
+ client.Network = "net"
+ client.Address = "10.2.2.23"
+ client.IngressGatewayID = "tbd"
-//NodeDetail - contains detailed node data for html template
-type NodeDetail struct {
- Name string
- Interface string
- Network string
- AddressRange string
- IP6Address string
- ListenPort string
- PublicKey string
- Endpoint string
- Expires string
- PostUp string
- PostDown string
- KeepAlive string
- CheckinInterval string
- EgressGatewayRange string
- AllowedIPs string
- DualStack bool
- SaveConfig bool
- UDPHolePunch bool
- KeyRequired bool
- Static bool
+ clients = append(clients, client)
+ return clients
}
-type NewNet struct {
- Name string
- Address string
- Dual string
- Local string
- UDP string
+func SliceContains(s []string, x string) bool {
+ if len(s) == 0 {
+ return false
+ }
+ for i := range s {
+ if s[i] == x {
+ return true
+ }
+ }
+ return false
}