merge conflicts resolved

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -31,7 +31,9 @@ body:
       label: Version
       description: What version are you running?
       options:
-        - v0.15.1      
+        - v0.16.0      
+        - v0.15.2
+        - v0.15.1
         - v0.15.0
         - v0.14.6
         - v0.14.5

.github/workflows/buildandrelease.yml

@@ -402,6 +402,7 @@ jobs:
           cd netclient
           env GOOS=darwin GOARCH=amd64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin/netclient .
           env CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin-arm64/netclient main.go
+          env GOOS=darwin GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin-headless/netclient .
       - name: Upload darwin-amd64 to Release
         uses: svenstaro/upload-release-action@v2
         with:
@@ -421,7 +422,17 @@ jobs:
           overwrite: true
           prerelease: true
           asset_name: netclient-darwin-arm64
-
+ 
+      - name: Upload darwin-headless to Release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: netclient/build/netclient-darwin-headless/netclient
+          tag: ${{ env.NETMAKER_VERSION }}
+          overwrite: true
+          prerelease: true
+          asset_name: netclient-darwin-headless
+ 
   netclient-windows:
     runs-on: windows-latest
     needs: version

.github/workflows/docker-builder.yml

@@ -23,6 +23,6 @@ jobs:
       with:
         context: .
         push: true
-        platforms: linux/amd64, linux/arm64
+        platforms: linux/amd64, linux/arm64, linux/armv7l
         file: ./docker/Dockerfile-go-builder
         tags: gravitl/go-builder:latest

.github/workflows/publish-docker.yml

@@ -55,7 +55,7 @@ jobs:
             sleep 10
             kill %1
       -
-        name: Build arm and export to Docker
+        name: Build arm64 and export to Docker
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -64,7 +64,22 @@ jobs:
           tags: ${{ env.TAG }}
           build-args: version=${{ env.TAG }}
       -
-        name: Test arm
+        name: Test arm64
+        run: |
+            docker run --rm ${{ env.TAG }}&
+            sleep 10
+            kill %1
+      -
+        name: Build armv7l and export to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          load: true
+          platforms: linux/armv7l
+          tags: ${{ env.TAG }}
+          build-args: version=${{ env.TAG }}
+      -
+        name: Test armv7l
         run: |
             docker run --rm ${{ env.TAG }}&
             sleep 10
@@ -74,7 +89,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64, linux/arm64, linux/armv7l
           push: true
           tags: ${{ github.repository }}:${{ env.TAG }}, ${{ github.repository }}:latest
           build-args: version=${{ env.TAG }}

.github/workflows/publish-netclient-docker.yml

@@ -56,7 +56,7 @@ jobs:
             sleep 10
             kill %1
       -
-        name: Build arm and export to Docker
+        name: Build arm64 and export to Docker
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -66,7 +66,23 @@ jobs:
           tags: ${{ env.TAG }}
           build-args: version=${{ env.TAG }}  
       -
-        name: Test arm
+        name: Test arm64
+        run: |
+            docker run --rm ${{ env.TAG }}&
+            sleep 10
+            kill %1
+      -
+        name: Build armv7l and export to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          load: true
+          platforms: linux/armv7l
+          file: ./docker/Dockerfile-netclient-multiarch
+          tags: ${{ env.TAG }}
+          build-args: version=${{ env.TAG }}  
+      -
+        name: Test armv7l
         run: |
             docker run --rm ${{ env.TAG }}&
             sleep 10
@@ -76,7 +92,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64, linux/arm64, linux/armv7l
           file: ./docker/Dockerfile-netclient-multiarch
           push: true
           tags: gravitl/netclient:${{ env.TAG }}, gravitl/netclient:latest

.github/workflows/test.yml

@@ -17,6 +17,7 @@ jobs:
       - name: Build
         run: |
          env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go
+         env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags=ee main.go
          cd netclient
          env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build main.go
          env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build main.go
@@ -81,7 +82,7 @@ jobs:
             sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev 
             go test -p 1 ./... -v
             go install honnef.co/go/tools/cmd/staticcheck@latest
-            ~/go/bin/staticcheck ./...
+            { ~/go/bin/staticcheck  -tags=ee ./... ; }
         env:
           DATABASE: sqlite
           CLIENT_MODE: "off"

Dockerfile

@@ -1,11 +1,14 @@
 #first stage - builder
 FROM gravitl/go-builder as builder
-ARG version 
+ARG version
+ARG tags 
 WORKDIR /app
 COPY . .
 ENV GO111MODULE=auto
 
-RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=${version}'" -o netmaker main.go
+RUN apk add git
+RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" .
+# RUN go build -tags=ee . -o netmaker main.go
 FROM alpine:3.15.2
 
 # add a c lib

Dockerfile-quick

@@ -0,0 +1,14 @@
+#first stage - builder
+FROM alpine:3.15.2
+ARG version 
+WORKDIR /app
+COPY ./netmaker /root/netmaker
+ENV GO111MODULE=auto
+
+# add a c lib
+RUN apk add gcompat iptables wireguard-tools
+# set the working directory
+WORKDIR /root/
+RUN mkdir -p /etc/netclient/config
+EXPOSE 8081
+ENTRYPOINT ["./netmaker"]

README.md

@@ -17,7 +17,7 @@
 
 <p align="center">
   <a href="https://github.com/gravitl/netmaker/releases">
-    <img src="https://img.shields.io/badge/Version-0.15.1-informational?style=flat-square" />
+    <img src="https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square" />
   </a>
   <a href="https://hub.docker.com/r/gravitl/netmaker/tags">
     <img src="https://img.shields.io/docker/pulls/gravitl/netmaker?label=downloads" />

auth/auth.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/pro/netcache"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/servercfg"
 	"golang.org/x/crypto/bcrypt"
@@ -27,8 +28,19 @@ const (
 	oidc_provider_name     = "oidc"
 	verify_user            = "verifyuser"
 	auth_key               = "netmaker_auth"
+	user_signin_length     = 16
+	node_signin_length     = 64
 )
 
+// OAuthUser - generic OAuth strategy user
+type OAuthUser struct {
+	Name              string `json:"name" bson:"name"`
+	Email             string `json:"email" bson:"email"`
+	Login             string `json:"login" bson:"login"`
+	UserPrincipalName string `json:"userPrincipalName" bson:"userPrincipalName"`
+	AccessToken       string `json:"accesstoken" bson:"accesstoken"`
+}
+
 var auth_provider *oauth2.Config
 
 func getCurrentAuthFunctions() map[string]interface{} {
@@ -94,7 +106,14 @@ func HandleAuthCallback(w http.ResponseWriter, r *http.Request) {
 	if functions == nil {
 		return
 	}
-	functions[handle_callback].(func(http.ResponseWriter, *http.Request))(w, r)
+	state, _ := getStateAndCode(r)
+	_, err := netcache.Get(state) // if in netcache proceeed with node registration login
+	if err == nil || len(state) == node_signin_length || (err != nil && strings.Contains(err.Error(), "expired")) {
+		logger.Log(0, "proceeding with node SSO callback")
+		HandleNodeSSOCallback(w, r)
+	} else { // handle normal login
+		functions[handle_callback].(func(http.ResponseWriter, *http.Request))(w, r)
+	}
 }
 
 // swagger:route GET /api/oauth/login nodes HandleAuthLogin
@@ -197,3 +216,35 @@ func fetchPassValue(newValue string) (string, error) {
 	}
 	return string(b64CurrentValue), nil
 }
+
+func getStateAndCode(r *http.Request) (string, string) {
+	var state, code string
+	if r.FormValue("state") != "" && r.FormValue("code") != "" {
+		state = r.FormValue("state")
+		code = r.FormValue("code")
+	} else if r.URL.Query().Get("state") != "" && r.URL.Query().Get("code") != "" {
+		state = r.URL.Query().Get("state")
+		code = r.URL.Query().Get("code")
+	}
+
+	return state, code
+}
+
+func (user *OAuthUser) getUserName() string {
+	var userName string
+	if user.Email != "" {
+		userName = user.Email
+	} else if user.Login != "" {
+		userName = user.Login
+	} else if user.UserPrincipalName != "" {
+		userName = user.UserPrincipalName
+	} else if user.Name != "" {
+		userName = user.Name
+	}
+	return userName
+}
+
+func isStateCached(state string) bool {
+	_, err := netcache.Get(state)
+	return err == nil || strings.Contains(err.Error(), "expired")
+}

auth/azure-ad.go

@@ -23,11 +23,6 @@ var azure_ad_functions = map[string]interface{}{
 	verify_user:     verifyAzureUser,
 }
 
-type azureOauthUser struct {
-	UserPrincipalName string `json:"userPrincipalName" bson:"userPrincipalName"`
-	AccessToken       string `json:"accesstoken" bson:"accesstoken"`
-}
-
 // == handle azure ad authentication here ==
 
 func initAzureAD(redirectURL string, clientID string, clientSecret string) {
@@ -41,7 +36,7 @@ func initAzureAD(redirectURL string, clientID string, clientSecret string) {
 }
 
 func handleAzureLogin(w http.ResponseWriter, r *http.Request) {
-	var oauth_state_string = logic.RandomString(16)
+	var oauth_state_string = logic.RandomString(user_signin_length)
 	if auth_provider == nil && servercfg.GetFrontendURL() != "" {
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
 		return
@@ -61,7 +56,8 @@ func handleAzureLogin(w http.ResponseWriter, r *http.Request) {
 
 func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 
-	var content, err = getAzureUserInfo(r.FormValue("state"), r.FormValue("code"))
+	var rState, rCode = getStateAndCode(r)
+	var content, err = getAzureUserInfo(rState, rCode)
 	if err != nil {
 		logger.Log(1, "error when getting user info from azure:", err.Error())
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
@@ -93,9 +89,9 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?login="+jwt+"&user="+content.UserPrincipalName, http.StatusPermanentRedirect)
 }
 
-func getAzureUserInfo(state string, code string) (*azureOauthUser, error) {
+func getAzureUserInfo(state string, code string) (*OAuthUser, error) {
 	oauth_state_string, isValid := logic.IsStateValid(state)
-	if !isValid || state != oauth_state_string {
+	if (!isValid || state != oauth_state_string) && !isStateCached(state) {
 		return nil, fmt.Errorf("invalid oauth state")
 	}
 	var token, err = auth_provider.Exchange(context.Background(), code)
@@ -121,7 +117,7 @@ func getAzureUserInfo(state string, code string) (*azureOauthUser, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed reading response body: %s", err.Error())
 	}
-	var userInfo = &azureOauthUser{}
+	var userInfo = &OAuthUser{}
 	if err = json.Unmarshal(contents, userInfo); err != nil {
 		return nil, fmt.Errorf("failed parsing email from response data: %s", err.Error())
 	}

auth/github.go

@@ -23,11 +23,6 @@ var github_functions = map[string]interface{}{
 	verify_user:     verifyGithubUser,
 }
 
-type githubOauthUser struct {
-	Login       string `json:"login" bson:"login"`
-	AccessToken string `json:"accesstoken" bson:"accesstoken"`
-}
-
 // == handle github authentication here ==
 
 func initGithub(redirectURL string, clientID string, clientSecret string) {
@@ -41,7 +36,7 @@ func initGithub(redirectURL string, clientID string, clientSecret string) {
 }
 
 func handleGithubLogin(w http.ResponseWriter, r *http.Request) {
-	var oauth_state_string = logic.RandomString(16)
+	var oauth_state_string = logic.RandomString(user_signin_length)
 	if auth_provider == nil && servercfg.GetFrontendURL() != "" {
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
 		return
@@ -61,7 +56,8 @@ func handleGithubLogin(w http.ResponseWriter, r *http.Request) {
 
 func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 
-	var content, err = getGithubUserInfo(r.URL.Query().Get("state"), r.URL.Query().Get("code"))
+	var rState, rCode = getStateAndCode(r)
+	var content, err = getGithubUserInfo(rState, rCode)
 	if err != nil {
 		logger.Log(1, "error when getting user info from github:", err.Error())
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
@@ -93,10 +89,10 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?login="+jwt+"&user="+content.Login, http.StatusPermanentRedirect)
 }
 
-func getGithubUserInfo(state string, code string) (*githubOauthUser, error) {
+func getGithubUserInfo(state string, code string) (*OAuthUser, error) {
 	oauth_state_string, isValid := logic.IsStateValid(state)
-	if !isValid || state != oauth_state_string {
-		return nil, fmt.Errorf("invalid OAuth state")
+	if (!isValid || state != oauth_state_string) && !isStateCached(state) {
+		return nil, fmt.Errorf("invalid oauth state")
 	}
 	var token, err = auth_provider.Exchange(context.Background(), code)
 	if err != nil {
@@ -125,7 +121,7 @@ func getGithubUserInfo(state string, code string) (*githubOauthUser, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed reading response body: %s", err.Error())
 	}
-	var userInfo = &githubOauthUser{}
+	var userInfo = &OAuthUser{}
 	if err = json.Unmarshal(contents, userInfo); err != nil {
 		return nil, fmt.Errorf("failed parsing email from response data: %s", err.Error())
 	}

auth/google.go

@@ -24,11 +24,6 @@ var google_functions = map[string]interface{}{
 	verify_user:     verifyGoogleUser,
 }
 
-type googleOauthUser struct {
-	Email       string `json:"email" bson:"email"`
-	AccessToken string `json:"accesstoken" bson:"accesstoken"`
-}
-
 // == handle google authentication here ==
 
 func initGoogle(redirectURL string, clientID string, clientSecret string) {
@@ -42,7 +37,7 @@ func initGoogle(redirectURL string, clientID string, clientSecret string) {
 }
 
 func handleGoogleLogin(w http.ResponseWriter, r *http.Request) {
-	var oauth_state_string = logic.RandomString(16)
+	var oauth_state_string = logic.RandomString(user_signin_length)
 	if auth_provider == nil && servercfg.GetFrontendURL() != "" {
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
 		return
@@ -62,7 +57,9 @@ func handleGoogleLogin(w http.ResponseWriter, r *http.Request) {
 
 func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 
-	var content, err = getGoogleUserInfo(r.FormValue("state"), r.FormValue("code"))
+	var rState, rCode = getStateAndCode(r)
+
+	var content, err = getGoogleUserInfo(rState, rCode)
 	if err != nil {
 		logger.Log(1, "error when getting user info from google:", err.Error())
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
@@ -91,13 +88,13 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 	}
 
 	logger.Log(1, "completed google OAuth sigin in for", content.Email)
-	http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?login="+jwt+"&user="+content.Email, http.StatusPermanentRedirect)
+	http.Redirect(w, r, fmt.Sprintf("%s/login?login=%s&user=%s", servercfg.GetFrontendURL(), jwt, content.Email), http.StatusPermanentRedirect)
 }
 
-func getGoogleUserInfo(state string, code string) (*googleOauthUser, error) {
+func getGoogleUserInfo(state string, code string) (*OAuthUser, error) {
 	oauth_state_string, isValid := logic.IsStateValid(state)
-	if !isValid || state != oauth_state_string {
-		return nil, fmt.Errorf("invalid OAuth state")
+	if (!isValid || state != oauth_state_string) && !isStateCached(state) {
+		return nil, fmt.Errorf("invalid oauth state")
 	}
 	var token, err = auth_provider.Exchange(context.Background(), code)
 	if err != nil {
@@ -120,7 +117,7 @@ func getGoogleUserInfo(state string, code string) (*googleOauthUser, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed reading response body: %s", err.Error())
 	}
-	var userInfo = &googleOauthUser{}
+	var userInfo = &OAuthUser{}
 	if err = json.Unmarshal(contents, userInfo); err != nil {
 		return nil, fmt.Errorf("failed parsing email from response data: %s", err.Error())
 	}

auth/nodecallback.go

@@ -0,0 +1,261 @@
+package auth
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/pro"
+	"github.com/gravitl/netmaker/logic/pro/netcache"
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+	"github.com/gravitl/netmaker/servercfg"
+)
+
+var (
+	redirectUrl string
+)
+
+// HandleNodeSSOCallback handles the callback from the sso endpoint
+// It is the analogue of auth.handleNodeSSOCallback but takes care of the end point flow
+// Retrieves the mkey from the state cache and adds the machine to the users email namespace
+// TODO: A confirmation page for new machines should be added to avoid phishing vulnerabilities
+// TODO: Add groups information from OIDC tokens into machine HostInfo
+// Listens in /oidc/callback.
+func HandleNodeSSOCallback(w http.ResponseWriter, r *http.Request) {
+
+	var functions = getCurrentAuthFunctions()
+	if functions == nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte("bad conf"))
+		logger.Log(0, "Missing Oauth config in HandleNodeSSOCallback")
+		return
+	}
+
+	state, code := getStateAndCode(r)
+
+	var userClaims, err = functions[get_user_info].(func(string, string) (*OAuthUser, error))(state, code)
+	if err != nil {
+		logger.Log(0, "error when getting user info from callback:", err.Error())
+		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
+		return
+	}
+
+	if code == "" || state == "" {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte("Wrong params"))
+		logger.Log(0, "Missing params in HandleSSOCallback")
+		return
+	}
+
+	// all responses should be in html format from here on out
+	w.Header().Add("content-type", "text/html; charset=utf-8")
+
+	// retrieve machinekey from state cache
+	reqKeyIf, machineKeyFoundErr := netcache.Get(state)
+	if machineKeyFoundErr != nil {
+		logger.Log(0, "requested machine state key expired before authorisation completed -", machineKeyFoundErr.Error())
+		reqKeyIf = &netcache.CValue{
+			Network:    "invalid",
+			Value:      state,
+			Pass:       "",
+			User:       "netmaker",
+			Expiration: time.Now(),
+		}
+		response := returnErrTemplate("", "requested machine state key expired before authorisation completed", state, reqKeyIf)
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write(response)
+		return
+	}
+
+	user, err := isUserIsAllowed(userClaims.getUserName(), reqKeyIf.Network, true)
+	if err != nil {
+		logger.Log(0, "error occurred during SSO node join for user", userClaims.getUserName(), "on network", reqKeyIf.Network, "-", err.Error())
+		response := returnErrTemplate(user.UserName, err.Error(), state, reqKeyIf)
+		w.WriteHeader(http.StatusNotAcceptable)
+		w.Write(response)
+		return
+	}
+
+	logger.Log(1, "registering new node for user:", user.UserName, "on network", reqKeyIf.Network)
+
+	// Send OK to user in the browser
+	var response bytes.Buffer
+	if err := ssoCallbackTemplate.Execute(&response, ssoCallbackTemplateConfig{
+		User: userClaims.getUserName(),
+		Verb: "Authenticated",
+	}); err != nil {
+		logger.Log(0, "Could not render SSO callback template ", err.Error())
+		response := returnErrTemplate(user.UserName, "Could not render SSO callback template", state, reqKeyIf)
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write(response)
+
+	} else {
+		w.WriteHeader(http.StatusOK)
+		w.Write(response.Bytes())
+	}
+
+	// Need to send access key to the client
+	logger.Log(1, "Handling new machine addition to network",
+		reqKeyIf.Network, "with key",
+		reqKeyIf.Value, " identity:", userClaims.getUserName(), "claims:", fmt.Sprintf("%+v", userClaims))
+
+	var answer string
+	// The registation logic is starting here:
+	// we request access key with 1 use for the required network
+	accessToken, err := requestAccessKey(reqKeyIf.Network, 1, userClaims.getUserName())
+	if err != nil {
+		answer = fmt.Sprintf("Error from the netmaker controller %s", err.Error())
+	} else {
+		answer = fmt.Sprintf("AccessToken: %s", accessToken)
+	}
+	logger.Log(0, "Updating the token for the client request ... ")
+	// Give the user the access token via Pass in the DB
+	reqKeyIf.Pass = answer
+	if err = netcache.Set(state, reqKeyIf); err != nil {
+		logger.Log(0, "machine failed to complete join on network,", reqKeyIf.Network, "-", err.Error())
+		return
+	}
+}
+
+func setNetcache(ncache *netcache.CValue, state string) error {
+	if ncache == nil {
+		return fmt.Errorf("cache miss")
+	}
+	var err error
+	if err = netcache.Set(state, ncache); err != nil {
+		logger.Log(0, "machine failed to complete join on network,", ncache.Network, "-", err.Error())
+	}
+	return err
+}
+
+func returnErrTemplate(uname, message, state string, ncache *netcache.CValue) []byte {
+	var response bytes.Buffer
+	ncache.Pass = message
+	err := ssoErrCallbackTemplate.Execute(&response, ssoCallbackTemplateConfig{
+		User: uname,
+		Verb: message,
+	})
+	if err != nil {
+		return []byte(err.Error())
+	}
+	err = setNetcache(ncache, state)
+	if err != nil {
+		return []byte(err.Error())
+	}
+	return response.Bytes()
+}
+
+// RegisterNodeSSO redirects to the IDP for authentication
+// Puts machine key in cache so the callback can retrieve it using the oidc state param
+// Listens in /oidc/register/:regKey.
+func RegisterNodeSSO(w http.ResponseWriter, r *http.Request) {
+
+	if auth_provider == nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte("invalid login attempt"))
+		return
+	}
+	vars := mux.Vars(r)
+
+	// machineKeyStr this is not key but state
+	machineKeyStr := vars["regKey"]
+	logger.Log(1, "requested key:", machineKeyStr)
+
+	if machineKeyStr == "" {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte("invalid login attempt"))
+		return
+	}
+
+	// machineKeyStr this not key but state
+	authURL := auth_provider.AuthCodeURL(machineKeyStr)
+	//authURL = authURL + "&connector_id=" + "google"
+	logger.Log(0, "Redirecting to ", authURL, " for authentication")
+
+	http.Redirect(w, r, authURL, http.StatusSeeOther)
+
+}
+
+// == private ==
+// API to create an access key for a given network with a given name
+func requestAccessKey(network string, uses int, name string) (accessKey string, err error) {
+
+	var sAccessKey models.AccessKey
+	var sNetwork models.Network
+
+	sNetwork, err = logic.GetParentNetwork(network)
+	if err != nil {
+		logger.Log(0, "err calling GetParentNetwork API=%s", err.Error())
+		return "", fmt.Errorf("internal controller error %s", err.Error())
+	}
+	// If a key already exists, we recreate it.
+	// @TODO Is that a preferred handling ? We could also trying to re-use.
+	// can happen if user started log in but did not finish
+	for _, currentkey := range sNetwork.AccessKeys {
+		if currentkey.Name == name {
+			logger.Log(0, "erasing existing AccessKey for: ", name)
+			err = logic.DeleteKey(currentkey.Name, network)
+			if err != nil {
+				logger.Log(0, "err calling CreateAccessKey API ", err.Error())
+				return "", fmt.Errorf("key already exists. Contact admin to resolve")
+			}
+			break
+		}
+	}
+	// Only one usage is needed - for the next time new access key will be required
+	// it will be created next time after another IdP approval
+	sAccessKey.Uses = 1
+	sAccessKey.Name = name
+
+	accessToken, err := logic.CreateAccessKey(sAccessKey, sNetwork)
+	if err != nil {
+		logger.Log(0, "err calling CreateAccessKey API ", err.Error())
+		return "", fmt.Errorf("error from the netmaker controller %s", err.Error())
+	} else {
+		logger.Log(1, "created access key", sAccessKey.Name, "on", network)
+	}
+	return accessToken.AccessString, nil
+}
+
+func isUserIsAllowed(username, network string, shouldAddUser bool) (*models.User, error) {
+
+	user, err := logic.GetUser(username)
+	if err != nil && shouldAddUser { // user must not exist, so try to make one
+		if err = addUser(username); err != nil {
+			logger.Log(0, "failed to add user", username, "during a node SSO network join on network", network)
+			// response := returnErrTemplate(user.UserName, "failed to add user", state, reqKeyIf)
+			// w.WriteHeader(http.StatusInternalServerError)
+			// w.Write(response)
+			return nil, fmt.Errorf("failed to add user to system")
+		}
+		logger.Log(0, "user", username, "was added during a node SSO network join on network", network)
+		user, _ = logic.GetUser(username)
+	}
+
+	if !user.IsAdmin { // perform check to see if user is allowed to join a node to network
+		netUser, err := pro.GetNetworkUser(network, promodels.NetworkUserID(user.UserName))
+		if err != nil {
+			logger.Log(0, "failed to get net user details for user", user.UserName, "during node SSO")
+			return nil, fmt.Errorf("failed to verify network user")
+		}
+		if netUser.AccessLevel != pro.NET_ADMIN { // if user is a net admin on network, good to go
+			// otherwise, check if they have node access + haven't reached node limit on network
+			if netUser.AccessLevel == pro.NODE_ACCESS {
+				if len(netUser.Nodes) >= netUser.NodeLimit {
+					logger.Log(0, "user", user.UserName, "has reached their node limit on network", network)
+					return nil, fmt.Errorf("user node limit exceeded")
+				}
+			} else {
+				logger.Log(0, "user", user.UserName, "attempted to access network", network, "via node SSO")
+				return nil, fmt.Errorf("network user not allowed")
+			}
+		}
+	}
+
+	return &user, nil
+}

auth/nodesession.go

@@ -0,0 +1,168 @@
+package auth
+
+import (
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/gorilla/websocket"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/pro/netcache"
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+	"github.com/gravitl/netmaker/servercfg"
+)
+
+// SessionHandler - called by the HTTP router when user
+// is calling netclient with --login-server parameter in order to authenticate
+// via SSO mechanism by OAuth2 protocol flow.
+// This triggers a session start and it is managed by the flow implemented here and callback
+// When this method finishes - the auth flow has finished either OK or by timeout or any other error occured
+func SessionHandler(conn *websocket.Conn) {
+	defer conn.Close()
+
+	// If reached here we have a session from user to handle...
+	messageType, message, err := conn.ReadMessage()
+	if err != nil {
+		logger.Log(0, "Error during message reading:", err.Error())
+		return
+	}
+	var loginMessage promodels.LoginMsg
+
+	err = json.Unmarshal(message, &loginMessage)
+	if err != nil {
+		logger.Log(0, "Failed to unmarshall data err=", err.Error())
+		return
+	}
+	logger.Log(1, "SSO node join attempted with info network:", loginMessage.Network, "node identifier:", loginMessage.Mac, "user:", loginMessage.User)
+
+	req := new(netcache.CValue)
+	req.Value = string(loginMessage.Mac)
+	req.Network = loginMessage.Network
+	req.Pass = ""
+	req.User = ""
+	// Add any extra parameter provided in the configuration to the Authorize Endpoint request??
+	stateStr := hex.EncodeToString([]byte(logic.RandomString(node_signin_length)))
+	if err := netcache.Set(stateStr, req); err != nil {
+		logger.Log(0, "Failed to process sso request -", err.Error())
+		return
+	}
+	// Wait for the user to finish his auth flow...
+	// TBD: what should be the timeout here ?
+	timeout := make(chan bool, 1)
+	answer := make(chan string, 1)
+	defer close(answer)
+	defer close(timeout)
+
+	if _, err = logic.GetNetwork(loginMessage.Network); err != nil {
+		err = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+		if err != nil {
+			logger.Log(0, "error during message writing:", err.Error())
+		}
+		return
+	}
+
+	if loginMessage.User != "" { // handle basic auth
+		// verify that server supports basic auth, then authorize the request with given credentials
+		// check if user is allowed to join via node sso
+		// i.e. user is admin or user has network permissions
+		if !servercfg.IsBasicAuthEnabled() {
+			err = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			if err != nil {
+				logger.Log(0, "error during message writing:", err.Error())
+			}
+		}
+		_, err := logic.VerifyAuthRequest(models.UserAuthParams{
+			UserName: loginMessage.User,
+			Password: loginMessage.Password,
+		})
+		if err != nil {
+			err = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			if err != nil {
+				logger.Log(0, "error during message writing:", err.Error())
+			}
+			return
+		}
+		user, err := isUserIsAllowed(loginMessage.User, loginMessage.Network, false)
+		if err != nil {
+			err = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			if err != nil {
+				logger.Log(0, "error during message writing:", err.Error())
+			}
+			return
+		}
+		accessToken, err := requestAccessKey(loginMessage.Network, 1, user.UserName)
+		if err != nil {
+			req.Pass = fmt.Sprintf("Error from the netmaker controller %s", err.Error())
+		} else {
+			req.Pass = fmt.Sprintf("AccessToken: %s", accessToken)
+		}
+		// Give the user the access token via Pass in the DB
+		if err = netcache.Set(stateStr, req); err != nil {
+			logger.Log(0, "machine failed to complete join on network,", loginMessage.Network, "-", err.Error())
+			return
+		}
+	} else { // handle SSO / OAuth
+		if auth_provider == nil {
+			err = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			if err != nil {
+				logger.Log(0, "error during message writing:", err.Error())
+			}
+			return
+		}
+		redirectUrl = fmt.Sprintf("https://%s/api/oauth/register/%s", servercfg.GetAPIConnString(), stateStr)
+		err = conn.WriteMessage(messageType, []byte(redirectUrl))
+		if err != nil {
+			logger.Log(0, "error during message writing:", err.Error())
+		}
+	}
+
+	go func() {
+		for {
+			cachedReq, err := netcache.Get(stateStr)
+			if err != nil {
+				if strings.Contains(err.Error(), "expired") {
+					logger.Log(0, "timeout occurred while waiting for SSO on network", loginMessage.Network)
+					timeout <- true
+					break
+				}
+				continue
+			} else if cachedReq.Pass != "" {
+				logger.Log(0, "node SSO process completed for user", cachedReq.User, "on network", loginMessage.Network)
+				answer <- cachedReq.Pass
+				break
+			}
+			time.Sleep(500) // try it 2 times per second to see if auth is completed
+		}
+	}()
+
+	select {
+	case result := <-answer:
+		// a read from req.answerCh has occurred
+		err = conn.WriteMessage(messageType, []byte(result))
+		if err != nil {
+			logger.Log(0, "Error during message writing:", err.Error())
+		}
+	case <-timeout:
+		logger.Log(0, "Authentication server time out for a node on network", loginMessage.Network)
+		// the read from req.answerCh has timed out
+		err = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+		if err != nil {
+			logger.Log(0, "Error during message writing:", err.Error())
+		}
+	}
+	// The entry is not needed anymore, but we will let the producer to close it to avoid panic cases
+	if err = netcache.Del(stateStr); err != nil {
+		logger.Log(0, "failed to remove node SSO cache entry", err.Error())
+	}
+	// Cleanly close the connection by sending a close message and then
+	// waiting (with timeout) for the server to close the connection.
+	err = conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+	if err != nil {
+		logger.Log(0, "write close:", err.Error())
+		return
+	}
+}

auth/oidc.go

@@ -26,11 +26,6 @@ var oidc_functions = map[string]interface{}{
 
 var oidc_verifier *oidc.IDTokenVerifier
 
-type OIDCUser struct {
-	Name  string `json:"name" bson:"name"`
-	Email string `json:"email" bson:"email"`
-}
-
 // == handle OIDC authentication here ==
 
 func initOIDC(redirectURL string, clientID string, clientSecret string, issuer string) {
@@ -54,7 +49,7 @@ func initOIDC(redirectURL string, clientID string, clientSecret string, issuer s
 }
 
 func handleOIDCLogin(w http.ResponseWriter, r *http.Request) {
-	var oauth_state_string = logic.RandomString(16)
+	var oauth_state_string = logic.RandomString(user_signin_length)
 	if auth_provider == nil && servercfg.GetFrontendURL() != "" {
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
 		return
@@ -67,14 +62,15 @@ func handleOIDCLogin(w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
 		return
 	}
-
 	var url = auth_provider.AuthCodeURL(oauth_state_string)
 	http.Redirect(w, r, url, http.StatusTemporaryRedirect)
 }
 
 func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 
-	var content, err = getOIDCUserInfo(r.FormValue("state"), r.FormValue("code"))
+	var rState, rCode = getStateAndCode(r)
+
+	var content, err = getOIDCUserInfo(rState, rCode)
 	if err != nil {
 		logger.Log(1, "error when getting user info from callback:", err.Error())
 		http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect)
@@ -98,7 +94,7 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 
 	var jwt, jwtErr = logic.VerifyAuthRequest(authRequest)
 	if jwtErr != nil {
-		logger.Log(1, "could not parse jwt for user", authRequest.UserName)
+		logger.Log(1, "could not parse jwt for user", authRequest.UserName, jwtErr.Error())
 		return
 	}
 
@@ -106,10 +102,12 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?login="+jwt+"&user="+content.Email, http.StatusPermanentRedirect)
 }
 
-func getOIDCUserInfo(state string, code string) (u *OIDCUser, e error) {
+func getOIDCUserInfo(state string, code string) (u *OAuthUser, e error) {
 	oauth_state_string, isValid := logic.IsStateValid(state)
-	if !isValid || state != oauth_state_string {
-		return nil, fmt.Errorf("invalid OAuth state")
+	logger.Log(3, "using oauth state string:,", oauth_state_string)
+	logger.Log(3, "            state string:,", state)
+	if (!isValid || state != oauth_state_string) && !isStateCached(state) {
+		return nil, fmt.Errorf("invalid oauth state")
 	}
 
 	defer func() {
@@ -136,7 +134,7 @@ func getOIDCUserInfo(state string, code string) (u *OIDCUser, e error) {
 		return nil, fmt.Errorf("failed to verify raw id_token: \"%s\"", err.Error())
 	}
 
-	u = &OIDCUser{}
+	u = &OAuthUser{}
 	if err := idToken.Claims(u); err != nil {
 		e = fmt.Errorf("error when claiming OIDCUser: \"%s\"", err.Error())
 	}

auth/templates.go

@@ -0,0 +1,81 @@
+package auth
+
+import "html/template"
+
+type ssoCallbackTemplateConfig struct {
+	User string
+	Verb string
+}
+
+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/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+		integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+	  <title>Netmaker</title>
+	</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>
+	</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/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+		integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+	  <title>Netmaker</title>
+	</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>
+	</body>
+	</html>`),
+)

compose/docker-compose.ee.yml

@@ -0,0 +1,197 @@
+version: "3.4"
+
+services:
+  netmaker:
+    container_name: netmaker
+    image: gravitl/netmaker:v0.16.0-ee
+    cap_add: 
+      - NET_ADMIN
+      - NET_RAW
+      - SYS_MODULE
+    sysctls:
+      - net.ipv4.ip_forward=1
+      - net.ipv4.conf.all.src_valid_mark=1
+      - net.ipv6.conf.all.disable_ipv6=0
+      - net.ipv6.conf.all.forwarding=1
+    restart: always
+    volumes:
+      - dnsconfig:/root/config/dnsconfig
+      - sqldata:/root/data
+      - shared_certs:/etc/netmaker
+    environment:
+      SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN"
+      SERVER_HOST: "SERVER_PUBLIC_IP"
+      SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443"
+      COREDNS_ADDR: "SERVER_PUBLIC_IP"
+      DNS_MODE: "on"
+      SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN"
+      API_PORT: "8081"
+      CLIENT_MODE: "on"
+      MASTER_KEY: "REPLACE_MASTER_KEY"
+      CORS_ALLOWED_ORIGIN: "*"
+      DISPLAY_KEYS: "on"
+      DATABASE: "sqlite"
+      NODE_ID: "netmaker-server-1"
+      MQ_HOST: "mq"
+      MQ_PORT: "443"
+      MQ_SERVER_PORT: "1883"
+      HOST_NETWORK: "off"
+      VERBOSITY: "1"
+      MANAGE_IPTABLES: "on"
+      PORT_FORWARD_SERVICES: "dns"
+      METRICS_EXPORTER: "on"
+      LICENSE_KEY: "YOUR_LICENSE_KEY"
+      NETMAKER_ACCOUNT_ID: "YOUR_ACCOUNT_ID"
+    ports:
+      - "51821-51830:51821-51830/udp"
+    expose:
+      - "8081"
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.netmaker-api.entrypoints=websecure
+      - traefik.http.routers.netmaker-api.rule=Host(`api.NETMAKER_BASE_DOMAIN`)
+      - traefik.http.routers.netmaker-api.service=netmaker-api
+      - traefik.http.services.netmaker-api.loadbalancer.server.port=8081
+  netmaker-ui:
+    container_name: netmaker-ui
+    image: gravitl/netmaker-ui:v0.16.0
+    depends_on:
+      - netmaker
+    links:
+      - "netmaker:api"
+    restart: always
+    environment:
+      BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN"
+    expose:
+      - "80"
+    labels:
+      - traefik.enable=true
+      - traefik.http.middlewares.nmui-security.headers.accessControlAllowOriginList=*.NETMAKER_BASE_DOMAIN
+      - traefik.http.middlewares.nmui-security.headers.stsSeconds=31536000
+      - traefik.http.middlewares.nmui-security.headers.browserXssFilter=true
+      - traefik.http.middlewares.nmui-security.headers.customFrameOptionsValue=SAMEORIGIN
+      - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.X-Robots-Tag=none
+      - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.Server= # Remove the server name
+      - traefik.http.routers.netmaker-ui.entrypoints=websecure
+      - traefik.http.routers.netmaker-ui.middlewares=nmui-security@docker
+      - traefik.http.routers.netmaker-ui.rule=Host(`dashboard.NETMAKER_BASE_DOMAIN`)
+      - traefik.http.routers.netmaker-ui.service=netmaker-ui
+      - traefik.http.services.netmaker-ui.loadbalancer.server.port=80
+  coredns:
+    container_name: coredns
+    image: coredns/coredns
+    command: -conf /root/dnsconfig/Corefile
+    depends_on:
+      - netmaker
+    restart: always
+    volumes:
+      - dnsconfig:/root/dnsconfig
+  traefik:
+    image: traefik:v2.6
+    container_name: traefik
+    command:
+      - "--certificatesresolvers.http.acme.email=YOUR_EMAIL"
+      - "--certificatesresolvers.http.acme.storage=/letsencrypt/acme.json"
+      - "--certificatesresolvers.http.acme.tlschallenge=true"
+      - "--entrypoints.websecure.address=:443"
+      - "--entrypoints.websecure.http.tls=true"
+      - "--entrypoints.websecure.http.tls.certResolver=http"
+      - "--log.level=INFO"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedByDefault=false"
+      - "--serverstransport.insecureskipverify=true"
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - traefik_certs:/letsencrypt
+    ports:
+      - "443:443"
+  mq:
+    container_name: mq
+    image: eclipse-mosquitto:2.0.11-openssl
+    depends_on:
+      - netmaker
+    restart: unless-stopped
+    volumes:
+      - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - /root/mosquitto.passwords:/etc/mosquitto.passwords
+      - mosquitto_data:/mosquitto/data
+      - mosquitto_logs:/mosquitto/log
+      - shared_certs:/mosquitto/certs
+    expose:
+      - "8883"
+    labels:
+      - traefik.enable=true
+      - traefik.tcp.routers.mqtts.rule=HostSNI(`broker.NETMAKER_BASE_DOMAIN`)
+      - traefik.tcp.routers.mqtts.tls.passthrough=true
+      - traefik.tcp.services.mqtts-svc.loadbalancer.server.port=8883
+      - traefik.tcp.routers.mqtts.service=mqtts-svc
+      - traefik.tcp.routers.mqtts.entrypoints=websecure
+  prometheus:
+    container_name: prometheus
+    image: gravitl/netmaker-prometheus:latest
+    environment:
+      NETMAKER_METRICS_TARGET: "netmaker-exporter.NETMAKER_BASE_DOMAIN"
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.prometheus.entrypoints=websecure
+      - traefik.http.routers.prometheus.rule=Host(`prometheus.NETMAKER_BASE_DOMAIN`)
+      - traefik.http.services.prometheus.loadbalancer.server.port=9090
+      - traefik.http.routers.prometheus.service=prometheus
+    restart: always
+    volumes:
+      - prometheus_data:/prometheus
+    depends_on:
+      - netmaker
+    ports:
+      - 9090:9090
+  grafana:
+    container_name: grafana
+    image: gravitl/netmaker-grafana:latest
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.grafana.entrypoints=websecure
+      - traefik.http.routers.grafana.rule=Host(`grafana.NETMAKER_BASE_DOMAIN`)
+      - traefik.http.services.grafana.loadbalancer.server.port=3000
+      - traefik.http.routers.grafana.service=grafana
+    environment:
+      PROMETHEUS_HOST: "prometheus.NETMAKER_BASE_DOMAIN"
+      NETMAKER_METRICS_TARGET: "netmaker-exporter.NETMAKER_BASE_DOMAIN"
+    ports:
+      - 3000:3000
+    restart: always
+    links:
+      - prometheus
+    depends_on:
+      - prometheus
+      - netmaker
+  netmaker-exporter:
+    container_name: netmaker-exporter
+    image: gravitl/netmaker-exporter:latest
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.netmaker-exporter.entrypoints=websecure
+      - traefik.http.routers.netmaker-exporter.rule=Host(`netmaker-exporter.NETMAKER_BASE_DOMAIN`)
+      - traefik.http.services.netmaker-exporter.loadbalancer.server.port=8085
+      - traefik.http.routers.netmaker-exporter.service=netmaker-exporter
+    restart: always
+    depends_on:
+      - netmaker
+    environment:
+      MQ_HOST: "mq"
+      MQ_PORT: "443"
+      MQ_SERVER_PORT: "1884"
+      PROMETHEUS: "on"
+      VERBOSITY: "1"
+      API_PORT: "8085"
+      PROMETHEUS_HOST: https://prometheus.NETMAKER_BASE_DOMAIN
+    expose:
+      - "8085"
+volumes:
+  traefik_certs: {}
+  shared_certs: {}
+  sqldata: {}
+  dnsconfig: {}
+  mosquitto_data: {}
+  mosquitto_logs: {}
+  prometheus_data: {}

compose/docker-compose.reference.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
   netmaker: # The Primary Server for running Netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.15.1
+    image: gravitl/netmaker:v0.16.0
     cap_add: 
       - NET_ADMIN
       - NET_RAW
@@ -62,7 +62,7 @@ services:
       - traefik.http.services.netmaker-api.loadbalancer.server.port=8081
   netmaker-ui:  # The Netmaker UI Component
     container_name: netmaker-ui
-    image: gravitl/netmaker-ui:v0.15.1
+    image: gravitl/netmaker-ui:v0.16.0
     depends_on:
       - netmaker
     links:
@@ -140,4 +140,4 @@ volumes:
   sqldata: {} # storage for embedded sqlite
   dnsconfig: {} # storage for coredns
   mosquitto_data: {} # storage for mqtt data
-  mosquitto_logs: {} # storage for mqtt logs
+  mosquitto_logs: {} # storage for mqtt logs

compose/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
   netmaker:
     container_name: netmaker
-    image: gravitl/netmaker:v0.15.1
+    image: gravitl/netmaker:v0.16.0
     cap_add: 
       - NET_ADMIN
       - NET_RAW
@@ -52,7 +52,7 @@ services:
       - traefik.http.services.netmaker-api.loadbalancer.server.port=8081
   netmaker-ui:
     container_name: netmaker-ui
-    image: gravitl/netmaker-ui:v0.15.1
+    image: gravitl/netmaker-ui:v0.16.0
     depends_on:
       - netmaker
     links:
@@ -134,4 +134,4 @@ volumes:
   sqldata: {}
   dnsconfig: {}
   mosquitto_data: {}
-  mosquitto_logs: {}
+  mosquitto_logs: {}

config/config.go

@@ -71,6 +71,11 @@ type ServerConfig struct {
 	Server                string `yaml:"server"`
 	PublicIPService       string `yaml:"publicipservice"`
 	MQAdminPassword       string `yaml:"mqadminpassword"`
+	MetricsExporter       string `yaml:"metrics_exporter"`
+	BasicAuth             string `yaml:"basic_auth"`
+	LicenseValue          string `yaml:"license_value"`
+	NetmakerAccountID     string `yaml:"netmaker_account_id"`
+	IsEE                  string `yaml:"is_ee"`
 }
 
 // SQLConfig - Generic SQL Config

controllers/controller.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/signal"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/gorilla/handlers"
@@ -25,6 +26,9 @@ var HttpHandlers = []interface{}{
 	serverHandlers,
 	extClientHandlers,
 	ipHandlers,
+	loggerHandlers,
+	userGroupsHandlers,
+	networkUsersHandlers,
 }
 
 // HandleRESTRequests - handles the rest requests
@@ -56,7 +60,7 @@ func HandleRESTRequests(wg *sync.WaitGroup) {
 
 	// Relay os.Interrupt to our channel (os.Interrupt = CTRL+C)
 	// Ignore other incoming signals
-	ctx, stop := signal.NotifyContext(context.TODO(), os.Interrupt)
+	ctx, stop := signal.NotifyContext(context.TODO(), syscall.SIGTERM, os.Interrupt)
 	defer stop()
 
 	// Block main routine until a signal is received

controllers/dns.go

@@ -16,13 +16,13 @@ import (
 
 func dnsHandlers(r *mux.Router) {
 
-	r.HandleFunc("/api/dns", securityCheck(true, http.HandlerFunc(getAllDNS))).Methods("GET")
-	r.HandleFunc("/api/dns/adm/{network}/nodes", securityCheck(false, http.HandlerFunc(getNodeDNS))).Methods("GET")
-	r.HandleFunc("/api/dns/adm/{network}/custom", securityCheck(false, http.HandlerFunc(getCustomDNS))).Methods("GET")
-	r.HandleFunc("/api/dns/adm/{network}", securityCheck(false, http.HandlerFunc(getDNS))).Methods("GET")
-	r.HandleFunc("/api/dns/{network}", securityCheck(false, http.HandlerFunc(createDNS))).Methods("POST")
-	r.HandleFunc("/api/dns/adm/pushdns", securityCheck(false, http.HandlerFunc(pushDNS))).Methods("POST")
-	r.HandleFunc("/api/dns/{network}/{domain}", securityCheck(false, http.HandlerFunc(deleteDNS))).Methods("DELETE")
+	r.HandleFunc("/api/dns", logic.SecurityCheck(true, http.HandlerFunc(getAllDNS))).Methods("GET")
+	r.HandleFunc("/api/dns/adm/{network}/nodes", logic.SecurityCheck(false, http.HandlerFunc(getNodeDNS))).Methods("GET")
+	r.HandleFunc("/api/dns/adm/{network}/custom", logic.SecurityCheck(false, http.HandlerFunc(getCustomDNS))).Methods("GET")
+	r.HandleFunc("/api/dns/adm/{network}", logic.SecurityCheck(false, http.HandlerFunc(getDNS))).Methods("GET")
+	r.HandleFunc("/api/dns/{network}", logic.SecurityCheck(false, http.HandlerFunc(createDNS))).Methods("POST")
+	r.HandleFunc("/api/dns/adm/pushdns", logic.SecurityCheck(false, http.HandlerFunc(pushDNS))).Methods("POST")
+	r.HandleFunc("/api/dns/{network}/{domain}", logic.SecurityCheck(false, http.HandlerFunc(deleteDNS))).Methods("DELETE")
 }
 
 // swagger:route GET /api/dns/adm/{network}/nodes dns getNodeDNS
@@ -44,7 +44,7 @@ func getNodeDNS(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get node DNS entries for network [%s]: %v", network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	w.WriteHeader(http.StatusOK)
@@ -68,7 +68,7 @@ func getAllDNS(w http.ResponseWriter, r *http.Request) {
 	dns, err := logic.GetAllDNS()
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "failed to get all DNS entries: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	w.WriteHeader(http.StatusOK)
@@ -98,7 +98,7 @@ func getCustomDNS(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get custom DNS entries for network [%s]: %v", network, err.Error()))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	w.WriteHeader(http.StatusOK)
@@ -128,7 +128,7 @@ func getDNS(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get all DNS entries for network [%s]: %v", network, err.Error()))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	w.WriteHeader(http.StatusOK)
@@ -160,7 +160,7 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("invalid DNS entry %+v: %v", entry, err))
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 
@@ -168,14 +168,14 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("Failed to create DNS entry %+v: %v", entry, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	err = logic.SetDNS()
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("Failed to set DNS entries on file: %v", err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(1, "new DNS record added:", entry.Name)
@@ -221,7 +221,7 @@ func deleteDNS(w http.ResponseWriter, r *http.Request) {
 
 	if err != nil {
 		logger.Log(0, "failed to delete dns entry: ", entrytext)
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(1, "deleted dns entry: ", entrytext)
@@ -229,7 +229,7 @@ func deleteDNS(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("Failed to set DNS entries on file: %v", err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	json.NewEncoder(w).Encode(entrytext + " deleted.")
@@ -287,7 +287,7 @@ func pushDNS(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("Failed to set DNS entries on file: %v", err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(1, r.Header.Get("user"), "pushed DNS updates to nameserver")

controllers/docs.go

@@ -11,7 +11,7 @@
 //
 //     Schemes: https
 //     BasePath: /
-//     Version: 0.15.2
+//     Version: 0.16.0
 //     Host: netmaker.io
 //
 //     Consumes:

controllers/ext_client.go

@@ -12,20 +12,22 @@ import (
 	"github.com/gravitl/netmaker/functions"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/pro"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
 	"github.com/gravitl/netmaker/mq"
 	"github.com/skip2/go-qrcode"
 )
 
 func extClientHandlers(r *mux.Router) {
 
-	r.HandleFunc("/api/extclients", securityCheck(false, http.HandlerFunc(getAllExtClients))).Methods("GET")
-	r.HandleFunc("/api/extclients/{network}", securityCheck(false, http.HandlerFunc(getNetworkExtClients))).Methods("GET")
-	r.HandleFunc("/api/extclients/{network}/{clientid}", securityCheck(false, http.HandlerFunc(getExtClient))).Methods("GET")
-	r.HandleFunc("/api/extclients/{network}/{clientid}/{type}", securityCheck(false, http.HandlerFunc(getExtClientConf))).Methods("GET")
-	r.HandleFunc("/api/extclients/{network}/{clientid}", securityCheck(false, http.HandlerFunc(updateExtClient))).Methods("PUT")
-	r.HandleFunc("/api/extclients/{network}/{clientid}", securityCheck(false, http.HandlerFunc(deleteExtClient))).Methods("DELETE")
-	r.HandleFunc("/api/extclients/{network}/{nodeid}", securityCheck(false, http.HandlerFunc(createExtClient))).Methods("POST")
+	r.HandleFunc("/api/extclients", logic.SecurityCheck(false, http.HandlerFunc(getAllExtClients))).Methods("GET")
+	r.HandleFunc("/api/extclients/{network}", logic.SecurityCheck(false, http.HandlerFunc(getNetworkExtClients))).Methods("GET")
+	r.HandleFunc("/api/extclients/{network}/{clientid}", logic.SecurityCheck(false, http.HandlerFunc(getExtClient))).Methods("GET")
+	r.HandleFunc("/api/extclients/{network}/{clientid}/{type}", logic.NetUserSecurityCheck(false, true, http.HandlerFunc(getExtClientConf))).Methods("GET")
+	r.HandleFunc("/api/extclients/{network}/{clientid}", logic.NetUserSecurityCheck(false, true, http.HandlerFunc(updateExtClient))).Methods("PUT")
+	r.HandleFunc("/api/extclients/{network}/{clientid}", logic.NetUserSecurityCheck(false, true, http.HandlerFunc(deleteExtClient))).Methods("DELETE")
+	r.HandleFunc("/api/extclients/{network}/{nodeid}", logic.NetUserSecurityCheck(false, true, checkFreeTierLimits(clients_l, http.HandlerFunc(createExtClient)))).Methods("POST")
 }
 
 func checkIngressExists(nodeID string) bool {
@@ -60,7 +62,7 @@ func getNetworkExtClients(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get ext clients for network [%s]: %v", network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -94,16 +96,16 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) {
 	if marshalErr != nil {
 		logger.Log(0, "error unmarshalling networks: ",
 			marshalErr.Error())
-		returnErrorResponse(w, r, formatError(marshalErr, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(marshalErr, "internal"))
 		return
 	}
 	clients := []models.ExtClient{}
 	var err error
-	if networksSlice[0] == ALL_NETWORK_ACCESS {
+	if networksSlice[0] == logic.ALL_NETWORK_ACCESS {
 		clients, err = functions.GetAllExtClients()
 		if err != nil && !database.IsEmptyRecord(err) {
 			logger.Log(0, "failed to get all extclients: ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	} else {
@@ -144,7 +146,7 @@ func getExtClient(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), fmt.Sprintf("failed to get extclient for [%s] on network [%s]: %v",
 			clientid, network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -175,7 +177,7 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), fmt.Sprintf("failed to get extclient for [%s] on network [%s]: %v",
 			clientid, networkid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -183,14 +185,14 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get ingress gateway node [%s] info: %v", client.IngressGatewayID, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
 	network, err := logic.GetParentNetwork(client.Network)
 	if err != nil {
 		logger.Log(1, r.Header.Get("user"), "Could not retrieve Ingress Gateway Network", client.Network)
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -256,7 +258,7 @@ Endpoint = %s
 		bytes, err := qrcode.Encode(config, qrcode.Medium, 220)
 		if err != nil {
 			logger.Log(1, r.Header.Get("user"), "failed to encode qr code: ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 		w.Header().Set("Content-Type", "image/png")
@@ -264,7 +266,7 @@ Endpoint = %s
 		_, err = w.Write(bytes)
 		if err != nil {
 			logger.Log(1, r.Header.Get("user"), "response writer error (qr) ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 		return
@@ -278,7 +280,7 @@ Endpoint = %s
 		_, err := fmt.Fprint(w, config)
 		if err != nil {
 			logger.Log(1, r.Header.Get("user"), "response writer error (file) ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		}
 		return
 	}
@@ -308,7 +310,7 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
 		err := errors.New("ingress does not exist")
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to create extclient on network [%s]: %v", networkName, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -327,7 +329,7 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get ingress gateway node [%s] info: %v", nodeid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	extclient.IngressGatewayEndpoint = node.Endpoint + ":" + strconv.FormatInt(int64(node.ListenPort), 10)
@@ -337,13 +339,36 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
 	if err == nil { // check if parent network default ACL is enabled (yes) or not (no)
 		extclient.Enabled = parentNetwork.DefaultACL == "yes"
 	}
+	// check pro settings
+
 	err = logic.CreateExtClient(&extclient)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to create new ext client on network [%s]: %v", networkName, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
+
+	var isAdmin bool
+	if r.Header.Get("ismaster") != "yes" {
+		userID := r.Header.Get("user")
+		if isAdmin, err = checkProClientAccess(userID, extclient.ClientID, &parentNetwork); err != nil {
+			logger.Log(0, userID, "attempted to create a client on network", networkName, "but they lack access")
+			logic.DeleteExtClient(networkName, extclient.ClientID)
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+			return
+		}
+		if !isAdmin {
+			if err = pro.AssociateNetworkUserClient(userID, networkName, extclient.ClientID); err != nil {
+				logger.Log(0, "failed to associate client", extclient.ClientID, "to user", userID)
+			}
+			extclient.OwnerID = userID
+			if _, err := logic.UpdateExtClient(extclient.ClientID, extclient.Network, extclient.Enabled, &extclient); err != nil {
+				logger.Log(0, "failed to add owner id", userID, "to client", extclient.ClientID)
+			}
+		}
+	}
+
 	logger.Log(0, r.Header.Get("user"), "created new ext client on network", networkName)
 	w.WriteHeader(http.StatusOK)
 	err = mq.PublishExtPeerUpdate(&node)
@@ -375,7 +400,7 @@ func updateExtClient(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	clientid := params["clientid"]
@@ -385,7 +410,7 @@ func updateExtClient(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get record key for client [%s], network [%s]: %v",
 				clientid, network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	data, err := database.FetchRecord(database.EXT_CLIENT_TABLE_NAME, key)
@@ -393,22 +418,46 @@ func updateExtClient(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to fetch  ext client record key [%s] from db for client [%s], network [%s]: %v",
 				key, clientid, network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if err = json.Unmarshal([]byte(data), &oldExtClient); err != nil {
 		logger.Log(0, "error unmarshalling extclient: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
+
+	// == PRO ==
+	networkName := params["network"]
+	var changedID = newExtClient.ClientID != oldExtClient.ClientID
+	if r.Header.Get("ismaster") != "yes" {
+		userID := r.Header.Get("user")
+		_, doesOwn := doesUserOwnClient(userID, params["clientid"], networkName)
+		if !doesOwn {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("user not permitted"), "internal"))
+			return
+		}
+	}
+
+	if changedID && oldExtClient.OwnerID != "" {
+		if err := pro.DissociateNetworkUserClient(oldExtClient.OwnerID, networkName, oldExtClient.ClientID); err != nil {
+			logger.Log(0, "failed to dissociate client", oldExtClient.ClientID, "from user", oldExtClient.OwnerID)
+		}
+		if err := pro.AssociateNetworkUserClient(oldExtClient.OwnerID, networkName, newExtClient.ClientID); err != nil {
+			logger.Log(0, "failed to associate client", newExtClient.ClientID, "to user", oldExtClient.OwnerID)
+		}
+	}
+	// == END PRO ==
+
 	var changedEnabled = newExtClient.Enabled != oldExtClient.Enabled // indicates there was a change in enablement
+
 	newclient, err := logic.UpdateExtClient(newExtClient.ClientID, params["network"], newExtClient.Enabled, &oldExtClient)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to update ext client [%s], network [%s]: %v",
 				clientid, network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(0, r.Header.Get("user"), "updated ext client", newExtClient.ClientID)
@@ -448,23 +497,41 @@ func deleteExtClient(w http.ResponseWriter, r *http.Request) {
 		err = errors.New("Could not delete extclient " + params["clientid"])
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to delete extclient [%s],network [%s]: %v", clientid, network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	ingressnode, err := logic.GetNodeByID(extclient.IngressGatewayID)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get ingress gateway node [%s] info: %v", extclient.IngressGatewayID, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
+	// == PRO ==
+	if r.Header.Get("ismaster") != "yes" {
+		userID, clientID, networkName := r.Header.Get("user"), params["clientid"], params["network"]
+		_, doesOwn := doesUserOwnClient(userID, clientID, networkName)
+		if !doesOwn {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("user not permitted"), "internal"))
+			return
+		}
+	}
+
+	if extclient.OwnerID != "" {
+		if err = pro.DissociateNetworkUserClient(extclient.OwnerID, extclient.Network, extclient.ClientID); err != nil {
+			logger.Log(0, "failed to dissociate client", extclient.ClientID, "from user", extclient.OwnerID)
+		}
+	}
+
+	// == END PRO ==
+
 	err = logic.DeleteExtClient(params["network"], params["clientid"])
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to delete extclient [%s],network [%s]: %v", clientid, network, err))
 		err = errors.New("Could not delete extclient " + params["clientid"])
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -472,7 +539,65 @@ func deleteExtClient(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(1, "error setting ext peers on "+ingressnode.ID+": "+err.Error())
 	}
+
 	logger.Log(0, r.Header.Get("user"),
 		"Deleted extclient client", params["clientid"], "from network", params["network"])
-	returnSuccessResponse(w, r, params["clientid"]+" deleted.")
+	logic.ReturnSuccessResponse(w, r, params["clientid"]+" deleted.")
+}
+
+func checkProClientAccess(username, clientID string, network *models.Network) (bool, error) {
+	u, err := logic.GetUser(username)
+	if err != nil {
+		return false, err
+	}
+	if u.IsAdmin {
+		return true, nil
+	}
+
+	netUser, err := pro.GetNetworkUser(network.NetID, promodels.NetworkUserID(u.UserName))
+	if err != nil {
+		return false, err
+	}
+
+	if netUser.AccessLevel == pro.NET_ADMIN {
+		return false, nil
+	}
+
+	if netUser.AccessLevel == pro.NO_ACCESS {
+		return false, fmt.Errorf("user does not have access")
+	}
+
+	if !(len(netUser.Clients) < netUser.ClientLimit) {
+		return false, fmt.Errorf("user can not create more clients")
+	}
+
+	if netUser.AccessLevel < pro.NO_ACCESS {
+		netUser.Clients = append(netUser.Clients, clientID)
+		if err = pro.UpdateNetworkUser(network.NetID, netUser); err != nil {
+			return false, err
+		}
+	}
+	return false, nil
+}
+
+// checks if net user owns an ext client or is an admin
+func doesUserOwnClient(username, clientID, network string) (bool, bool) {
+	u, err := logic.GetUser(username)
+	if err != nil {
+		return false, false
+	}
+	if u.IsAdmin {
+		return true, true
+	}
+
+	netUser, err := pro.GetNetworkUser(network, promodels.NetworkUserID(u.UserName))
+	if err != nil {
+		return false, false
+	}
+
+	if netUser.AccessLevel == pro.NET_ADMIN {
+		return false, true
+	}
+
+	return false, logic.StringSliceContains(netUser.Clients, clientID)
 }

controllers/limits.go

@@ -0,0 +1,58 @@
+package controller
+
+import (
+	"net/http"
+
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/models"
+)
+
+// limit consts
+const (
+	node_l     = 0
+	networks_l = 1
+	users_l    = 2
+	clients_l  = 3
+)
+
+func checkFreeTierLimits(limit_choice int, next http.Handler) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var errorResponse = models.ErrorResponse{
+			Code: http.StatusUnauthorized, Message: "free tier limits exceeded on networks",
+		}
+
+		if logic.Free_Tier && logic.Is_EE { // check that free tier limits not exceeded
+			if limit_choice == networks_l {
+				currentNetworks, err := logic.GetNetworks()
+				if (err != nil && !database.IsEmptyRecord(err)) || len(currentNetworks) >= logic.Networks_Limit {
+					logic.ReturnErrorResponse(w, r, errorResponse)
+					return
+				}
+			} else if limit_choice == node_l {
+				nodes, err := logic.GetAllNodes()
+				if (err != nil && !database.IsEmptyRecord(err)) || len(nodes) >= logic.Node_Limit {
+					errorResponse.Message = "free tier limits exceeded on nodes"
+					logic.ReturnErrorResponse(w, r, errorResponse)
+					return
+				}
+			} else if limit_choice == users_l {
+				users, err := logic.GetUsers()
+				if (err != nil && !database.IsEmptyRecord(err)) || len(users) >= logic.Users_Limit {
+					errorResponse.Message = "free tier limits exceeded on users"
+					logic.ReturnErrorResponse(w, r, errorResponse)
+					return
+				}
+			} else if limit_choice == clients_l {
+				clients, err := logic.GetAllExtClients()
+				if (err != nil && !database.IsEmptyRecord(err)) || len(clients) >= logic.Clients_Limit {
+					errorResponse.Message = "free tier limits exceeded on external clients"
+					logic.ReturnErrorResponse(w, r, errorResponse)
+					return
+				}
+			}
+		}
+
+		next.ServeHTTP(w, r)
+	}
+}

controllers/logger.go

@@ -0,0 +1,23 @@
+package controller
+
+import (
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+)
+
+func loggerHandlers(r *mux.Router) {
+	r.HandleFunc("/api/logs", logic.SecurityCheck(true, http.HandlerFunc(getLogs))).Methods("GET")
+}
+
+func getLogs(w http.ResponseWriter, r *http.Request) {
+	var currentTime = time.Now().Format(logger.TimeFormatDay)
+	var currentFilePath = fmt.Sprintf("data/netmaker.log.%s", currentTime)
+	logger.DumpFile(currentFilePath)
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte(logger.Retrieve(currentFilePath)))
+}

controllers/network.go

@@ -17,26 +17,20 @@ import (
 	"github.com/gravitl/netmaker/servercfg"
 )
 
-// ALL_NETWORK_ACCESS - represents all networks
-const ALL_NETWORK_ACCESS = "THIS_USER_HAS_ALL"
-
-// NO_NETWORKS_PRESENT - represents no networks
-const NO_NETWORKS_PRESENT = "THIS_USER_HAS_NONE"
-
 func networkHandlers(r *mux.Router) {
-	r.HandleFunc("/api/networks", securityCheck(false, http.HandlerFunc(getNetworks))).Methods("GET")
-	r.HandleFunc("/api/networks", securityCheck(true, http.HandlerFunc(createNetwork))).Methods("POST")
-	r.HandleFunc("/api/networks/{networkname}", securityCheck(false, http.HandlerFunc(getNetwork))).Methods("GET")
-	r.HandleFunc("/api/networks/{networkname}", securityCheck(false, http.HandlerFunc(updateNetwork))).Methods("PUT")
-	r.HandleFunc("/api/networks/{networkname}/nodelimit", securityCheck(true, http.HandlerFunc(updateNetworkNodeLimit))).Methods("PUT")
-	r.HandleFunc("/api/networks/{networkname}", securityCheck(true, http.HandlerFunc(deleteNetwork))).Methods("DELETE")
-	r.HandleFunc("/api/networks/{networkname}/keyupdate", securityCheck(true, http.HandlerFunc(keyUpdate))).Methods("POST")
-	r.HandleFunc("/api/networks/{networkname}/keys", securityCheck(false, http.HandlerFunc(createAccessKey))).Methods("POST")
-	r.HandleFunc("/api/networks/{networkname}/keys", securityCheck(false, http.HandlerFunc(getAccessKeys))).Methods("GET")
-	r.HandleFunc("/api/networks/{networkname}/keys/{name}", securityCheck(false, http.HandlerFunc(deleteAccessKey))).Methods("DELETE")
+	r.HandleFunc("/api/networks", logic.SecurityCheck(false, http.HandlerFunc(getNetworks))).Methods("GET")
+	r.HandleFunc("/api/networks", logic.SecurityCheck(true, checkFreeTierLimits(networks_l, http.HandlerFunc(createNetwork)))).Methods("POST")
+	r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(false, http.HandlerFunc(getNetwork))).Methods("GET")
+	r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(false, http.HandlerFunc(updateNetwork))).Methods("PUT")
+	r.HandleFunc("/api/networks/{networkname}/nodelimit", logic.SecurityCheck(true, http.HandlerFunc(updateNetworkNodeLimit))).Methods("PUT")
+	r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(true, http.HandlerFunc(deleteNetwork))).Methods("DELETE")
+	r.HandleFunc("/api/networks/{networkname}/keyupdate", logic.SecurityCheck(true, http.HandlerFunc(keyUpdate))).Methods("POST")
+	r.HandleFunc("/api/networks/{networkname}/keys", logic.SecurityCheck(false, http.HandlerFunc(createAccessKey))).Methods("POST")
+	r.HandleFunc("/api/networks/{networkname}/keys", logic.SecurityCheck(false, http.HandlerFunc(getAccessKeys))).Methods("GET")
+	r.HandleFunc("/api/networks/{networkname}/keys/{name}", logic.SecurityCheck(false, http.HandlerFunc(deleteAccessKey))).Methods("DELETE")
 	// ACLs
-	r.HandleFunc("/api/networks/{networkname}/acls", securityCheck(true, http.HandlerFunc(updateNetworkACL))).Methods("PUT")
-	r.HandleFunc("/api/networks/{networkname}/acls", securityCheck(true, http.HandlerFunc(getNetworkACL))).Methods("GET")
+	r.HandleFunc("/api/networks/{networkname}/acls", logic.SecurityCheck(true, http.HandlerFunc(updateNetworkACL))).Methods("PUT")
+	r.HandleFunc("/api/networks/{networkname}/acls", logic.SecurityCheck(true, http.HandlerFunc(getNetworkACL))).Methods("GET")
 }
 
 // swagger:route GET /api/networks networks getNetworks
@@ -58,16 +52,16 @@ func getNetworks(w http.ResponseWriter, r *http.Request) {
 	if marshalErr != nil {
 		logger.Log(0, r.Header.Get("user"), "error unmarshalling networks: ",
 			marshalErr.Error())
-		returnErrorResponse(w, r, formatError(marshalErr, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(marshalErr, "badrequest"))
 		return
 	}
 	allnetworks := []models.Network{}
 	var err error
-	if networksSlice[0] == ALL_NETWORK_ACCESS {
+	if networksSlice[0] == logic.ALL_NETWORK_ACCESS {
 		allnetworks, err = logic.GetNetworks()
 		if err != nil && !database.IsEmptyRecord(err) {
 			logger.Log(0, r.Header.Get("user"), "failed to fetch networks: ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	} else {
@@ -110,7 +104,7 @@ func getNetwork(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), fmt.Sprintf("failed to fetch network [%s] info: %v",
 			netname, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if !servercfg.IsDisplayKeys() {
@@ -140,7 +134,7 @@ func keyUpdate(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), fmt.Sprintf("failed to update keys for network [%s]: %v",
 			netname, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(2, r.Header.Get("user"), "updated key on network", netname)
@@ -182,7 +176,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "failed to get network info: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	var newNetwork models.Network
@@ -190,7 +184,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 
@@ -199,21 +193,39 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 		newNetwork.DefaultPostUp = network.DefaultPostUp
 	}
 
-	rangeupdate4, rangeupdate6, localrangeupdate, holepunchupdate, err := logic.UpdateNetwork(&network, &newNetwork)
+	rangeupdate4, rangeupdate6, localrangeupdate, holepunchupdate, groupsDelta, userDelta, err := logic.UpdateNetwork(&network, &newNetwork)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "failed to update network: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		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()))
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	}
@@ -223,7 +235,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 			logger.Log(0, r.Header.Get("user"),
 				fmt.Sprintf("failed to update network [%s] ipv6 addresses: %v",
 					network.NetID, err.Error()))
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	}
@@ -233,7 +245,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 			logger.Log(0, r.Header.Get("user"),
 				fmt.Sprintf("failed to update network [%s] local addresses: %v",
 					network.NetID, err.Error()))
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	}
@@ -243,7 +255,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 			logger.Log(0, r.Header.Get("user"),
 				fmt.Sprintf("failed to update network [%s] hole punching: %v",
 					network.NetID, err.Error()))
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	}
@@ -253,7 +265,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 			logger.Log(0, r.Header.Get("user"),
 				fmt.Sprintf("failed to get network [%s] nodes: %v",
 					network.NetID, err.Error()))
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 		for _, node := range nodes {
@@ -287,7 +299,7 @@ func updateNetworkNodeLimit(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get network [%s] nodes: %v",
 				network.NetID, err.Error()))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -297,7 +309,7 @@ func updateNetworkNodeLimit(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	if networkChange.NodeLimit != 0 {
@@ -306,7 +318,7 @@ func updateNetworkNodeLimit(w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			logger.Log(0, r.Header.Get("user"),
 				"error marshalling resp: ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "badrequest"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 			return
 		}
 		database.Insert(network.NetID, string(data), database.NETWORKS_TABLE_NAME)
@@ -336,21 +348,21 @@ func updateNetworkACL(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to fetch ACLs for network [%s]: %v", netname, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	err = json.NewDecoder(r.Body).Decode(&networkACLChange)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	newNetACL, err := networkACLChange.Save(acls.ContainerID(netname))
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to update ACLs for network [%s]: %v", netname, err))
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	logger.Log(1, r.Header.Get("user"), "updated ACLs for network", netname)
@@ -394,7 +406,7 @@ func getNetworkACL(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to fetch ACLs for network [%s]: %v", netname, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(2, r.Header.Get("user"), "fetched acl for network", netname)
@@ -427,7 +439,7 @@ func deleteNetwork(w http.ResponseWriter, r *http.Request) {
 		}
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to delete network [%s]: %v", network, err))
-		returnErrorResponse(w, r, formatError(err, errtype))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, errtype))
 		return
 	}
 	logger.Log(1, r.Header.Get("user"), "deleted network", network)
@@ -457,7 +469,7 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 
@@ -465,7 +477,7 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 		err := errors.New("IPv4 or IPv6 CIDR required")
 		logger.Log(0, r.Header.Get("user"), "failed to create network: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 
@@ -473,7 +485,7 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "failed to create network: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 
@@ -486,7 +498,7 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 			}
 			logger.Log(0, r.Header.Get("user"), "failed to create network: ",
 				err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	}
@@ -519,23 +531,32 @@ func createAccessKey(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "failed to get network info: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	err = json.NewDecoder(r.Body).Decode(&accesskey)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	key, err := logic.CreateAccessKey(accesskey, network)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "failed to create access key: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
+
+	// do not allow access key creations view API with user names
+	if _, err = logic.GetUser(key.Name); err == nil {
+		logger.Log(0, "access key creation with invalid name attempted by", r.Header.Get("user"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("cannot create access key with user name"), "badrequest"))
+		logic.DeleteKey(key.Name, network.NetID)
+		return
+	}
+
 	logger.Log(1, r.Header.Get("user"), "created access key", accesskey.Name, "on", netname)
 	w.WriteHeader(http.StatusOK)
 	json.NewEncoder(w).Encode(key)
@@ -560,7 +581,7 @@ func getAccessKeys(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), fmt.Sprintf("failed to get keys for network [%s]: %v",
 			network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if !servercfg.IsDisplayKeys() {
@@ -594,7 +615,7 @@ func deleteAccessKey(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), fmt.Sprintf("failed to delete key [%s] for network [%s]: %v",
 			keyname, netname, err))
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	logger.Log(1, r.Header.Get("user"), "deleted access key", keyname, "on network,", netname)

controllers/network_test.go

@@ -17,7 +17,7 @@ type NetworkValidationTestCase struct {
 }
 
 func TestCreateNetwork(t *testing.T) {
-	database.InitializeDatabase()
+	initialize()
 	deleteAllNetworks()
 
 	var network models.Network
@@ -30,7 +30,7 @@ func TestCreateNetwork(t *testing.T) {
 	assert.Nil(t, err)
 }
 func TestGetNetwork(t *testing.T) {
-	database.InitializeDatabase()
+	initialize()
 	createNet()
 
 	t.Run("GetExistingNetwork", func(t *testing.T) {
@@ -46,7 +46,7 @@ func TestGetNetwork(t *testing.T) {
 }
 
 func TestDeleteNetwork(t *testing.T) {
-	database.InitializeDatabase()
+	initialize()
 	createNet()
 	//create nodes
 	t.Run("NetworkwithNodes", func(t *testing.T) {
@@ -62,7 +62,7 @@ func TestDeleteNetwork(t *testing.T) {
 }
 
 func TestCreateKey(t *testing.T) {
-	database.InitializeDatabase()
+	initialize()
 	createNet()
 	keys, _ := logic.GetKeys("skynet")
 	for _, key := range keys {
@@ -74,7 +74,7 @@ func TestCreateKey(t *testing.T) {
 	t.Run("NameTooLong", func(t *testing.T) {
 		network, err := logic.GetNetwork("skynet")
 		assert.Nil(t, err)
-		accesskey.Name = "Thisisareallylongkeynamethatwillfail"
+		accesskey.Name = "ThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfailThisisareallylongkeynamethatwillfail"
 		_, err = logic.CreateAccessKey(accesskey, network)
 		assert.NotNil(t, err)
 		assert.Contains(t, err.Error(), "Field validation for 'Name' failed on the 'max' tag")
@@ -134,7 +134,7 @@ func TestCreateKey(t *testing.T) {
 }
 
 func TestGetKeys(t *testing.T) {
-	database.InitializeDatabase()
+	initialize()
 	deleteAllNetworks()
 	createNet()
 	network, err := logic.GetNetwork("skynet")
@@ -157,7 +157,7 @@ func TestGetKeys(t *testing.T) {
 	})
 }
 func TestDeleteKey(t *testing.T) {
-	database.InitializeDatabase()
+	initialize()
 	createNet()
 	network, err := logic.GetNetwork("skynet")
 	assert.Nil(t, err)
@@ -179,27 +179,27 @@ func TestDeleteKey(t *testing.T) {
 func TestSecurityCheck(t *testing.T) {
 	//these seem to work but not sure it the tests are really testing the functionality
 
-	database.InitializeDatabase()
+	initialize()
 	os.Setenv("MASTER_KEY", "secretkey")
 	t.Run("NoNetwork", func(t *testing.T) {
-		networks, username, err := SecurityCheck(false, "", "Bearer secretkey")
+		networks, username, err := logic.UserPermissions(false, "", "Bearer secretkey")
 		assert.Nil(t, err)
 		t.Log(networks, username)
 	})
 	t.Run("WithNetwork", func(t *testing.T) {
-		networks, username, err := SecurityCheck(false, "skynet", "Bearer secretkey")
+		networks, username, err := logic.UserPermissions(false, "skynet", "Bearer secretkey")
 		assert.Nil(t, err)
 		t.Log(networks, username)
 	})
 	t.Run("BadNet", func(t *testing.T) {
 		t.Skip()
-		networks, username, err := SecurityCheck(false, "badnet", "Bearer secretkey")
+		networks, username, err := logic.UserPermissions(false, "badnet", "Bearer secretkey")
 		assert.NotNil(t, err)
 		t.Log(err)
 		t.Log(networks, username)
 	})
 	t.Run("BadToken", func(t *testing.T) {
-		networks, username, err := SecurityCheck(false, "skynet", "Bearer badkey")
+		networks, username, err := logic.UserPermissions(false, "skynet", "Bearer badkey")
 		assert.NotNil(t, err)
 		t.Log(err)
 		t.Log(networks, username)
@@ -210,7 +210,7 @@ func TestValidateNetwork(t *testing.T) {
 	//t.Skip()
 	//This functions is not called by anyone
 	//it panics as validation function 'display_name_valid' is not defined
-	database.InitializeDatabase()
+	initialize()
 	//yes := true
 	//no := false
 	//deleteNet(t)
@@ -295,7 +295,7 @@ func TestValidateNetwork(t *testing.T) {
 func TestIpv6Network(t *testing.T) {
 	//these seem to work but not sure it the tests are really testing the functionality
 
-	database.InitializeDatabase()
+	initialize()
 	os.Setenv("MASTER_KEY", "secretkey")
 	deleteAllNetworks()
 	createNet()
@@ -321,6 +321,21 @@ func deleteAllNetworks() {
 	}
 }
 
+func initialize() {
+	database.InitializeDatabase()
+	createAdminUser()
+}
+
+func createAdminUser() {
+	logic.CreateAdmin(models.User{
+		UserName: "admin",
+		Password: "password",
+		IsAdmin:  true,
+		Networks: []string{},
+		Groups:   []string{},
+	})
+}
+
 func createNet() {
 	var network models.Network
 	network.NetID = "skynet"

controllers/networkusers.go

@@ -0,0 +1,365 @@
+package controller
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+
+	"github.com/gorilla/mux"
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/pro"
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+)
+
+func networkUsersHandlers(r *mux.Router) {
+	r.HandleFunc("/api/networkusers", logic.SecurityCheck(true, http.HandlerFunc(getAllNetworkUsers))).Methods("GET")
+	r.HandleFunc("/api/networkusers/{network}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkUsers))).Methods("GET")
+	r.HandleFunc("/api/networkusers/{network}/{networkuser}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkUser))).Methods("GET")
+	r.HandleFunc("/api/networkusers/{network}", logic.SecurityCheck(true, http.HandlerFunc(createNetworkUser))).Methods("POST")
+	r.HandleFunc("/api/networkusers/{network}", logic.SecurityCheck(true, http.HandlerFunc(updateNetworkUser))).Methods("PUT")
+	r.HandleFunc("/api/networkusers/data/{networkuser}/me", logic.NetUserSecurityCheck(false, false, http.HandlerFunc(getNetworkUserData))).Methods("GET")
+	r.HandleFunc("/api/networkusers/{network}/{networkuser}", logic.SecurityCheck(true, http.HandlerFunc(deleteNetworkUser))).Methods("DELETE")
+}
+
+// == RETURN TYPES ==
+
+// NetworkName - represents a network name/ID
+type NetworkName string
+
+// NetworkUserDataMap - map of all data per network for a user
+type NetworkUserDataMap map[NetworkName]NetworkUserData
+
+// NetworkUserData - data struct for network users
+type NetworkUserData struct {
+	Nodes    []models.Node         `json:"nodes" bson:"nodes" yaml:"nodes"`
+	Clients  []models.ExtClient    `json:"clients" bson:"clients" yaml:"clients"`
+	Vpn      []models.Node         `json:"vpns" bson:"vpns" yaml:"vpns"`
+	Networks []models.Network      `json:"networks" bson:"networks" yaml:"networks"`
+	User     promodels.NetworkUser `json:"user" bson:"user" yaml:"user"`
+}
+
+// == END RETURN TYPES ==
+
+// returns a map of a network user's data across all networks
+func getNetworkUserData(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+
+	var params = mux.Vars(r)
+	networkUserName := params["networkuser"]
+	logger.Log(1, r.Header.Get("user"), "requested fetching network user data for user", networkUserName)
+
+	networks, err := logic.GetNetworks()
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	if networkUserName == "" {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("netuserToGet"), "badrequest"))
+		return
+	}
+
+	u, err := logic.GetUser(networkUserName)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("could not find user"), "badrequest"))
+		return
+	}
+
+	// initialize the return data of network users
+	returnData := make(NetworkUserDataMap)
+
+	// go through each network and get that user's data
+	// if user has no access, give no data
+	// if user is a net admin, give all nodes
+	// if user has node access, give user's nodes if any
+	// if user has client access, git user's clients if any
+	for i := range networks {
+
+		netID := networks[i].NetID
+		newData := NetworkUserData{
+			Nodes:    []models.Node{},
+			Clients:  []models.ExtClient{},
+			Vpn:      []models.Node{},
+			Networks: []models.Network{},
+		}
+		netUser, err := pro.GetNetworkUser(netID, promodels.NetworkUserID(networkUserName))
+		// check if user has access
+		if err == nil && netUser.AccessLevel != pro.NO_ACCESS {
+			newData.User = promodels.NetworkUser{
+				AccessLevel: netUser.AccessLevel,
+				ClientLimit: netUser.ClientLimit,
+				NodeLimit:   netUser.NodeLimit,
+				Nodes:       netUser.Nodes,
+				Clients:     netUser.Clients,
+			}
+			newData.User.SetDefaults()
+			// check network level permissions
+			if doesNetworkAllow := pro.IsUserAllowed(&networks[i], networkUserName, u.Groups); doesNetworkAllow || netUser.AccessLevel == pro.NET_ADMIN {
+				netNodes, err := logic.GetNetworkNodes(netID)
+				if err != nil {
+					if database.IsEmptyRecord(err) && netUser.AccessLevel == pro.NET_ADMIN {
+						newData.Networks = append(newData.Networks, networks[i])
+					} else {
+						logger.Log(0, "failed to retrieve nodes on network", netID, "for user", string(netUser.ID))
+					}
+				} else {
+					if netUser.AccessLevel <= pro.NODE_ACCESS { // handle nodes
+						// if access level is NODE_ACCESS, filter nodes
+						if netUser.AccessLevel == pro.NODE_ACCESS {
+							for i := range netNodes {
+								if logic.StringSliceContains(netUser.Nodes, netNodes[i].ID) {
+									newData.Nodes = append(newData.Nodes, netNodes[i])
+								}
+							}
+						} else { // net admin so, get all nodes and ext clients on network...
+							newData.Nodes = netNodes
+							for i := range netNodes {
+								if netNodes[i].IsIngressGateway == "yes" {
+									newData.Vpn = append(newData.Vpn, netNodes[i])
+									if clients, err := logic.GetExtClientsByID(netNodes[i].ID, netID); err == nil {
+										newData.Clients = append(newData.Clients, clients...)
+									}
+								}
+							}
+							newData.Networks = append(newData.Networks, networks[i])
+						}
+					}
+					if netUser.AccessLevel <= pro.CLIENT_ACCESS && netUser.AccessLevel != pro.NET_ADMIN {
+						for _, c := range netUser.Clients {
+							if client, err := logic.GetExtClient(c, netID); err == nil {
+								newData.Clients = append(newData.Clients, client)
+							}
+						}
+						for i := range netNodes {
+							if netNodes[i].IsIngressGateway == "yes" {
+								newData.Vpn = append(newData.Vpn, netNodes[i])
+							}
+						}
+					}
+				}
+			}
+			returnData[NetworkName(netID)] = newData
+		}
+	}
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(returnData)
+}
+
+// returns a map of all network users mapped to each network
+func getAllNetworkUsers(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	logger.Log(1, r.Header.Get("user"), "requested fetching all network users")
+	type allNetworkUsers = map[string][]promodels.NetworkUser
+
+	networks, err := logic.GetNetworks()
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	var allNetUsers = make(allNetworkUsers, len(networks))
+
+	for i := range networks {
+		netusers, err := pro.GetNetworkUsers(networks[i].NetID)
+		if err != nil {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+			return
+		}
+		for _, v := range netusers {
+			allNetUsers[networks[i].NetID] = append(allNetUsers[networks[i].NetID], v)
+		}
+	}
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(allNetUsers)
+}
+
+func getNetworkUsers(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+
+	var params = mux.Vars(r)
+	netname := params["network"]
+	logger.Log(1, r.Header.Get("user"), "requested fetching network users for network", netname)
+
+	_, err := logic.GetNetwork(netname)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	netusers, err := pro.GetNetworkUsers(netname)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(netusers)
+}
+
+func getNetworkUser(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+
+	var params = mux.Vars(r)
+	netname := params["network"]
+	logger.Log(1, r.Header.Get("user"), "requested fetching network user", params["networkuser"], "on network", netname)
+
+	_, err := logic.GetNetwork(netname)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	netuserToGet := params["networkuser"]
+	if netuserToGet == "" {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("netuserToGet"), "badrequest"))
+		return
+	}
+
+	netuser, err := pro.GetNetworkUser(netname, promodels.NetworkUserID(netuserToGet))
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(netuser)
+}
+
+func createNetworkUser(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	var params = mux.Vars(r)
+	netname := params["network"]
+	logger.Log(1, r.Header.Get("user"), "requested creating a network user on network", netname)
+
+	network, err := logic.GetNetwork(netname)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+	var networkuser promodels.NetworkUser
+
+	// we decode our body request params
+	err = json.NewDecoder(r.Body).Decode(&networkuser)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	err = pro.CreateNetworkUser(&network, &networkuser)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
+
+func updateNetworkUser(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+
+	var params = mux.Vars(r)
+	netname := params["network"]
+	logger.Log(1, r.Header.Get("user"), "requested updating a network user on network", netname)
+
+	network, err := logic.GetNetwork(netname)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+	var networkuser promodels.NetworkUser
+
+	// we decode our body request params
+	err = json.NewDecoder(r.Body).Decode(&networkuser)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+	if networkuser.ID == "" || !pro.DoesNetworkUserExist(netname, networkuser.ID) {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("invalid user "+string(networkuser.ID)), "badrequest"))
+		return
+	}
+	if networkuser.AccessLevel < pro.NET_ADMIN || networkuser.AccessLevel > pro.NO_ACCESS {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("invalid user access level provided"), "badrequest"))
+		return
+	}
+
+	if networkuser.ClientLimit < 0 || networkuser.NodeLimit < 0 {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("negative user limit provided"), "badrequest"))
+		return
+	}
+
+	u, err := logic.GetUser(string(networkuser.ID))
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("invalid user "+string(networkuser.ID)), "badrequest"))
+		return
+	}
+
+	if !pro.IsUserAllowed(&network, u.UserName, u.Groups) {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("user must be in allowed groups or users"), "badrequest"))
+		return
+	}
+
+	if networkuser.AccessLevel == pro.NET_ADMIN {
+		currentUser, err := logic.GetUser(string(networkuser.ID))
+		if err != nil {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("user model not found for "+string(networkuser.ID)), "badrequest"))
+			return
+		}
+
+		if !logic.StringSliceContains(currentUser.Networks, netname) {
+			// append network name to user model to conform to old model
+			if err = logic.UpdateUserNetworks(
+				append(currentUser.Networks, netname),
+				currentUser.Groups,
+				currentUser.IsAdmin,
+				&models.ReturnUser{
+					Groups:   currentUser.Groups,
+					IsAdmin:  currentUser.IsAdmin,
+					Networks: currentUser.Networks,
+					UserName: currentUser.UserName,
+				},
+			); err != nil {
+				logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("user model failed net admin update "+string(networkuser.ID)+" (are they an admin?"), "badrequest"))
+				return
+			}
+		}
+	}
+
+	err = pro.UpdateNetworkUser(netname, &networkuser)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
+
+func deleteNetworkUser(w http.ResponseWriter, r *http.Request) {
+
+	var params = mux.Vars(r)
+	netname := params["network"]
+
+	logger.Log(1, r.Header.Get("user"), "requested deleting network user", params["networkuser"], "on network", netname)
+
+	_, err := logic.GetNetwork(netname)
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	netuserToDelete := params["networkuser"]
+	if netuserToDelete == "" {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("no group name provided"), "badrequest"))
+		return
+	}
+
+	if err := pro.DeleteNetworkUser(netname, netuserToDelete); err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}

controllers/node.go

@@ -8,10 +8,11 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/gravitl/netmaker/database"
-	"github.com/gravitl/netmaker/functions"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/pro"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
 	"github.com/gravitl/netmaker/mq"
 	"github.com/gravitl/netmaker/servercfg"
 	"golang.org/x/crypto/bcrypt"
@@ -28,10 +29,10 @@ func nodeHandlers(r *mux.Router) {
 	r.HandleFunc("/api/nodes/{network}/{nodeid}/deleterelay", authorize(false, true, "user", http.HandlerFunc(deleteRelay))).Methods("DELETE")
 	r.HandleFunc("/api/nodes/{network}/{nodeid}/creategateway", authorize(false, true, "user", http.HandlerFunc(createEgressGateway))).Methods("POST")
 	r.HandleFunc("/api/nodes/{network}/{nodeid}/deletegateway", authorize(false, true, "user", http.HandlerFunc(deleteEgressGateway))).Methods("DELETE")
-	r.HandleFunc("/api/nodes/{network}/{nodeid}/createingress", securityCheck(false, http.HandlerFunc(createIngressGateway))).Methods("POST")
-	r.HandleFunc("/api/nodes/{network}/{nodeid}/deleteingress", securityCheck(false, http.HandlerFunc(deleteIngressGateway))).Methods("DELETE")
+	r.HandleFunc("/api/nodes/{network}/{nodeid}/createingress", logic.SecurityCheck(false, http.HandlerFunc(createIngressGateway))).Methods("POST")
+	r.HandleFunc("/api/nodes/{network}/{nodeid}/deleteingress", logic.SecurityCheck(false, http.HandlerFunc(deleteIngressGateway))).Methods("DELETE")
 	r.HandleFunc("/api/nodes/{network}/{nodeid}/approve", authorize(false, true, "user", http.HandlerFunc(uncordonNode))).Methods("POST")
-	r.HandleFunc("/api/nodes/{network}", nodeauth(http.HandlerFunc(createNode))).Methods("POST")
+	r.HandleFunc("/api/nodes/{network}", nodeauth(checkFreeTierLimits(node_l, http.HandlerFunc(createNode)))).Methods("POST")
 	r.HandleFunc("/api/nodes/adm/{network}/lastmodified", authorize(false, true, "network", http.HandlerFunc(getLastModified))).Methods("GET")
 	r.HandleFunc("/api/nodes/adm/{network}/authenticate", authenticate).Methods("POST")
 }
@@ -64,19 +65,19 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 		errorResponse.Message = decoderErr.Error()
 		logger.Log(0, request.Header.Get("user"), "error decoding request body: ",
 			decoderErr.Error())
-		returnErrorResponse(response, request, errorResponse)
+		logic.ReturnErrorResponse(response, request, errorResponse)
 		return
 	} else {
 		errorResponse.Code = http.StatusBadRequest
 		if authRequest.ID == "" {
 			errorResponse.Message = "W1R3: ID can't be empty"
 			logger.Log(0, request.Header.Get("user"), errorResponse.Message)
-			returnErrorResponse(response, request, errorResponse)
+			logic.ReturnErrorResponse(response, request, errorResponse)
 			return
 		} else if authRequest.Password == "" {
 			errorResponse.Message = "W1R3: Password can't be empty"
 			logger.Log(0, request.Header.Get("user"), errorResponse.Message)
-			returnErrorResponse(response, request, errorResponse)
+			logic.ReturnErrorResponse(response, request, errorResponse)
 			return
 		} else {
 			var err error
@@ -87,7 +88,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 				errorResponse.Message = err.Error()
 				logger.Log(0, request.Header.Get("user"),
 					fmt.Sprintf("failed to get node info [%s]: %v", authRequest.ID, err))
-				returnErrorResponse(response, request, errorResponse)
+				logic.ReturnErrorResponse(response, request, errorResponse)
 				return
 			}
 
@@ -97,7 +98,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 				errorResponse.Message = err.Error()
 				logger.Log(0, request.Header.Get("user"),
 					"error validating user password: ", err.Error())
-				returnErrorResponse(response, request, errorResponse)
+				logic.ReturnErrorResponse(response, request, errorResponse)
 				return
 			} else {
 				tokenString, err := logic.CreateJWT(authRequest.ID, authRequest.MacAddress, result.Network)
@@ -107,7 +108,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 					errorResponse.Message = "Could not create Token"
 					logger.Log(0, request.Header.Get("user"),
 						fmt.Sprintf("%s: %v", errorResponse.Message, err))
-					returnErrorResponse(response, request, errorResponse)
+					logic.ReturnErrorResponse(response, request, errorResponse)
 					return
 				}
 
@@ -126,7 +127,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 					errorResponse.Message = err.Error()
 					logger.Log(0, request.Header.Get("user"),
 						"error marshalling resp: ", err.Error())
-					returnErrorResponse(response, request, errorResponse)
+					logic.ReturnErrorResponse(response, request, errorResponse)
 					return
 				}
 				response.WriteHeader(http.StatusOK)
@@ -147,7 +148,7 @@ func nodeauth(next http.Handler) http.HandlerFunc {
 			errorResponse := models.ErrorResponse{
 				Code: http.StatusUnauthorized, Message: "W1R3: You are unauthorized to access this endpoint.",
 			}
-			returnErrorResponse(w, r, errorResponse)
+			logic.ReturnErrorResponse(w, r, errorResponse)
 			return
 		} else {
 			token = tokenSplit[1]
@@ -159,7 +160,7 @@ func nodeauth(next http.Handler) http.HandlerFunc {
 			errorResponse := models.ErrorResponse{
 				Code: http.StatusNotFound, Message: "no networks",
 			}
-			returnErrorResponse(w, r, errorResponse)
+			logic.ReturnErrorResponse(w, r, errorResponse)
 			return
 		}
 		for _, network := range networks {
@@ -175,7 +176,7 @@ func nodeauth(next http.Handler) http.HandlerFunc {
 			errorResponse := models.ErrorResponse{
 				Code: http.StatusUnauthorized, Message: "You are unauthorized to access this endpoint.",
 			}
-			returnErrorResponse(w, r, errorResponse)
+			logic.ReturnErrorResponse(w, r, errorResponse)
 			return
 		}
 		next.ServeHTTP(w, r)
@@ -192,16 +193,16 @@ func nodeauth(next http.Handler) http.HandlerFunc {
 func authorize(nodesAllowed, networkCheck bool, authNetwork string, next http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var errorResponse = models.ErrorResponse{
-			Code: http.StatusUnauthorized, Message: unauthorized_msg,
+			Code: http.StatusUnauthorized, Message: logic.Unauthorized_Msg,
 		}
 
 		var params = mux.Vars(r)
 
-		networkexists, _ := functions.NetworkExists(params["network"])
+		networkexists, _ := logic.NetworkExists(params["network"])
 		//check that the request is for a valid network
 		//if (networkCheck && !networkexists) || err != nil {
 		if networkCheck && !networkexists {
-			returnErrorResponse(w, r, errorResponse)
+			logic.ReturnErrorResponse(w, r, errorResponse)
 			return
 		} else {
 			w.Header().Set("Content-Type", "application/json")
@@ -218,7 +219,7 @@ func authorize(nodesAllowed, networkCheck bool, authNetwork string, next http.Ha
 			if len(tokenSplit) > 1 {
 				authToken = tokenSplit[1]
 			} else {
-				returnErrorResponse(w, r, errorResponse)
+				logic.ReturnErrorResponse(w, r, errorResponse)
 				return
 			}
 			//check if node instead of user
@@ -234,9 +235,10 @@ func authorize(nodesAllowed, networkCheck bool, authNetwork string, next http.Ha
 			var nodeID = ""
 			username, networks, isadmin, errN := logic.VerifyUserToken(authToken)
 			if errN != nil {
-				returnErrorResponse(w, r, errorResponse)
+				logic.ReturnErrorResponse(w, r, errorResponse)
 				return
 			}
+
 			isnetadmin := isadmin
 			if errN == nil && isadmin {
 				nodeID = "mastermac"
@@ -244,7 +246,7 @@ func authorize(nodesAllowed, networkCheck bool, authNetwork string, next http.Ha
 				r.Header.Set("ismasterkey", "yes")
 			}
 			if !isadmin && params["network"] != "" {
-				if logic.StringSliceContains(networks, params["network"]) {
+				if logic.StringSliceContains(networks, params["network"]) && pro.IsUserNetAdmin(params["network"], username) {
 					isnetadmin = true
 				}
 			}
@@ -266,7 +268,7 @@ func authorize(nodesAllowed, networkCheck bool, authNetwork string, next http.Ha
 					} else {
 						node, err := logic.GetNodeByID(nodeID)
 						if err != nil {
-							returnErrorResponse(w, r, errorResponse)
+							logic.ReturnErrorResponse(w, r, errorResponse)
 							return
 						}
 						isAuthorized = (node.Network == params["network"])
@@ -284,7 +286,7 @@ func authorize(nodesAllowed, networkCheck bool, authNetwork string, next http.Ha
 				}
 			}
 			if !isAuthorized {
-				returnErrorResponse(w, r, errorResponse)
+				logic.ReturnErrorResponse(w, r, errorResponse)
 				return
 			} else {
 				//If authorized, this function passes along it's request and output to the appropriate route function.
@@ -321,7 +323,7 @@ func getNetworkNodes(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching nodes on network %s: %v", networkName, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -355,7 +357,7 @@ func getAllNodes(w http.ResponseWriter, r *http.Request) {
 	if err != nil && r.Header.Get("ismasterkey") != "yes" {
 		logger.Log(0, r.Header.Get("user"),
 			"error fetching user info: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	var nodes []models.Node
@@ -363,7 +365,7 @@ func getAllNodes(w http.ResponseWriter, r *http.Request) {
 		nodes, err = logic.GetAllNodes()
 		if err != nil {
 			logger.Log(0, "error fetching all nodes info: ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	} else {
@@ -371,7 +373,7 @@ func getAllNodes(w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			logger.Log(0, r.Header.Get("user"),
 				"error fetching nodes: ", err.Error())
-			returnErrorResponse(w, r, formatError(err, "internal"))
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 			return
 		}
 	}
@@ -415,7 +417,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching node [ %s ] info: %v", nodeid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -423,7 +425,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
 	if err != nil && !database.IsEmptyRecord(err) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching wg peers config for node [ %s ]: %v", nodeid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -435,6 +437,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
 		Node:         node,
 		Peers:        peerUpdate.Peers,
 		ServerConfig: servercfg.GetServerInfo(),
+		PeerIDs:      peerUpdate.PeerIDs,
 	}
 
 	logger.Log(2, r.Header.Get("user"), "fetched node", params["nodeid"])
@@ -466,7 +469,7 @@ func getLastModified(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching network [%s] info: %v", networkName, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(2, r.Header.Get("user"), "called last modified")
@@ -494,12 +497,12 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 		Code: http.StatusInternalServerError, Message: "W1R3: It's not you it's me.",
 	}
 	networkName := params["network"]
-	networkexists, err := functions.NetworkExists(networkName)
+	networkexists, err := logic.NetworkExists(networkName)
 
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to fetch network [%s] info: %v", networkName, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	} else if !networkexists {
 		errorResponse = models.ErrorResponse{
@@ -507,7 +510,7 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 		}
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("network [%s] does not exist", networkName))
-		returnErrorResponse(w, r, errorResponse)
+		logic.ReturnErrorResponse(w, r, errorResponse)
 		return
 	}
 
@@ -517,7 +520,7 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 	err = json.NewDecoder(r.Body).Decode(&node)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 
@@ -527,17 +530,17 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get network [%s] info: %v", node.Network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	node.NetworkSettings, err = logic.GetNetworkSettings(node.Network)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to get network [%s] settings: %v", node.Network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
-	validKey := logic.IsKeyValid(networkName, node.AccessKey)
+	keyName, validKey := logic.IsKeyValid(networkName, node.AccessKey)
 	if !validKey {
 		// Check to see if network will allow manual sign up
 		// may want to switch this up with the valid key check and avoid a DB call that way.
@@ -550,24 +553,32 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 			logger.Log(0, r.Header.Get("user"),
 				fmt.Sprintf("failed to create node on network [%s]: %s",
 					node.Network, errorResponse.Message))
-			returnErrorResponse(w, r, errorResponse)
+			logic.ReturnErrorResponse(w, r, errorResponse)
 			return
 		}
 	}
+	user, err := pro.GetNetworkUser(networkName, promodels.NetworkUserID(keyName))
+	if err == nil {
+		if user.ID != "" {
+			logger.Log(1, "associating new node with user", keyName)
+			node.OwnerID = string(user.ID)
+		}
+	}
+
 	key, keyErr := logic.RetrievePublicTrafficKey()
 	if keyErr != nil {
 		logger.Log(0, "error retrieving key: ", keyErr.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if key == nil {
 		logger.Log(0, "error: server traffic key is nil")
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if node.TrafficKeys.Mine == nil {
 		logger.Log(0, "error: node traffic key is nil")
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	node.TrafficKeys = models.TrafficKeys{
@@ -580,15 +591,33 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to create node on network [%s]: %s",
 				node.Network, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
+	// check if key belongs to a user
+	// if so add to their netuser data
+	// if it fails remove the node and fail request
+	if user != nil {
+		var updatedUserNode bool
+		user.Nodes = append(user.Nodes, node.ID) // add new node to user
+		if err = pro.UpdateNetworkUser(networkName, user); err == nil {
+			logger.Log(1, "added node", node.ID, node.Name, "to user", string(user.ID))
+			updatedUserNode = true
+		}
+		if !updatedUserNode { // user was found but not updated, so delete node
+			logger.Log(0, "failed to add node to user", keyName)
+			logic.DeleteNodeByID(&node, true)
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+			return
+		}
+	}
+
 	peerUpdate, err := logic.GetPeerUpdate(&node)
 	if err != nil && !database.IsEmptyRecord(err) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching wg peers config for node [ %s ]: %v", node.ID, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	// Delete Any Existing Client with this ID.
@@ -624,6 +653,7 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 		Node:         node,
 		Peers:        peerUpdate.Peers,
 		ServerConfig: servercfg.GetServerInfo(),
+		PeerIDs:      peerUpdate.PeerIDs,
 	}
 
 	logger.Log(1, r.Header.Get("user"), "created new node", node.Name, "on network", node.Network)
@@ -653,7 +683,7 @@ func uncordonNode(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to uncordon node [%s]: %v", node.Name, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(1, r.Header.Get("user"), "uncordoned node", node.Name)
@@ -683,7 +713,7 @@ func createEgressGateway(w http.ResponseWriter, r *http.Request) {
 	err := json.NewDecoder(r.Body).Decode(&gateway)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	gateway.NetID = params["network"]
@@ -693,7 +723,7 @@ func createEgressGateway(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to create egress gateway on node [%s] on network [%s]: %v",
 				gateway.NodeID, gateway.NetID, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -725,7 +755,7 @@ func deleteEgressGateway(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to delete egress gateway on node [%s] on network [%s]: %v",
 				nodeid, netid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -759,7 +789,7 @@ func createIngressGateway(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to create ingress gateway on node [%s] on network [%s]: %v",
 				nodeid, netid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -791,7 +821,7 @@ func deleteIngressGateway(w http.ResponseWriter, r *http.Request) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to delete ingress gateway on node [%s] on network [%s]: %v",
 				nodeid, netid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -825,7 +855,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching node [ %s ] info: %v", nodeid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -834,7 +864,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
 	err = json.NewDecoder(r.Body).Decode(&newNode)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	relayupdate := false
@@ -882,7 +912,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to update node info [ %s ] info: %v", nodeid, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if relayupdate {
@@ -929,22 +959,29 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching node [ %s ] info: %v", nodeid, err))
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	if isServer(&node) {
 		err := fmt.Errorf("cannot delete server node")
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to delete node [ %s ]: %v", nodeid, err))
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
+	if r.Header.Get("ismaster") != "yes" {
+		username := r.Header.Get("user")
+		if username != "" && !doesUserOwnNode(username, params["network"], nodeid) {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("user not permitted"), "badrequest"))
+			return
+		}
+	}
 	//send update to node to be deleted before deleting on server otherwise message cannot be sent
 	node.Action = models.NODE_DELETE
 
 	err = logic.DeleteNodeByID(&node, false)
 	if err != nil {
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	mq.DynSecChan <- mq.DynSecAction{
@@ -958,8 +995,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
 			},
 		},
 	}
-	returnSuccessResponse(w, r, nodeid+" deleted.")
-
+	logic.ReturnSuccessResponse(w, r, nodeid+" deleted.")
 	logger.Log(1, r.Header.Get("user"), "Deleted node", nodeid, "from network", params["network"])
 	runUpdates(&node, false)
 	runForceServerUpdate(&node, false)
@@ -1045,3 +1081,24 @@ func updateRelay(oldnode, newnode *models.Node) {
 	}
 	logic.UpdateNode(relay, newrelay)
 }
+
+func doesUserOwnNode(username, network, nodeID string) bool {
+	u, err := logic.GetUser(username)
+	if err != nil {
+		return false
+	}
+	if u.IsAdmin {
+		return true
+	}
+
+	netUser, err := pro.GetNetworkUser(network, promodels.NetworkUserID(u.UserName))
+	if err != nil {
+		return false
+	}
+
+	if netUser.AccessLevel == pro.NET_ADMIN {
+		return true
+	}
+
+	return logic.StringSliceContains(netUser.Nodes, nodeID)
+}

controllers/relay.go

@@ -30,7 +30,7 @@ func createRelay(w http.ResponseWriter, r *http.Request) {
 	err := json.NewDecoder(r.Body).Decode(&relay)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	relay.NetID = params["network"]
@@ -39,7 +39,7 @@ func createRelay(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to create relay on node [%s] on network [%s]: %v", relay.NodeID, relay.NetID, err))
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(1, r.Header.Get("user"), "created relay on node", relay.NodeID, "on network", relay.NetID)
@@ -73,7 +73,7 @@ func deleteRelay(w http.ResponseWriter, r *http.Request) {
 	updatenodes, node, err := logic.DeleteRelay(netid, nodeid)
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	logger.Log(1, r.Header.Get("user"), "deleted relay server", nodeid, "on network", netid)

controllers/response_test.go

@@ -7,12 +7,13 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestFormatError(t *testing.T) {
-	response := formatError(errors.New("this is a sample error"), "badrequest")
+	response := logic.FormatError(errors.New("this is a sample error"), "badrequest")
 	assert.Equal(t, http.StatusBadRequest, response.Code)
 	assert.Equal(t, "this is a sample error", response.Message)
 }
@@ -20,7 +21,7 @@ func TestFormatError(t *testing.T) {
 func TestReturnSuccessResponse(t *testing.T) {
 	var response models.SuccessResponse
 	handler := func(rw http.ResponseWriter, r *http.Request) {
-		returnSuccessResponse(rw, r, "This is a test message")
+		logic.ReturnSuccessResponse(rw, r, "This is a test message")
 	}
 	req := httptest.NewRequest(http.MethodGet, "http://example.com", nil)
 	w := httptest.NewRecorder()
@@ -42,7 +43,7 @@ func TestReturnErrorResponse(t *testing.T) {
 	errMessage.Code = http.StatusUnauthorized
 	errMessage.Message = "You are not authorized to access this endpoint"
 	handler := func(rw http.ResponseWriter, r *http.Request) {
-		returnErrorResponse(rw, r, errMessage)
+		logic.ReturnErrorResponse(rw, r, errMessage)
 	}
 	req := httptest.NewRequest(http.MethodGet, "http://example.com", nil)
 	w := httptest.NewRecorder()

controllers/security.go

@@ -1,129 +0,0 @@
-package controller
-
-import (
-	"encoding/json"
-	"net/http"
-	"strings"
-
-	"github.com/gorilla/mux"
-	"github.com/gravitl/netmaker/database"
-	"github.com/gravitl/netmaker/functions"
-	"github.com/gravitl/netmaker/logic"
-	"github.com/gravitl/netmaker/models"
-	"github.com/gravitl/netmaker/servercfg"
-)
-
-const (
-	master_uname     = "masteradministrator"
-	unauthorized_msg = "unauthorized"
-	unauthorized_err = models.Error(unauthorized_msg)
-)
-
-func securityCheck(reqAdmin bool, next http.Handler) http.HandlerFunc {
-
-	return func(w http.ResponseWriter, r *http.Request) {
-		var errorResponse = models.ErrorResponse{
-			Code: http.StatusUnauthorized, Message: unauthorized_msg,
-		}
-
-		var params = mux.Vars(r)
-		bearerToken := r.Header.Get("Authorization")
-		// to have a custom DNS service adding entries
-		// we should refactor this, but is for the special case of an external service to query the DNS api
-		if strings.Contains(r.RequestURI, "/dns") && strings.ToUpper(r.Method) == "GET" && authenticateDNSToken(bearerToken) {
-			// do dns stuff
-			r.Header.Set("user", "nameserver")
-			networks, _ := json.Marshal([]string{ALL_NETWORK_ACCESS})
-			r.Header.Set("networks", string(networks))
-			next.ServeHTTP(w, r)
-			return
-		}
-		var networkName = params["networkname"]
-		if len(networkName) == 0 {
-			networkName = params["network"]
-		}
-		networks, username, err := SecurityCheck(reqAdmin, networkName, bearerToken)
-		if err != nil {
-			returnErrorResponse(w, r, errorResponse)
-			return
-		}
-		networksJson, err := json.Marshal(&networks)
-		if err != nil {
-			returnErrorResponse(w, r, errorResponse)
-			return
-		}
-		r.Header.Set("user", username)
-		r.Header.Set("networks", string(networksJson))
-		next.ServeHTTP(w, r)
-	}
-}
-
-// SecurityCheck - checks token stuff
-func SecurityCheck(reqAdmin bool, netname string, token string) ([]string, string, error) {
-	var tokenSplit = strings.Split(token, " ")
-	var authToken = ""
-	userNetworks := []string{}
-
-	if len(tokenSplit) < 2 {
-		return userNetworks, "", unauthorized_err
-	} else {
-		authToken = tokenSplit[1]
-	}
-	//all endpoints here require master so not as complicated
-	if authenticateMaster(authToken) {
-		return []string{ALL_NETWORK_ACCESS}, master_uname, nil
-	}
-	username, networks, isadmin, err := logic.VerifyUserToken(authToken)
-	if err != nil {
-		return nil, username, unauthorized_err
-	}
-	if !isadmin && reqAdmin {
-		return nil, username, unauthorized_err
-	}
-	userNetworks = networks
-	if isadmin {
-		return []string{ALL_NETWORK_ACCESS}, username, nil
-	}
-	// check network admin access
-	if len(netname) > 0 && (!authenticateNetworkUser(netname, userNetworks) || len(userNetworks) == 0) {
-		return nil, username, unauthorized_err
-	}
-	return userNetworks, username, nil
-}
-
-// Consider a more secure way of setting master key
-func authenticateMaster(tokenString string) bool {
-	return tokenString == servercfg.GetMasterKey() && servercfg.GetMasterKey() != ""
-}
-
-func authenticateNetworkUser(network string, userNetworks []string) bool {
-	networkexists, err := functions.NetworkExists(network)
-	if (err != nil && !database.IsEmptyRecord(err)) || !networkexists {
-		return false
-	}
-	return logic.StringSliceContains(userNetworks, network)
-}
-
-//Consider a more secure way of setting master key
-func authenticateDNSToken(tokenString string) bool {
-	tokens := strings.Split(tokenString, " ")
-	if len(tokens) < 2 {
-		return false
-	}
-	return tokens[1] == servercfg.GetDNSKey()
-}
-
-func continueIfUserMatch(next http.Handler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var errorResponse = models.ErrorResponse{
-			Code: http.StatusUnauthorized, Message: unauthorized_msg,
-		}
-		var params = mux.Vars(r)
-		var requestedUser = params["username"]
-		if requestedUser != r.Header.Get("user") {
-			returnErrorResponse(w, r, errorResponse)
-			return
-		}
-		next.ServeHTTP(w, r)
-	}
-}

controllers/server.go

@@ -25,83 +25,36 @@ func serverHandlers(r *mux.Router) {
 		resp.WriteHeader(http.StatusOK)
 		resp.Write([]byte("Server is up and running!!"))
 	}))
-	r.HandleFunc("/api/server/getconfig", securityCheckServer(false, http.HandlerFunc(getConfig))).Methods("GET")
-	r.HandleFunc("/api/server/removenetwork/{network}", securityCheckServer(true, http.HandlerFunc(removeNetwork))).Methods("DELETE")
+	r.HandleFunc("/api/server/getconfig", allowUsers(http.HandlerFunc(getConfig))).Methods("GET")
 	r.HandleFunc("/api/server/register", authorize(true, false, "node", http.HandlerFunc(register))).Methods("POST")
 	r.HandleFunc("/api/server/getserverinfo", authorize(true, false, "node", http.HandlerFunc(getServerInfo))).Methods("GET")
 }
 
-//Security check is middleware for every function and just checks to make sure that its the master calling
-//Only admin should have access to all these network-level actions
-//or maybe some Users once implemented
-func securityCheckServer(adminonly bool, next http.Handler) http.HandlerFunc {
+// allowUsers - allow all authenticated (valid) users - only used by getConfig, may be able to remove during refactor
+func allowUsers(next http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var errorResponse = models.ErrorResponse{
-			Code: http.StatusInternalServerError, Message: "W1R3: It's not you it's me.",
+			Code: http.StatusInternalServerError, Message: logic.Unauthorized_Msg,
 		}
-
 		bearerToken := r.Header.Get("Authorization")
-
 		var tokenSplit = strings.Split(bearerToken, " ")
 		var authToken = ""
 		if len(tokenSplit) < 2 {
-			errorResponse = models.ErrorResponse{
-				Code: http.StatusUnauthorized, Message: "W1R3: You are unauthorized to access this endpoint.",
-			}
-			returnErrorResponse(w, r, errorResponse)
+			logic.ReturnErrorResponse(w, r, errorResponse)
 			return
 		} else {
 			authToken = tokenSplit[1]
 		}
-		//all endpoints here require master so not as complicated
-		//still might not be a good  way of doing this
-		user, _, isadmin, err := logic.VerifyUserToken(authToken)
-		errorResponse = models.ErrorResponse{
-			Code: http.StatusUnauthorized, Message: "W1R3: You are unauthorized to access this endpoint.",
-		}
-		if !adminonly && (err != nil || user == "") {
-			returnErrorResponse(w, r, errorResponse)
-			return
-		}
-		if adminonly && !isadmin && !authenticateMaster(authToken) {
-			returnErrorResponse(w, r, errorResponse)
+		user, _, _, err := logic.VerifyUserToken(authToken)
+		if err != nil || user == "" {
+			logic.ReturnErrorResponse(w, r, errorResponse)
 			return
 		}
 		next.ServeHTTP(w, r)
 	}
 }
 
-// swagger:route DELETE /api/server/removenetwork/{network} nodes removeNetwork
-//
-// Remove a network from the server.
-//
-//		Schemes: https
-//
-// 		Security:
-//   		oauth
-//
-//		Responses:
-//			200: stringJSONResponse
-func removeNetwork(w http.ResponseWriter, r *http.Request) {
-	// Set header
-	w.Header().Set("Content-Type", "application/json")
-
-	// get params
-	var params = mux.Vars(r)
-	network := params["network"]
-	err := logic.DeleteNetwork(network)
-	if err != nil {
-		logger.Log(0, r.Header.Get("user"),
-			fmt.Sprintf("failed to delete network [%s]: %v", network, err))
-		json.NewEncoder(w).Encode(fmt.Sprintf("could not remove network %s from server", network))
-		return
-	}
-	logger.Log(1, r.Header.Get("user"),
-		fmt.Sprintf("deleted network [%s]: %v", network, err))
-	json.NewEncoder(w).Encode(fmt.Sprintf("network %s removed from server", network))
-}
-
-// swagger:route GET /api/server/getserverinfo nodes getServerInfo
+// swagger:route GET /api/server/getserverinfo server getServerInfo
 //
 // Get the server configuration.
 //
@@ -122,7 +75,7 @@ func getServerInfo(w http.ResponseWriter, r *http.Request) {
 	//w.WriteHeader(http.StatusOK)
 }
 
-// swagger:route GET /api/server/getconfig nodes getConfig
+// swagger:route GET /api/server/getconfig server getConfig
 //
 // Get the server configuration.
 //
@@ -140,11 +93,15 @@ func getConfig(w http.ResponseWriter, r *http.Request) {
 	// get params
 
 	scfg := servercfg.GetServerConfig()
+	scfg.IsEE = "no"
+	if logic.Is_EE {
+		scfg.IsEE = "yes"
+	}
 	json.NewEncoder(w).Encode(scfg)
 	//w.WriteHeader(http.StatusOK)
 }
 
-// swagger:route POST /api/server/register nodes register
+// swagger:route POST /api/server/register server register
 //
 // Registers a client with the server and return the Certificate Authority and certificate.
 //
@@ -165,7 +122,7 @@ func register(w http.ResponseWriter, r *http.Request) {
 		errorResponse := models.ErrorResponse{
 			Code: http.StatusBadRequest, Message: err.Error(),
 		}
-		returnErrorResponse(w, r, errorResponse)
+		logic.ReturnErrorResponse(w, r, errorResponse)
 		return
 	}
 	cert, ca, err := genCerts(&request.Key, &request.CommonName)
@@ -174,7 +131,7 @@ func register(w http.ResponseWriter, r *http.Request) {
 		errorResponse := models.ErrorResponse{
 			Code: http.StatusNotFound, Message: err.Error(),
 		}
-		returnErrorResponse(w, r, errorResponse)
+		logic.ReturnErrorResponse(w, r, errorResponse)
 		return
 	}
 	//x509.Certificate.PublicKey is an interface therefore json encoding/decoding result in a string value rather than a []byte

controllers/user.go

@@ -7,11 +7,17 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
+	"github.com/gorilla/websocket"
 	"github.com/gravitl/netmaker/auth"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/servercfg"
+)
+
+var (
+	upgrader = websocket.Upgrader{}
 )
 
 func userHandlers(r *mux.Router) {
@@ -19,18 +25,20 @@ func userHandlers(r *mux.Router) {
 	r.HandleFunc("/api/users/adm/hasadmin", hasAdmin).Methods("GET")
 	r.HandleFunc("/api/users/adm/createadmin", createAdmin).Methods("POST")
 	r.HandleFunc("/api/users/adm/authenticate", authenticateUser).Methods("POST")
-	r.HandleFunc("/api/users/{username}", securityCheck(false, continueIfUserMatch(http.HandlerFunc(updateUser)))).Methods("PUT")
-	r.HandleFunc("/api/users/networks/{username}", securityCheck(true, http.HandlerFunc(updateUserNetworks))).Methods("PUT")
-	r.HandleFunc("/api/users/{username}/adm", securityCheck(true, http.HandlerFunc(updateUserAdm))).Methods("PUT")
-	r.HandleFunc("/api/users/{username}", securityCheck(true, http.HandlerFunc(createUser))).Methods("POST")
-	r.HandleFunc("/api/users/{username}", securityCheck(true, http.HandlerFunc(deleteUser))).Methods("DELETE")
-	r.HandleFunc("/api/users/{username}", securityCheck(false, continueIfUserMatch(http.HandlerFunc(getUser)))).Methods("GET")
-	r.HandleFunc("/api/users", securityCheck(true, http.HandlerFunc(getUsers))).Methods("GET")
+	r.HandleFunc("/api/users/{username}", logic.SecurityCheck(false, logic.ContinueIfUserMatch(http.HandlerFunc(updateUser)))).Methods("PUT")
+	r.HandleFunc("/api/users/networks/{username}", logic.SecurityCheck(true, http.HandlerFunc(updateUserNetworks))).Methods("PUT")
+	r.HandleFunc("/api/users/{username}/adm", logic.SecurityCheck(true, http.HandlerFunc(updateUserAdm))).Methods("PUT")
+	r.HandleFunc("/api/users/{username}", logic.SecurityCheck(true, checkFreeTierLimits(users_l, http.HandlerFunc(createUser)))).Methods("POST")
+	r.HandleFunc("/api/users/{username}", logic.SecurityCheck(true, http.HandlerFunc(deleteUser))).Methods("DELETE")
+	r.HandleFunc("/api/users/{username}", logic.SecurityCheck(false, logic.ContinueIfUserMatch(http.HandlerFunc(getUser)))).Methods("GET")
+	r.HandleFunc("/api/users", logic.SecurityCheck(true, http.HandlerFunc(getUsers))).Methods("GET")
 	r.HandleFunc("/api/oauth/login", auth.HandleAuthLogin).Methods("GET")
 	r.HandleFunc("/api/oauth/callback", auth.HandleAuthCallback).Methods("GET")
+	r.HandleFunc("/api/oauth/node-handler", socketHandler)
+	r.HandleFunc("/api/oauth/register/{regKey}", auth.RegisterNodeSSO).Methods("GET")
 }
 
-// swagger:route POST /api/users/adm/authenticate nodes authenticateUser
+// swagger:route POST /api/users/adm/authenticate user authenticateUser
 //
 // Node authenticates using its password and retrieves a JWT for authorization.
 //
@@ -50,13 +58,18 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
 		Code: http.StatusInternalServerError, Message: "W1R3: It's not you it's me.",
 	}
 
+	if !servercfg.IsBasicAuthEnabled() {
+		logic.ReturnErrorResponse(response, request, logic.FormatError(fmt.Errorf("basic auth is disabled"), "badrequest"))
+		return
+	}
+
 	decoder := json.NewDecoder(request.Body)
 	decoderErr := decoder.Decode(&authRequest)
 	defer request.Body.Close()
 	if decoderErr != nil {
 		logger.Log(0, "error decoding request body: ",
 			decoderErr.Error())
-		returnErrorResponse(response, request, errorResponse)
+		logic.ReturnErrorResponse(response, request, errorResponse)
 		return
 	}
 	username := authRequest.UserName
@@ -64,14 +77,14 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
 	if err != nil {
 		logger.Log(0, username, "user validation failed: ",
 			err.Error())
-		returnErrorResponse(response, request, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(response, request, logic.FormatError(err, "badrequest"))
 		return
 	}
 
 	if jwt == "" {
 		// very unlikely that err is !nil and no jwt returned, but handle it anyways.
 		logger.Log(0, username, "jwt token is empty")
-		returnErrorResponse(response, request, formatError(errors.New("no token returned"), "internal"))
+		logic.ReturnErrorResponse(response, request, logic.FormatError(errors.New("no token returned"), "internal"))
 		return
 	}
 
@@ -89,7 +102,7 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
 	if jsonError != nil {
 		logger.Log(0, username,
 			"error marshalling resp: ", err.Error())
-		returnErrorResponse(response, request, errorResponse)
+		logic.ReturnErrorResponse(response, request, errorResponse)
 		return
 	}
 	logger.Log(2, username, "was authenticated")
@@ -97,7 +110,7 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
 	response.Write(successJSONResponse)
 }
 
-// swagger:route GET /api/users/adm/hasadmin nodes hasAdmin
+// swagger:route GET /api/users/adm/hasadmin user hasAdmin
 //
 // Checks whether the server has an admin.
 //
@@ -115,7 +128,7 @@ func hasAdmin(w http.ResponseWriter, r *http.Request) {
 	hasadmin, err := logic.HasAdmin()
 	if err != nil {
 		logger.Log(0, "failed to check for admin: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -137,7 +150,7 @@ func GetUserInternal(username string) (models.User, error) {
 	return user, err
 }
 
-// swagger:route GET /api/users/{username} nodes getUser
+// swagger:route GET /api/users/{username} user getUser
 //
 // Get an individual user.
 //
@@ -158,14 +171,14 @@ func getUser(w http.ResponseWriter, r *http.Request) {
 
 	if err != nil {
 		logger.Log(0, usernameFetched, "failed to fetch user: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	logger.Log(2, r.Header.Get("user"), "fetched user", usernameFetched)
 	json.NewEncoder(w).Encode(user)
 }
 
-// swagger:route GET /api/users nodes getUsers
+// swagger:route GET /api/users user getUsers
 //
 // Get all users.
 //
@@ -184,7 +197,7 @@ func getUsers(w http.ResponseWriter, r *http.Request) {
 
 	if err != nil {
 		logger.Log(0, "failed to fetch users: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 
@@ -192,7 +205,7 @@ func getUsers(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(users)
 }
 
-// swagger:route POST /api/users/adm/createadmin nodes createAdmin
+// swagger:route POST /api/users/adm/createadmin user createAdmin
 //
 // Make a user an admin.
 //
@@ -213,22 +226,28 @@ func createAdmin(w http.ResponseWriter, r *http.Request) {
 
 		logger.Log(0, admin.UserName, "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
-	admin, err = logic.CreateAdmin(admin)
 
+	if !servercfg.IsBasicAuthEnabled() {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("basic auth is disabled"), "badrequest"))
+		return
+	}
+
+	admin, err = logic.CreateAdmin(admin)
 	if err != nil {
 		logger.Log(0, admin.UserName, "failed to create admin: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
+
 	logger.Log(1, admin.UserName, "was made a new admin")
 	json.NewEncoder(w).Encode(admin)
 }
 
-// swagger:route POST /api/users/{username} nodes createUser
+// swagger:route POST /api/users/{username} user createUser
 //
 // Create a user.
 //
@@ -247,21 +266,22 @@ func createUser(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, user.UserName, "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
+
 	user, err = logic.CreateUser(user)
 	if err != nil {
 		logger.Log(0, user.UserName, "error creating new user: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	logger.Log(1, user.UserName, "was created")
 	json.NewEncoder(w).Encode(user)
 }
 
-// swagger:route PUT /api/users/networks/{username} nodes updateUserNetworks
+// swagger:route PUT /api/users/networks/{username} user updateUserNetworks
 //
 // Updates the networks of the given user.
 //
@@ -282,7 +302,7 @@ func updateUserNetworks(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, username,
 			"failed to update user networks: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	var userchange models.User
@@ -291,21 +311,27 @@ func updateUserNetworks(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, username, "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
-	err = logic.UpdateUserNetworks(userchange.Networks, userchange.IsAdmin, &user)
+	err = logic.UpdateUserNetworks(userchange.Networks, userchange.Groups, userchange.IsAdmin, &models.ReturnUser{
+		Groups:   user.Groups,
+		IsAdmin:  user.IsAdmin,
+		Networks: user.Networks,
+		UserName: user.UserName,
+	})
+
 	if err != nil {
 		logger.Log(0, username,
 			"failed to update user networks: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	logger.Log(1, username, "status was updated")
 	json.NewEncoder(w).Encode(user)
 }
 
-// swagger:route PUT /api/users/{username} nodes updateUser
+// swagger:route PUT /api/users/{username} user updateUser
 //
 // Update a user.
 //
@@ -326,13 +352,13 @@ func updateUser(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, username,
 			"failed to update user info: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if auth.IsOauthUser(&user) == nil {
 		err := fmt.Errorf("cannot update user info for oauth user %s", username)
 		logger.Log(0, err.Error())
-		returnErrorResponse(w, r, formatError(err, "forbidden"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "forbidden"))
 		return
 	}
 	var userchange models.User
@@ -341,7 +367,7 @@ func updateUser(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, username, "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	userchange.Networks = nil
@@ -349,14 +375,14 @@ func updateUser(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, username,
 			"failed to update user info: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	logger.Log(1, username, "was updated")
 	json.NewEncoder(w).Encode(user)
 }
 
-// swagger:route PUT /api/users/{username}/adm nodes updateUserAdm
+// swagger:route PUT /api/users/{username}/adm user updateUserAdm
 //
 // Updates the given admin user's info (as long as the user is an admin).
 //
@@ -375,13 +401,13 @@ func updateUserAdm(w http.ResponseWriter, r *http.Request) {
 	username := params["username"]
 	user, err := GetUserInternal(username)
 	if err != nil {
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
 	if auth.IsOauthUser(&user) != nil {
 		err := fmt.Errorf("cannot update user info for oauth user %s", username)
 		logger.Log(0, err.Error())
-		returnErrorResponse(w, r, formatError(err, "forbidden"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "forbidden"))
 		return
 	}
 	var userchange models.User
@@ -390,25 +416,25 @@ func updateUserAdm(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, username, "error decoding request body: ",
 			err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	if !user.IsAdmin {
 		logger.Log(0, username, "not an admin user")
-		returnErrorResponse(w, r, formatError(errors.New("not a admin user"), "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("not a admin user"), "badrequest"))
 	}
 	user, err = logic.UpdateUser(userchange, user)
 	if err != nil {
 		logger.Log(0, username,
 			"failed to update user (admin) info: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 	logger.Log(1, username, "was updated (admin)")
 	json.NewEncoder(w).Encode(user)
 }
 
-// swagger:route DELETE /api/users/{username} nodes deleteUser
+// swagger:route DELETE /api/users/{username} user deleteUser
 //
 // Delete a user.
 //
@@ -432,15 +458,31 @@ func deleteUser(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		logger.Log(0, username,
 			"failed to delete user: ", err.Error())
-		returnErrorResponse(w, r, formatError(err, "internal"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	} else if !success {
 		err := errors.New("delete unsuccessful")
 		logger.Log(0, username, err.Error())
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
 
 	logger.Log(1, username, "was deleted")
 	json.NewEncoder(w).Encode(params["username"] + " deleted.")
 }
+
+// Called when vpn client dials in to start the auth flow and first stage is to get register URL itself
+func socketHandler(w http.ResponseWriter, r *http.Request) {
+	// Upgrade our raw HTTP connection to a websocket based one
+	conn, err := upgrader.Upgrade(w, r, nil)
+	if err != nil {
+		logger.Log(0, "error during connection upgrade for node sign-in:", err.Error())
+		return
+	}
+	if conn == nil {
+		logger.Log(0, "failed to establish web-socket connection during node sign-in")
+		return
+	}
+	// Start handling the session
+	go auth.SessionHandler(conn)
+}

controllers/user_test.go

@@ -31,7 +31,7 @@ func TestHasAdmin(t *testing.T) {
 		assert.False(t, found)
 	})
 	t.Run("No admin user", func(t *testing.T) {
-		var user = models.User{"noadmin", "password", nil, false}
+		var user = models.User{"noadmin", "password", nil, false, nil}
 		_, err := logic.CreateUser(user)
 		assert.Nil(t, err)
 		found, err := logic.HasAdmin()
@@ -39,7 +39,7 @@ func TestHasAdmin(t *testing.T) {
 		assert.False(t, found)
 	})
 	t.Run("admin user", func(t *testing.T) {
-		var user = models.User{"admin", "password", nil, true}
+		var user = models.User{"admin", "password", nil, true, nil}
 		_, err := logic.CreateUser(user)
 		assert.Nil(t, err)
 		found, err := logic.HasAdmin()
@@ -47,7 +47,7 @@ func TestHasAdmin(t *testing.T) {
 		assert.True(t, found)
 	})
 	t.Run("multiple admins", func(t *testing.T) {
-		var user = models.User{"admin1", "password", nil, true}
+		var user = models.User{"admin1", "password", nil, true, nil}
 		_, err := logic.CreateUser(user)
 		assert.Nil(t, err)
 		found, err := logic.HasAdmin()
@@ -59,7 +59,7 @@ func TestHasAdmin(t *testing.T) {
 func TestCreateUser(t *testing.T) {
 	database.InitializeDatabase()
 	deleteAllUsers()
-	user := models.User{"admin", "password", nil, true}
+	user := models.User{"admin", "password", nil, true, nil}
 	t.Run("NoUser", func(t *testing.T) {
 		admin, err := logic.CreateUser(user)
 		assert.Nil(t, err)
@@ -101,7 +101,7 @@ func TestDeleteUser(t *testing.T) {
 		assert.False(t, deleted)
 	})
 	t.Run("Existing User", func(t *testing.T) {
-		user := models.User{"admin", "password", nil, true}
+		user := models.User{"admin", "password", nil, true, nil}
 		logic.CreateUser(user)
 		deleted, err := logic.DeleteUser("admin")
 		assert.Nil(t, err)
@@ -166,7 +166,7 @@ func TestGetUser(t *testing.T) {
 		assert.Equal(t, "", admin.UserName)
 	})
 	t.Run("UserExisits", func(t *testing.T) {
-		user := models.User{"admin", "password", nil, true}
+		user := models.User{"admin", "password", nil, true, nil}
 		logic.CreateUser(user)
 		admin, err := logic.GetUser("admin")
 		assert.Nil(t, err)
@@ -183,7 +183,7 @@ func TestGetUserInternal(t *testing.T) {
 		assert.Equal(t, "", admin.UserName)
 	})
 	t.Run("UserExisits", func(t *testing.T) {
-		user := models.User{"admin", "password", nil, true}
+		user := models.User{"admin", "password", nil, true, nil}
 		logic.CreateUser(user)
 		admin, err := GetUserInternal("admin")
 		assert.Nil(t, err)
@@ -200,14 +200,14 @@ func TestGetUsers(t *testing.T) {
 		assert.Equal(t, []models.ReturnUser(nil), admin)
 	})
 	t.Run("UserExisits", func(t *testing.T) {
-		user := models.User{"admin", "password", nil, true}
+		user := models.User{"admin", "password", nil, true, nil}
 		logic.CreateUser(user)
 		admins, err := logic.GetUsers()
 		assert.Nil(t, err)
 		assert.Equal(t, user.UserName, admins[0].UserName)
 	})
 	t.Run("MulipleUsers", func(t *testing.T) {
-		user := models.User{"user", "password", nil, true}
+		user := models.User{"user", "password", nil, true, nil}
 		logic.CreateUser(user)
 		admins, err := logic.GetUsers()
 		assert.Nil(t, err)
@@ -225,8 +225,8 @@ func TestGetUsers(t *testing.T) {
 func TestUpdateUser(t *testing.T) {
 	database.InitializeDatabase()
 	deleteAllUsers()
-	user := models.User{"admin", "password", nil, true}
-	newuser := models.User{"hello", "world", []string{"wirecat, netmaker"}, true}
+	user := models.User{"admin", "password", nil, true, nil}
+	newuser := models.User{"hello", "world", []string{"wirecat, netmaker"}, true, []string{}}
 	t.Run("NonExistantUser", func(t *testing.T) {
 		admin, err := logic.UpdateUser(newuser, user)
 		assert.EqualError(t, err, "could not find any records")
@@ -288,10 +288,10 @@ func TestVerifyAuthRequest(t *testing.T) {
 		authRequest.Password = "password"
 		jwt, err := logic.VerifyAuthRequest(authRequest)
 		assert.Equal(t, "", jwt)
-		assert.EqualError(t, err, "incorrect credentials")
+		assert.EqualError(t, err, "error retrieving user from db: could not find any records")
 	})
 	t.Run("Non-Admin", func(t *testing.T) {
-		user := models.User{"nonadmin", "somepass", nil, false}
+		user := models.User{"nonadmin", "somepass", nil, false, []string{}}
 		logic.CreateUser(user)
 		authRequest := models.UserAuthParams{"nonadmin", "somepass"}
 		jwt, err := logic.VerifyAuthRequest(authRequest)
@@ -299,7 +299,7 @@ func TestVerifyAuthRequest(t *testing.T) {
 		assert.Nil(t, err)
 	})
 	t.Run("WrongPassword", func(t *testing.T) {
-		user := models.User{"admin", "password", nil, false}
+		user := models.User{"admin", "password", nil, false, []string{}}
 		logic.CreateUser(user)
 		authRequest := models.UserAuthParams{"admin", "badpass"}
 		jwt, err := logic.VerifyAuthRequest(authRequest)

controllers/usergroups.go

@@ -0,0 +1,73 @@
+package controller
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+
+	"github.com/gorilla/mux"
+	"github.com/gravitl/netmaker/logic/pro"
+	"github.com/gravitl/netmaker/models/promodels"
+)
+
+func userGroupsHandlers(r *mux.Router) {
+	r.HandleFunc("/api/usergroups", logic.SecurityCheck(true, http.HandlerFunc(getUserGroups))).Methods("GET")
+	r.HandleFunc("/api/usergroups/{usergroup}", logic.SecurityCheck(true, http.HandlerFunc(createUserGroup))).Methods("POST")
+	r.HandleFunc("/api/usergroups/{usergroup}", logic.SecurityCheck(true, http.HandlerFunc(deleteUserGroup))).Methods("DELETE")
+}
+
+func getUserGroups(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	logger.Log(1, r.Header.Get("user"), "requested fetching user groups")
+
+	userGroups, err := pro.GetUserGroups()
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+	// Returns all the groups in JSON format
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(userGroups)
+}
+
+func createUserGroup(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	var params = mux.Vars(r)
+	newGroup := params["usergroup"]
+
+	logger.Log(1, r.Header.Get("user"), "requested creating user group", newGroup)
+
+	if newGroup == "" {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("no group name provided"), "badrequest"))
+		return
+	}
+
+	err := pro.InsertUserGroup(promodels.UserGroupName(newGroup))
+	if err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
+
+func deleteUserGroup(w http.ResponseWriter, r *http.Request) {
+	var params = mux.Vars(r)
+	groupToDelete := params["usergroup"]
+	logger.Log(1, r.Header.Get("user"), "requested deleting user group", groupToDelete)
+
+	if groupToDelete == "" {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("no group name provided"), "badrequest"))
+		return
+	}
+
+	if err := pro.DeleteUserGroup(promodels.UserGroupName(groupToDelete)); err != nil {
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}

database/database.go

@@ -59,6 +59,18 @@ const NODE_ACLS_TABLE_NAME = "nodeacls"
 // SSO_STATE_CACHE - holds sso session information for OAuth2 sign-ins
 const SSO_STATE_CACHE = "ssostatecache"
 
+// METRICS_TABLE_NAME - stores network metrics
+const METRICS_TABLE_NAME = "metrics"
+
+// NETWORK_USER_TABLE_NAME - network user table tracks stats for a network user per network
+const NETWORK_USER_TABLE_NAME = "networkusers"
+
+// USER_GROUPS_TABLE_NAME - table for storing usergroups
+const USER_GROUPS_TABLE_NAME = "usergroups"
+
+// CACHE_TABLE_NAME - caching table
+const CACHE_TABLE_NAME = "cache"
+
 // == ERROR CONSTS ==
 
 // NO_RECORD - no singular result found
@@ -139,6 +151,10 @@ func createTables() {
 	createTable(GENERATED_TABLE_NAME)
 	createTable(NODE_ACLS_TABLE_NAME)
 	createTable(SSO_STATE_CACHE)
+	createTable(METRICS_TABLE_NAME)
+	createTable(NETWORK_USER_TABLE_NAME)
+	createTable(USER_GROUPS_TABLE_NAME)
+	createTable(CACHE_TABLE_NAME)
 }
 
 func createTable(tableName string) error {

docker/mosquitto-ee.conf

@@ -0,0 +1,16 @@
+per_listener_settings true
+
+listener 8883
+allow_anonymous false
+require_certificate true
+use_identity_as_username true
+cafile /mosquitto/certs/root.pem
+certfile /mosquitto/certs/server.pem
+keyfile /mosquitto/certs/server.key
+
+listener 1883
+allow_anonymous true
+
+listener 1884
+allow_anonymous false
+password_file /etc/mosquitto.passwords

docker/mosquitto.passwords

@@ -0,0 +1 @@
+netmaker-exporter:$7$101$9kcXwXP+nUMh06gm$MND2YjtRSvcZTXjMn7xYKoqUFQxG6NOgqWmXIcxxxZksM9cA8732URQWOsPHqpGEvVF9mSVagM1MBEMIKwZm2A==

ee/LICENSE

@@ -0,0 +1,10 @@
+The Netmaker Enterprise license (the “Enterprise License”)
+Copyright (c) 2022 Netmaker, Inc.
+
+With regard to the Netmaker Software:
+
+This software and associated documentation files (the "Software") may only be used in production, if you (and any entity that you represent) have agreed to, and are in compliance with, the Netmaker Subscription Terms of Service, available at https://netmaker.io/terms (the “Enterprise Terms”), or other agreement governing the use of the Software, as agreed by you and Netmaker, and otherwise have a valid Netmaker Enterprise license for the correct number of users, networks, nodes, servers, and external clients. Subject to the foregoing sentence, you are free to modify this Software and publish patches to the Software. You agree that Netmaker and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications and/or patches, and all such modifications and/or patches may only be used, copied, modified, displayed, distributed, or otherwise exploited with a valid Netmaker Enterprise license for the correct number of users, networks, nodes, servers, and external clients as allocated by the license. Notwithstanding the foregoing, you may copy and modify the Software for development and testing purposes, without requiring a subscription. You agree that Netmaker and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications. You are not granted any other rights beyond what is expressly stated herein. Subject to the foregoing, it is forbidden to copy, merge, publish, distribute, sublicense, and/or sell the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For all third party components incorporated into the Netmaker Software, those components are licensed under the original license provided by the owner of the applicable component.

ee/ee_controllers/metrics.go

@@ -0,0 +1,103 @@
+package ee_controllers
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/gorilla/mux"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/models"
+)
+
+// MetricHandlers - How we handle EE Metrics
+func MetricHandlers(r *mux.Router) {
+	r.HandleFunc("/api/metrics/{network}/{nodeid}", logic.SecurityCheck(true, http.HandlerFunc(getNodeMetrics))).Methods("GET")
+	r.HandleFunc("/api/metrics/{network}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkNodesMetrics))).Methods("GET")
+	r.HandleFunc("/api/metrics", logic.SecurityCheck(true, http.HandlerFunc(getAllMetrics))).Methods("GET")
+}
+
+// get the metrics of a given node
+func getNodeMetrics(w http.ResponseWriter, r *http.Request) {
+	// set header.
+	w.Header().Set("Content-Type", "application/json")
+
+	var params = mux.Vars(r)
+	nodeID := params["nodeid"]
+
+	logger.Log(1, r.Header.Get("user"), "requested fetching metrics for node", nodeID, "on network", params["network"])
+	metrics, err := logic.GetMetrics(nodeID)
+	if err != nil {
+		logger.Log(1, r.Header.Get("user"), "failed to fetch metrics of node", nodeID, err.Error())
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	logger.Log(1, r.Header.Get("user"), "fetched metrics for node", params["nodeid"])
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(metrics)
+}
+
+// get the metrics of all nodes in given network
+func getNetworkNodesMetrics(w http.ResponseWriter, r *http.Request) {
+	// set header.
+	w.Header().Set("Content-Type", "application/json")
+
+	var params = mux.Vars(r)
+	network := params["network"]
+
+	logger.Log(1, r.Header.Get("user"), "requested fetching network node metrics on network", network)
+	networkNodes, err := logic.GetNetworkNodes(network)
+	if err != nil {
+		logger.Log(1, r.Header.Get("user"), "failed to fetch metrics of all nodes in network", network, err.Error())
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	networkMetrics := models.NetworkMetrics{}
+	networkMetrics.Nodes = make(models.MetricsMap)
+
+	for i := range networkNodes {
+		id := networkNodes[i].ID
+		metrics, err := logic.GetMetrics(id)
+		if err != nil {
+			logger.Log(1, r.Header.Get("user"), "failed to append metrics of node", id, "during network metrics fetch", err.Error())
+			continue
+		}
+		networkMetrics.Nodes[id] = *metrics
+	}
+
+	logger.Log(1, r.Header.Get("user"), "fetched metrics for network", network)
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(networkMetrics)
+}
+
+// get Metrics of all nodes on server, lots of data
+func getAllMetrics(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	logger.Log(1, r.Header.Get("user"), "requested fetching all metrics")
+
+	allNodes, err := logic.GetAllNodes()
+	if err != nil {
+		logger.Log(1, r.Header.Get("user"), "failed to fetch metrics of all nodes on server", err.Error())
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	networkMetrics := models.NetworkMetrics{}
+	networkMetrics.Nodes = make(models.MetricsMap)
+
+	for i := range allNodes {
+		id := allNodes[i].ID
+		metrics, err := logic.GetMetrics(id)
+		if err != nil {
+			logger.Log(1, r.Header.Get("user"), "failed to append metrics of node", id, "during all nodes metrics fetch", err.Error())
+			continue
+		}
+		networkMetrics.Nodes[id] = *metrics
+	}
+
+	logger.Log(1, r.Header.Get("user"), "fetched metrics for all nodes on server")
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(networkMetrics)
+}

ee/initialize.go

@@ -0,0 +1,55 @@
+//go:build ee
+// +build ee
+
+package ee
+
+import (
+	controller "github.com/gravitl/netmaker/controllers"
+	"github.com/gravitl/netmaker/ee/ee_controllers"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/servercfg"
+)
+
+// InitEE - Initialize EE Logic
+func InitEE() {
+	setIsEnterprise()
+	models.SetLogo(retrieveEELogo())
+	controller.HttpHandlers = append(controller.HttpHandlers, ee_controllers.MetricHandlers)
+	logic.EnterpriseCheckFuncs = append(logic.EnterpriseCheckFuncs, func() {
+		// == License Handling ==
+		ValidateLicense()
+		if Limits.FreeTier {
+			logger.Log(0, "proceeding with Free Tier license")
+		} else {
+			logger.Log(0, "proceeding with Paid Tier license")
+		}
+		// == End License Handling ==
+		AddLicenseHooks()
+	})
+}
+
+func setControllerLimits() {
+	logic.Node_Limit = Limits.Nodes
+	logic.Users_Limit = Limits.Users
+	logic.Clients_Limit = Limits.Clients
+	logic.Free_Tier = Limits.FreeTier
+	servercfg.Is_EE = true
+}
+
+func retrieveEELogo() string {
+	return `              
+ __   __     ______     ______   __    __     ______     __  __     ______     ______    
+/\ "-.\ \   /\  ___\   /\__  _\ /\ "-./  \   /\  __ \   /\ \/ /    /\  ___\   /\  == \   
+\ \ \-.  \  \ \  __\   \/_/\ \/ \ \ \-./\ \  \ \  __ \  \ \  _"-.  \ \  __\   \ \  __<   
+ \ \_\\"\_\  \ \_____\    \ \_\  \ \_\ \ \_\  \ \_\ \_\  \ \_\ \_\  \ \_____\  \ \_\ \_\ 
+  \/_/ \/_/   \/_____/     \/_/   \/_/  \/_/   \/_/\/_/   \/_/\/_/   \/_____/   \/_/ /_/ 
+                                                                                         																							 
+                                   ___    ___   ____                        
+           ____  ____  ____       / _ \  / _ \ / __ \       ____  ____  ____
+          /___/ /___/ /___/      / ___/ / , _// /_/ /      /___/ /___/ /___/
+         /___/ /___/ /___/      /_/    /_/|_| \____/      /___/ /___/ /___/ 
+                                                                            
+`
+}

ee/license.go

@@ -0,0 +1,241 @@
+//go:build ee
+// +build ee
+
+package ee
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"math"
+	"net/http"
+
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/netclient/ncutils"
+	"github.com/gravitl/netmaker/servercfg"
+	"golang.org/x/crypto/nacl/box"
+)
+
+const (
+	db_license_key = "netmaker-id-key-pair"
+)
+
+type apiServerConf struct {
+	PrivateKey []byte `json:"private_key" binding:"required"`
+	PublicKey  []byte `json:"public_key" binding:"required"`
+}
+
+// AddLicenseHooks - adds the validation and cache clear hooks
+func AddLicenseHooks() {
+	logic.AddHook(ValidateLicense)
+	logic.AddHook(ClearLicenseCache)
+}
+
+// ValidateLicense - the initial license check for netmaker server
+// checks if a license is valid + limits are not exceeded
+// if license is free_tier and limits exceeds, then server should terminate
+// if license is not valid, server should terminate
+func ValidateLicense() error {
+	licenseKeyValue := servercfg.GetLicenseKey()
+	netmakerAccountID := servercfg.GetNetmakerAccountID()
+	logger.Log(0, "proceeding with Netmaker license validation...")
+	if len(licenseKeyValue) == 0 || len(netmakerAccountID) == 0 {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	apiPublicKey, err := getLicensePublicKey(licenseKeyValue)
+	if err != nil {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	tempPubKey, tempPrivKey, err := FetchApiServerKeys()
+	if err != nil {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	licenseSecret := LicenseSecret{
+		UserID: netmakerAccountID,
+		Limits: getCurrentServerLimit(),
+	}
+
+	secretData, err := json.Marshal(&licenseSecret)
+	if err != nil {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	encryptedData, err := ncutils.BoxEncrypt(secretData, apiPublicKey, tempPrivKey)
+	if err != nil {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	validationResponse, err := validateLicenseKey(encryptedData, tempPubKey)
+	if err != nil || len(validationResponse) == 0 {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	var licenseResponse ValidatedLicense
+	if err = json.Unmarshal(validationResponse, &licenseResponse); err != nil {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	respData, err := ncutils.BoxDecrypt(base64decode(licenseResponse.EncryptedLicense), apiPublicKey, tempPrivKey)
+	if err != nil {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	license := LicenseKey{}
+	if err = json.Unmarshal(respData, &license); err != nil {
+		logger.FatalLog(errValidation.Error())
+	}
+
+	Limits.Networks = math.MaxInt
+	Limits.FreeTier = license.FreeTier == "yes"
+	Limits.Clients = license.LimitClients
+	Limits.Nodes = license.LimitNodes
+	Limits.Servers = license.LimitServers
+	Limits.Users = license.LimitUsers
+	if Limits.FreeTier {
+		Limits.Networks = 3
+	}
+	setControllerLimits()
+
+	logger.Log(0, "License validation succeeded!")
+	return nil
+}
+
+// FetchApiServerKeys - fetches netmaker license keys for identification
+// as well as secure communication with API
+// if none present, it generates a new pair
+func FetchApiServerKeys() (pub *[32]byte, priv *[32]byte, err error) {
+	var returnData = apiServerConf{}
+	currentData, err := database.FetchRecord(database.SERVERCONF_TABLE_NAME, db_license_key)
+	if err != nil && !database.IsEmptyRecord(err) {
+		return nil, nil, err
+	} else if database.IsEmptyRecord(err) { // need to generate a new identifier pair
+		pub, priv, err = box.GenerateKey(rand.Reader)
+		if err != nil {
+			return nil, nil, err
+		}
+		pubBytes, err := ncutils.ConvertKeyToBytes(pub)
+		if err != nil {
+			return nil, nil, err
+		}
+		privBytes, err := ncutils.ConvertKeyToBytes(priv)
+		if err != nil {
+			return nil, nil, err
+		}
+		returnData.PrivateKey = privBytes
+		returnData.PublicKey = pubBytes
+		record, err := json.Marshal(&returnData)
+		if err != nil {
+			return nil, nil, err
+		}
+		if err = database.Insert(db_license_key, string(record), database.SERVERCONF_TABLE_NAME); err != nil {
+			return nil, nil, err
+		}
+	} else {
+		if err = json.Unmarshal([]byte(currentData), &returnData); err != nil {
+			return nil, nil, err
+		}
+		priv, err = ncutils.ConvertBytesToKey(returnData.PrivateKey)
+		if err != nil {
+			return nil, nil, err
+		}
+		pub, err = ncutils.ConvertBytesToKey(returnData.PublicKey)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
+	return pub, priv, nil
+}
+
+func getLicensePublicKey(licensePubKeyEncoded string) (*[32]byte, error) {
+	decodedPubKey := base64decode(licensePubKeyEncoded)
+	return ncutils.ConvertBytesToKey(decodedPubKey)
+}
+
+func validateLicenseKey(encryptedData []byte, publicKey *[32]byte) ([]byte, error) {
+
+	publicKeyBytes, err := ncutils.ConvertKeyToBytes(publicKey)
+	if err != nil {
+		return nil, err
+	}
+
+	msg := ValidateLicenseRequest{
+		NmServerPubKey: base64encode(publicKeyBytes),
+		EncryptedPart:  base64encode(encryptedData),
+	}
+
+	requestBody, err := json.Marshal(msg)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest(http.MethodPost, api_endpoint, bytes.NewReader(requestBody))
+	if err != nil {
+		return nil, err
+	}
+	reqParams := req.URL.Query()
+	reqParams.Add("licensevalue", servercfg.GetLicenseKey())
+	req.URL.RawQuery = reqParams.Encode()
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("Accept", "application/json")
+	client := &http.Client{}
+	var body []byte
+	validateResponse, err := client.Do(req)
+	if err != nil { // check cache
+		body, err = getCachedResponse()
+		if err != nil {
+			return nil, err
+		}
+		logger.Log(3, "proceeding with cached response, Netmaker API may be down")
+	} else {
+		defer validateResponse.Body.Close()
+		if validateResponse.StatusCode != 200 {
+			return nil, fmt.Errorf("could not validate license")
+		} // if you received a 200 cache the response locally
+
+		body, err = ioutil.ReadAll(validateResponse.Body)
+		if err != nil {
+			return nil, err
+		}
+		cacheResponse(body)
+	}
+
+	return body, err
+}
+
+func cacheResponse(response []byte) error {
+	var lrc = licenseResponseCache{
+		Body: response,
+	}
+
+	record, err := json.Marshal(&lrc)
+	if err != nil {
+		return err
+	}
+
+	return database.Insert(license_cache_key, string(record), database.CACHE_TABLE_NAME)
+}
+
+func getCachedResponse() ([]byte, error) {
+	var lrc licenseResponseCache
+	record, err := database.FetchRecord(database.CACHE_TABLE_NAME, license_cache_key)
+	if err != nil {
+		return nil, err
+	}
+	if err = json.Unmarshal([]byte(record), &lrc); err != nil {
+		return nil, err
+	}
+	return lrc.Body, nil
+}
+
+// ClearLicenseCache - clears the cached validate response
+func ClearLicenseCache() error {
+	return database.DeleteRecord(database.CACHE_TABLE_NAME, license_cache_key)
+}

ee/types.go

@@ -0,0 +1,83 @@
+package ee
+
+import "fmt"
+
+const (
+	api_endpoint               = "https://api.controller.netmaker.io/api/v1/license/validate"
+	license_cache_key          = "license_response_cache"
+	license_validation_err_msg = "invalid license"
+	server_id_key              = "nm-server-id"
+)
+
+var errValidation = fmt.Errorf(license_validation_err_msg)
+
+// Limits - limits to be referenced throughout server
+var Limits = GlobalLimits{
+	Servers:  0,
+	Users:    0,
+	Nodes:    0,
+	Clients:  0,
+	FreeTier: false,
+}
+
+// GlobalLimits - struct for holding global limits on this netmaker server in memory
+type GlobalLimits struct {
+	Servers  int
+	Users    int
+	Nodes    int
+	Clients  int
+	FreeTier bool
+	Networks int
+}
+
+// LicenseKey - the license key struct representation with associated data
+type LicenseKey struct {
+	LicenseValue   string `json:"license_value"` // actual (public) key and the unique value for the key
+	Expiration     int64  `json:"expiration"`
+	LimitServers   int    `json:"limit_servers"`
+	LimitUsers     int    `json:"limit_users"`
+	LimitNodes     int    `json:"limit_nodes"`
+	LimitClients   int    `json:"limit_clients"`
+	Metadata       string `json:"metadata"`
+	SubscriptionID string `json:"subscription_id"` // for a paid subscription (non-free-tier license)
+	FreeTier       string `json:"free_tier"`       // yes if free tier
+	IsActive       string `json:"is_active"`       // yes if active
+}
+
+// ValidatedLicense - the validated license struct
+type ValidatedLicense struct {
+	LicenseValue     string `json:"license_value" binding:"required"`     // license that validation is being requested for
+	EncryptedLicense string `json:"encrypted_license" binding:"required"` // to be decrypted by Netmaker using Netmaker server's private key
+}
+
+// LicenseSecret - the encrypted struct for sending user-id
+type LicenseSecret struct {
+	UserID string        `json:"user_id" binding:"required"` // UUID for user foreign key to User table
+	Limits LicenseLimits `json:"limits" binding:"required"`
+}
+
+// LicenseLimits - struct license limits
+type LicenseLimits struct {
+	Servers int `json:"servers" binding:"required"`
+	Users   int `json:"users" binding:"required"`
+	Nodes   int `json:"nodes" binding:"required"`
+	Clients int `json:"clients" binding:"required"`
+}
+
+// LicenseLimits.SetDefaults - sets the default values for limits
+func (l *LicenseLimits) SetDefaults() {
+	l.Clients = 0
+	l.Servers = 1
+	l.Nodes = 0
+	l.Users = 1
+}
+
+// ValidateLicenseRequest - used for request to validate license endpoint
+type ValidateLicenseRequest struct {
+	NmServerPubKey string `json:"nm_server_pub_key" binding:"required"` // Netmaker server public key used to send data back to Netmaker for the Netmaker server to decrypt (eg output from validating license)
+	EncryptedPart  string `json:"secret" binding:"required"`
+}
+
+type licenseResponseCache struct {
+	Body []byte `json:"body" binding:"required"`
+}

ee/util.go

@@ -0,0 +1,54 @@
+package ee
+
+import (
+	"encoding/base64"
+
+	"github.com/gravitl/netmaker/logic"
+)
+
+var isEnterprise bool
+
+// IsEnterprise - checks if enterprise binary or not
+func IsEnterprise() bool {
+	return isEnterprise
+}
+
+// setIsEnterprise - sets server to use enterprise features
+func setIsEnterprise() {
+	isEnterprise = true
+}
+
+// base64encode - base64 encode helper function
+func base64encode(input []byte) string {
+	return base64.StdEncoding.EncodeToString(input)
+}
+
+// base64decode - base64 decode helper function
+func base64decode(input string) []byte {
+
+	bytes, err := base64.StdEncoding.DecodeString(input)
+
+	if err != nil {
+		return nil
+	}
+
+	return bytes
+}
+
+func getCurrentServerLimit() (limits LicenseLimits) {
+	limits.SetDefaults()
+	nodes, err := logic.GetAllNodes()
+	if err == nil {
+		limits.Nodes = len(nodes)
+	}
+	clients, err := logic.GetAllExtClients()
+	if err == nil {
+		limits.Clients = len(clients)
+	}
+	users, err := logic.GetUsers()
+	if err == nil {
+		limits.Users = len(users)
+	}
+	limits.Servers = logic.GetServerCount()
+	return
+}

functions/helpers.go

@@ -8,17 +8,6 @@ import (
 	"github.com/gravitl/netmaker/models"
 )
 
-// NetworkExists - check if network exists
-func NetworkExists(name string) (bool, error) {
-
-	var network string
-	var err error
-	if network, err = database.FetchRecord(database.NETWORKS_TABLE_NAME, name); err != nil {
-		return false, err
-	}
-	return len(network) > 0, nil
-}
-
 // NameInDNSCharSet - name in dns char set
 func NameInDNSCharSet(name string) bool {
 

functions/helpers_test.go

@@ -26,7 +26,7 @@ func TestNetworkExists(t *testing.T) {
 	}
 	database.DeleteRecord(database.NETWORKS_TABLE_NAME, testNetwork.NetID)
 	defer database.CloseDB()
-	exists, err := NetworkExists(testNetwork.NetID)
+	exists, err := logic.NetworkExists(testNetwork.NetID)
 	if err == nil {
 		t.Fatalf("expected error, received nil")
 	}
@@ -38,7 +38,7 @@ func TestNetworkExists(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to save test network in databse: %s", err)
 	}
-	exists, err = NetworkExists(testNetwork.NetID)
+	exists, err = logic.NetworkExists(testNetwork.NetID)
 	if err != nil {
 		t.Fatalf("expected nil, received err: %s", err)
 	}

go.mod

@@ -4,20 +4,23 @@ go 1.18
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.4.1
-	github.com/go-playground/validator/v10 v10.11.0
+	github.com/go-playground/validator/v10 v10.11.1
 	github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
-	github.com/lib/pq v1.10.6
+	github.com/lib/pq v1.10.7
 	github.com/mattn/go-sqlite3 v1.14.15
 	github.com/rqlite/gorqlite v0.0.0-20210514125552-08ff1e76b22f
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/stretchr/testify v1.8.0
 	github.com/txn2/txeh v1.3.0
-	github.com/urfave/cli/v2 v2.14.1
+	github.com/urfave/cli/v2 v2.16.3
 	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
+	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
 	golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094
+	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20220318042302-193cf8d6a5d6 // indirect
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220324164955-056925b7df31
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -30,14 +33,17 @@ require (
 	fyne.io/fyne/v2 v2.2.3
 	github.com/c-robinson/iplib v1.0.3
 	github.com/cloverstd/tcping v0.1.1
+	github.com/go-ping/ping v1.1.0
 	github.com/guumaster/hostctl v1.1.3
 	github.com/kr/pretty v0.3.0
 	github.com/posthog/posthog-go v0.0.0-20211028072449-93c17c49e2b0
 )
 
 require (
-	github.com/coreos/go-oidc/v3 v3.3.0
+	github.com/coreos/go-oidc/v3 v3.4.0
+	github.com/gorilla/websocket v1.5.0
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
 )
 
 require (
@@ -67,7 +73,6 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/josharian/native v1.0.0 // indirect
 	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -91,10 +96,7 @@ require (
 	github.com/yuin/goldmark v1.4.13 // indirect
 	golang.org/x/image v0.0.0-20220601225756-64ec528b34cd // indirect
 	golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee // indirect
-	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
 	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

go.sum

@@ -103,8 +103,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
-github.com/coreos/go-oidc/v3 v3.3.0 h1:Y1LV3mP+QT3MEycATZpAiwfyN+uxZLqVbAHJUuOJEe4=
-github.com/coreos/go-oidc/v3 v3.3.0/go.mod h1:eHUXhZtXPQLgEaDrOVTgwbgmz1xGOkJNye6h3zkD2Pw=
+github.com/coreos/go-oidc/v3 v3.4.0 h1:xz7elHb/LDwm/ERpwHd+5nb7wFHL32rsr6bBOgaeu6g=
+github.com/coreos/go-oidc/v3 v3.4.0/go.mod h1:eHUXhZtXPQLgEaDrOVTgwbgmz1xGOkJNye6h3zkD2Pw=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -163,14 +163,16 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec h1:3FLiRYO6PlQFDpUU7OEFlWgjGD1jnBIVSJ5SYRWk+9c=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw=
+github.com/go-ping/ping v1.1.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
 github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw=
-github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ=
+github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -251,6 +253,7 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
@@ -271,8 +274,9 @@ github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH
 github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY=
 github.com/goxjs/glfw v0.0.0-20191126052801-d2efb5f20838/go.mod h1:oS8P8gVOT4ywTcjV6wZlOU4GuVFQ8F5328KY3MJ79CY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
@@ -325,8 +329,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
-github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lucor/goinfo v0.0.0-20210802170112-c078a2b0f08b/go.mod h1:PRq09yoB+Q2OJReAmwzKivcYyremnibWGbK7WfftHzc=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -448,8 +452,8 @@ github.com/txn2/txeh v1.3.0/go.mod h1:O7M6gUTPeMF+vsa4c4Ipx3JDkOYrruB1Wry8QRsMcw
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg=
-github.com/urfave/cli/v2 v2.14.1 h1:0Sx+C9404t2+DPuIJ3UpZFOEFhNG3wPxMj7uZHyZKFA=
-github.com/urfave/cli/v2 v2.14.1/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.16.3 h1:gHoFIwpPjoyIMbJp/VFd+/vuD0dAgFK4B6DpEMFJfQk=
+github.com/urfave/cli/v2 v2.16.3/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
@@ -700,6 +704,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdp
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

k8s/client/netclient-daemonset.yaml

@@ -16,7 +16,7 @@ spec:
       hostNetwork: true
       containers:
       - name: netclient
-        image: gravitl/netclient-go:v0.15.1
+        image: gravitl/netclient-go:v0.16.0
         env:
         - name: TOKEN
           value: "TOKEN_VALUE"

k8s/client/netclient.yaml

@@ -28,7 +28,7 @@ spec:
       #           - "<node label value>"
       containers:
       - name: netclient
-        image: gravitl/netclient:v0.15.1
+        image: gravitl/netclient:v0.16.0
         env:
         - name: TOKEN
           value: "TOKEN_VALUE"
@@ -41,4 +41,4 @@ spec:
       - hostPath:
           path: /etc/netclient
           type: DirectoryOrCreate
-        name: etc-netclient
+        name: etc-netclient

k8s/server/netmaker-server.yaml

@@ -83,7 +83,7 @@ spec:
           value: "Kubernetes"
         - name: VERBOSITY
           value: "3"
-        image: gravitl/netmaker:v0.15.1
+        image: gravitl/netmaker:v0.16.0
         imagePullPolicy: Always
         name: netmaker
         ports:
@@ -225,4 +225,4 @@ spec:
 #           service:
 #             name: netmaker-rest
 #             port:
-#               number: 8081
+#               number: 8081

k8s/server/netmaker-ui.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: netmaker-ui
-        image: gravitl/netmaker-ui:v0.15.1
+        image: gravitl/netmaker-ui:v0.16.0
         ports:
         - containerPort: 443
         env:
@@ -61,4 +61,4 @@ spec:
 #           service:
 #             name: netmaker-ui
 #             port:
-#               number: 80
+#               number: 80

logger/logger.go

@@ -134,7 +134,7 @@ func Retrieve(filePath string) string {
 
 // FatalLog - exits os after logging
 func FatalLog(message ...string) {
-	fmt.Printf("[netmaker] Fatal: %s \n", MakeString(" ", message...))
+	fmt.Printf("[%s] Fatal: %s \n", program, MakeString(" ", message...))
 	os.Exit(2)
 }
 

logic/accesskeys.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/go-playground/validator/v10"
+	validator "github.com/go-playground/validator/v10"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"
@@ -161,11 +161,11 @@ func DecrimentKey(networkName string, keyvalue string) {
 }
 
 // IsKeyValid - check if key is valid
-func IsKeyValid(networkname string, keyvalue string) bool {
+func IsKeyValid(networkname string, keyvalue string) (string, bool) {
 
 	network, err := GetParentNetwork(networkname)
 	if err != nil {
-		return false
+		return "", false
 	}
 	accesskeys := network.AccessKeys
 
@@ -185,7 +185,7 @@ func IsKeyValid(networkname string, keyvalue string) bool {
 			isvalid = true
 		}
 	}
-	return isvalid
+	return key.Name, isvalid
 }
 
 // RemoveKeySensitiveInfo - remove sensitive key info

logic/auth.go

@@ -6,10 +6,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-playground/validator/v10"
+	validator "github.com/go-playground/validator/v10"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic/pro"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -95,21 +97,61 @@ func CreateUser(user models.User) (models.User, error) {
 	// set password to encrypted password
 	user.Password = string(hash)
 
-	tokenString, _ := CreateUserJWT(user.UserName, user.Networks, user.IsAdmin)
-
+	tokenString, _ := CreateProUserJWT(user.UserName, user.Networks, user.Groups, user.IsAdmin)
 	if tokenString == "" {
-		// returnErrorResponse(w, r, errorResponse)
+		// logic.ReturnErrorResponse(w, r, errorResponse)
 		return user, err
 	}
 
+	SetUserDefaults(&user)
+
 	// connect db
 	data, err := json.Marshal(&user)
 	if err != nil {
 		return user, err
 	}
 	err = database.Insert(user.UserName, string(data), database.USERS_TABLE_NAME)
+	if err != nil {
+		return user, err
+	}
 
-	return user, err
+	// == PRO == Add user to every network as network user ==
+	currentNets, err := GetNetworks()
+	if err != nil {
+		currentNets = []models.Network{}
+	}
+	for i := range currentNets {
+		newUser := promodels.NetworkUser{
+			ID:      promodels.NetworkUserID(user.UserName),
+			Clients: []string{},
+			Nodes:   []string{},
+		}
+
+		pro.AddProNetDefaults(&currentNets[i])
+		if pro.IsUserAllowed(&currentNets[i], user.UserName, user.Groups) {
+			newUser.AccessLevel = currentNets[i].ProSettings.DefaultAccessLevel
+			newUser.ClientLimit = currentNets[i].ProSettings.DefaultUserClientLimit
+			newUser.NodeLimit = currentNets[i].ProSettings.DefaultUserNodeLimit
+		} else {
+			newUser.AccessLevel = pro.NO_ACCESS
+			newUser.ClientLimit = 0
+			newUser.NodeLimit = 0
+		}
+
+		// legacy
+		if StringSliceContains(user.Networks, currentNets[i].NetID) {
+			if !Is_EE {
+				newUser.AccessLevel = pro.NET_ADMIN
+			}
+		}
+		userErr := pro.CreateNetworkUser(&currentNets[i], &newUser)
+		if userErr != nil {
+			logger.Log(0, "failed to add network user data on network", currentNets[i].NetID, "for user", user.UserName)
+		}
+	}
+	// == END PRO ==
+
+	return user, nil
 }
 
 // CreateAdmin - creates an admin user
@@ -136,10 +178,10 @@ func VerifyAuthRequest(authRequest models.UserAuthParams) (string, error) {
 	//Search DB for node with Mac Address. Ignore pending nodes (they should not be able to authenticate with API until approved).
 	record, err := database.FetchRecord(database.USERS_TABLE_NAME, authRequest.UserName)
 	if err != nil {
-		return "", errors.New("incorrect credentials")
+		return "", errors.New("error retrieving user from db: " + err.Error())
 	}
 	if err = json.Unmarshal([]byte(record), &result); err != nil {
-		return "", errors.New("incorrect credentials")
+		return "", errors.New("error unmarshalling user json: " + err.Error())
 	}
 
 	// compare password from request to stored password in database
@@ -150,14 +192,15 @@ func VerifyAuthRequest(authRequest models.UserAuthParams) (string, error) {
 	}
 
 	//Create a new JWT for the node
-	tokenString, _ := CreateUserJWT(authRequest.UserName, result.Networks, result.IsAdmin)
+	tokenString, _ := CreateProUserJWT(authRequest.UserName, result.Networks, result.Groups, result.IsAdmin)
 	return tokenString, nil
 }
 
 // UpdateUserNetworks - updates the networks of a given user
-func UpdateUserNetworks(newNetworks []string, isadmin bool, currentUser *models.User) error {
+func UpdateUserNetworks(newNetworks, newGroups []string, isadmin bool, currentUser *models.ReturnUser) error {
 	// check if user exists
-	if returnedUser, err := GetUser(currentUser.UserName); err != nil {
+	returnedUser, err := GetUser(currentUser.UserName)
+	if err != nil {
 		return err
 	} else if returnedUser.IsAdmin {
 		return fmt.Errorf("can not make changes to an admin user, attempted to change %s", returnedUser.UserName)
@@ -166,18 +209,46 @@ func UpdateUserNetworks(newNetworks []string, isadmin bool, currentUser *models.
 		currentUser.IsAdmin = true
 		currentUser.Networks = nil
 	} else {
+		// == PRO ==
+		currentUser.Groups = newGroups
+		for _, n := range newNetworks {
+			if !StringSliceContains(currentUser.Networks, n) {
+				// make net admin of any network not previously assigned
+				pro.MakeNetAdmin(n, currentUser.UserName)
+			}
+		}
+		// Compare networks, find networks not in previous
+		for _, n := range currentUser.Networks {
+			if !StringSliceContains(newNetworks, n) {
+				// if user was removed from a network, re-assign access to net default level
+				if network, err := GetNetwork(n); err == nil {
+					if network.ProSettings != nil {
+						ok := pro.AssignAccessLvl(n, currentUser.UserName, network.ProSettings.DefaultAccessLevel)
+						if ok {
+							logger.Log(0, "changed", currentUser.UserName, "access level on network", network.NetID, "to", fmt.Sprintf("%d", network.ProSettings.DefaultAccessLevel))
+						}
+					}
+				}
+			}
+		}
+
+		if err := AdjustGroupPermissions(currentUser); err != nil {
+			logger.Log(0, "failed to update user", currentUser.UserName, "after group update", err.Error())
+		}
+		// == END PRO ==
+
 		currentUser.Networks = newNetworks
 	}
 
-	data, err := json.Marshal(currentUser)
-	if err != nil {
-		return err
-	}
-	if err = database.Insert(currentUser.UserName, string(data), database.USERS_TABLE_NAME); err != nil {
-		return err
-	}
+	_, err = UpdateUser(models.User{
+		UserName: currentUser.UserName,
+		Networks: currentUser.Networks,
+		IsAdmin:  currentUser.IsAdmin,
+		Password: "",
+		Groups:   currentUser.Groups,
+	}, returnedUser)
 
-	return nil
+	return err
 }
 
 // UpdateUser - updates a given user
@@ -187,11 +258,6 @@ func UpdateUser(userchange models.User, user models.User) (models.User, error) {
 		return models.User{}, err
 	}
 
-	err := ValidateUser(userchange)
-	if err != nil {
-		return models.User{}, err
-	}
-
 	queryUser := user.UserName
 
 	if userchange.UserName != "" {
@@ -200,6 +266,9 @@ func UpdateUser(userchange models.User, user models.User) (models.User, error) {
 	if len(userchange.Networks) > 0 {
 		user.Networks = userchange.Networks
 	}
+	if len(userchange.Groups) > 0 {
+		user.Groups = userchange.Groups
+	}
 	if userchange.Password != "" {
 		// encrypt that password so we never see it again
 		hash, err := bcrypt.GenerateFromPassword([]byte(userchange.Password), 5)
@@ -212,6 +281,12 @@ func UpdateUser(userchange models.User, user models.User) (models.User, error) {
 
 		user.Password = userchange.Password
 	}
+
+	err := ValidateUser(user)
+	if err != nil {
+		return models.User{}, err
+	}
+
 	if err = database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
 		return models.User{}, err
 	}
@@ -256,6 +331,20 @@ func DeleteUser(user string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
+
+	// == pro - remove user from all network user instances ==
+	currentNets, err := GetNetworks()
+	if err != nil {
+		return true, err
+	}
+
+	for i := range currentNets {
+		netID := currentNets[i].NetID
+		if err = pro.DeleteNetworkUser(netID, user); err != nil {
+			logger.Log(0, "failed to remove", user, "as network user from network", netID, err.Error())
+		}
+	}
+
 	return true, nil
 }
 
@@ -313,6 +402,9 @@ func IsStateValid(state string) (string, bool) {
 	if s.Value != "" {
 		delState(state)
 	}
+	if err != nil {
+		logger.Log(2, "error retrieving oauth state:", err.Error())
+	}
 	return s.Value, err == nil
 }
 
@@ -320,3 +412,51 @@ func IsStateValid(state string) (string, bool) {
 func delState(state string) error {
 	return database.DeleteRecord(database.SSO_STATE_CACHE, state)
 }
+
+// PRO
+
+// AdjustGroupPermissions - adjusts a given user's network access based on group changes
+func AdjustGroupPermissions(user *models.ReturnUser) error {
+	networks, err := GetNetworks()
+	if err != nil {
+		return err
+	}
+	// UPDATE
+	// go through all networks and see if new group is in
+	// if access level of current user is greater (value) than network's default
+	// assign network's default
+	// DELETE
+	// if user not allowed on network a
+	for i := range networks {
+		AdjustNetworkUserPermissions(user, &networks[i])
+	}
+
+	return nil
+}
+
+// AdjustGroupPermissions - adjusts a given user's network access based on group changes
+func AdjustNetworkUserPermissions(user *models.ReturnUser, network *models.Network) error {
+	networkUser, err := pro.GetNetworkUser(
+		network.NetID,
+		promodels.NetworkUserID(user.UserName),
+	)
+	if err == nil && network.ProSettings != nil {
+		if pro.IsUserAllowed(network, user.UserName, user.Groups) {
+			if networkUser.AccessLevel > network.ProSettings.DefaultAccessLevel {
+				networkUser.AccessLevel = network.ProSettings.DefaultAccessLevel
+			}
+			if networkUser.NodeLimit < network.ProSettings.DefaultUserNodeLimit {
+				networkUser.NodeLimit = network.ProSettings.DefaultUserNodeLimit
+			}
+			if networkUser.ClientLimit < network.ProSettings.DefaultUserClientLimit {
+				networkUser.ClientLimit = network.ProSettings.DefaultUserClientLimit
+			}
+		} else {
+			networkUser.AccessLevel = pro.NO_ACCESS
+			networkUser.NodeLimit = 0
+			networkUser.ClientLimit = 0
+		}
+		pro.UpdateNetworkUser(network.NetID, networkUser)
+	}
+	return err
+}

logic/dns.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/go-playground/validator/v10"
+	validator "github.com/go-playground/validator/v10"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"

logic/errors.go

@@ -1,4 +1,4 @@
-package controller
+package logic
 
 import (
 	"encoding/json"
@@ -8,7 +8,8 @@ import (
 	"github.com/gravitl/netmaker/models"
 )
 
-func formatError(err error, errType string) models.ErrorResponse {
+// FormatError - takes ErrorResponse and uses correct code
+func FormatError(err error, errType string) models.ErrorResponse {
 
 	var status = http.StatusInternalServerError
 	switch errType {
@@ -33,7 +34,8 @@ func formatError(err error, errType string) models.ErrorResponse {
 	return response
 }
 
-func returnSuccessResponse(response http.ResponseWriter, request *http.Request, message string) {
+// ReturnSuccessResponse - processes message and adds header
+func ReturnSuccessResponse(response http.ResponseWriter, request *http.Request, message string) {
 	var httpResponse models.SuccessResponse
 	httpResponse.Code = http.StatusOK
 	httpResponse.Message = message
@@ -42,7 +44,8 @@ func returnSuccessResponse(response http.ResponseWriter, request *http.Request,
 	json.NewEncoder(response).Encode(httpResponse)
 }
 
-func returnErrorResponse(response http.ResponseWriter, request *http.Request, errorMessage models.ErrorResponse) {
+// ReturnErrorResponse - processes error and adds header
+func ReturnErrorResponse(response http.ResponseWriter, request *http.Request, errorMessage models.ErrorResponse) {
 	httpResponse := &models.ErrorResponse{Code: errorMessage.Code, Message: errorMessage.Message}
 	jsonResponse, err := json.Marshal(httpResponse)
 	if err != nil {

logic/extpeers.go

@@ -183,3 +183,40 @@ func UpdateExtClient(newclientid string, network string, enabled bool, client *m
 	CreateExtClient(client)
 	return client, err
 }
+
+// GetExtClientsByID - gets the clients of attached gateway
+func GetExtClientsByID(nodeid, network string) ([]models.ExtClient, error) {
+	var result []models.ExtClient
+	currentClients, err := GetNetworkExtClients(network)
+	if err != nil {
+		return result, err
+	}
+	for i := range currentClients {
+		if currentClients[i].IngressGatewayID == nodeid {
+			result = append(result, currentClients[i])
+		}
+	}
+	return result, nil
+}
+
+// GetAllExtClients - gets all ext clients from DB
+func GetAllExtClients() ([]models.ExtClient, error) {
+	var clients = []models.ExtClient{}
+	currentNetworks, err := GetNetworks()
+	if err != nil && database.IsEmptyRecord(err) {
+		return clients, nil
+	} else if err != nil {
+		return clients, err
+	}
+
+	for i := range currentNetworks {
+		netName := currentNetworks[i].NetID
+		netClients, err := GetNetworkExtClients(netName)
+		if err != nil {
+			continue
+		}
+		clients = append(clients, netClients...)
+	}
+
+	return clients, nil
+}

logic/gateway.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net"
 	"strings"
 	"time"
 
@@ -213,12 +212,12 @@ func CreateIngressGateway(netid string, nodeid string) (models.Node, error) {
 
 	if node.PostUp != "" {
 		if !strings.Contains(node.PostUp, postUpCmd) {
-			postUpCmd = node.PostUp + " ; " + postUpCmd
+			postUpCmd = node.PostUp + postUpCmd
 		}
 	}
 	if node.PostDown != "" {
 		if !strings.Contains(node.PostDown, postDownCmd) {
-			postDownCmd = node.PostDown + " ; " + postDownCmd
+			postDownCmd = node.PostDown + postDownCmd
 		}
 	}
 	node.SetLastModified()
@@ -334,12 +333,6 @@ func firewallNFTCommandsCreateEgress(networkInterface string, gatewayInterface s
 		postUp += "nft add table nat ; "
 		postUp += "nft 'add chain ip nat prerouting { type nat hook prerouting priority 0 ;}' ; "
 		postUp += "nft 'add chain ip nat postrouting { type nat hook postrouting priority 0 ;}' ; "
-		for _, networkCIDR := range gatewayranges {
-			if net.ParseIP(networkCIDR).To16() != nil {
-				continue
-			}
-			postUp += "nft add rule nat postrouting iifname " + networkInterface + " oifname " + gatewayInterface + " ip saddr " + networkCIDR + " masquerade ; "
-		}
 
 		postDown += "nft flush table filter ; "
 
@@ -392,12 +385,12 @@ func firewallIPTablesCommandsCreateIngress(networkInterface string, ipv4, ipv6 b
 		// spacing around ; is important for later parsing of postup/postdown in wireguard/common.go
 		postUp += "ip6tables -A FORWARD -i " + networkInterface + " -j ACCEPT ; "
 		postUp += "ip6tables -A FORWARD -o " + networkInterface + " -j ACCEPT ; "
-		postUp += "ip6tables -t nat -A POSTROUTING -o " + networkInterface + " -j MASQUERADE"
+		postUp += "ip6tables -t nat -A POSTROUTING -o " + networkInterface + " -j MASQUERADE ; "
 
 		// doesn't remove potentially empty tables or chains
 		postDown += "ip6tables -D FORWARD -i " + networkInterface + " -j ACCEPT ; "
 		postDown += "ip6tables -D FORWARD -o " + networkInterface + " -j ACCEPT ; "
-		postDown += "ip6tables -t nat -D POSTROUTING -o " + networkInterface + " -j MASQUERADE"
+		postDown += "ip6tables -t nat -D POSTROUTING -o " + networkInterface + " -j MASQUERADE ; "
 	}
 	return postUp, postDown
 }
@@ -409,13 +402,13 @@ func firewallIPTablesCommandsCreateEgress(networkInterface string, gatewayInterf
 	postDown := ""
 	if ipv4 {
 		postUp += "iptables -A FORWARD -i " + networkInterface + " -j ACCEPT ; "
-		postUp += "iptables -A FORWARD -o " + networkInterface + " -j ACCEPT"
+		postUp += "iptables -A FORWARD -o " + networkInterface + " -j ACCEPT ; "
 		postDown += "iptables -D FORWARD -i " + networkInterface + " -j ACCEPT ; "
 		postDown += "iptables -D FORWARD -o " + networkInterface + " -j ACCEPT ; "
 
 		if egressNatEnabled == "yes" {
-			postUp += " ; iptables -t nat -A POSTROUTING -o " + gatewayInterface + " -j MASQUERADE ; "
-			postDown += " ; iptables -t nat -D POSTROUTING -o " + gatewayInterface + " -j MASQUERADE ; "
+			postUp += "iptables -t nat -A POSTROUTING -o " + gatewayInterface + " -j MASQUERADE ; "
+			postDown += "iptables -t nat -D POSTROUTING -o " + gatewayInterface + " -j MASQUERADE ; "
 		}
 	}
 	if ipv6 {
@@ -425,8 +418,8 @@ func firewallIPTablesCommandsCreateEgress(networkInterface string, gatewayInterf
 		postDown += "ip6tables -D FORWARD -o " + networkInterface + " -j ACCEPT ; "
 
 		if egressNatEnabled == "yes" {
-			postUp += " ; ip6tables -t nat -A POSTROUTING -o " + gatewayInterface + " -j MASQUERADE"
-			postDown += " ; ip6tables -t nat -D POSTROUTING -o " + gatewayInterface + " -j MASQUERADE"
+			postUp += "ip6tables -t nat -A POSTROUTING -o " + gatewayInterface + " -j MASQUERADE ; "
+			postDown += "ip6tables -t nat -D POSTROUTING -o " + gatewayInterface + " -j MASQUERADE ; "
 		}
 	}
 	return postUp, postDown

logic/jwts.go

@@ -53,6 +53,30 @@ func CreateJWT(uuid string, macAddress string, network string) (response string,
 	return "", err
 }
 
+// CreateProUserJWT - creates a user jwt token
+func CreateProUserJWT(username string, networks, groups []string, isadmin bool) (response string, err error) {
+	expirationTime := time.Now().Add(60 * 12 * time.Minute)
+	claims := &models.UserClaims{
+		UserName: username,
+		Networks: networks,
+		IsAdmin:  isadmin,
+		Groups:   groups,
+		RegisteredClaims: jwt.RegisteredClaims{
+			Issuer:    "Netmaker",
+			Subject:   fmt.Sprintf("user|%s", username),
+			IssuedAt:  jwt.NewNumericDate(time.Now()),
+			ExpiresAt: jwt.NewNumericDate(expirationTime),
+		},
+	}
+
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	tokenString, err := token.SignedString(jwtSecretKey)
+	if err == nil {
+		return tokenString, nil
+	}
+	return "", err
+}
+
 // CreateUserJWT - creates a user jwt token
 func CreateUserJWT(username string, networks []string, isadmin bool) (response string, err error) {
 	expirationTime := time.Now().Add(60 * 12 * time.Minute)

logic/metrics.go

@@ -0,0 +1,65 @@
+package logic
+
+import (
+	"encoding/json"
+
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/models"
+)
+
+// GetMetrics - gets the metrics
+func GetMetrics(nodeid string) (*models.Metrics, error) {
+	var metrics models.Metrics
+	record, err := database.FetchRecord(database.METRICS_TABLE_NAME, nodeid)
+	if err != nil {
+		if database.IsEmptyRecord(err) {
+			return &metrics, nil
+		}
+		return &metrics, err
+	}
+	err = json.Unmarshal([]byte(record), &metrics)
+	if err != nil {
+		return &metrics, err
+	}
+	return &metrics, nil
+}
+
+// UpdateMetrics - updates the metrics of a given client
+func UpdateMetrics(nodeid string, metrics *models.Metrics) error {
+	data, err := json.Marshal(metrics)
+	if err != nil {
+		return err
+	}
+	return database.Insert(nodeid, string(data), database.METRICS_TABLE_NAME)
+}
+
+// DeleteMetrics - deletes metrics of a given node
+func DeleteMetrics(nodeid string) error {
+	return database.DeleteRecord(database.METRICS_TABLE_NAME, nodeid)
+}
+
+// CollectServerMetrics - collects metrics for given server node
+func CollectServerMetrics(serverID string, networkNodes []models.Node) *models.Metrics {
+	newServerMetrics := models.Metrics{}
+	newServerMetrics.Connectivity = make(map[string]models.Metric)
+	for i := range networkNodes {
+		currNodeID := networkNodes[i].ID
+		if currNodeID == serverID {
+			continue
+		}
+		if currMetrics, err := GetMetrics(currNodeID); err == nil {
+			if currMetrics.Connectivity != nil && currMetrics.Connectivity[serverID].Connected {
+				metrics := currMetrics.Connectivity[serverID]
+				metrics.NodeName = networkNodes[i].Name
+				metrics.IsServer = "no"
+				newServerMetrics.Connectivity[currNodeID] = metrics
+			}
+		} else {
+			newServerMetrics.Connectivity[currNodeID] = models.Metric{
+				Connected: false,
+				Latency:   999,
+			}
+		}
+	}
+	return &newServerMetrics
+}

logic/metrics/metrics.go

@@ -0,0 +1,124 @@
+package metrics
+
+import (
+	"time"
+
+	"github.com/go-ping/ping"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/models"
+	"golang.zx2c4.com/wireguard/wgctrl"
+)
+
+// Collect - collects metrics
+func Collect(iface string, peerMap models.PeerMap) (*models.Metrics, error) {
+	var metrics models.Metrics
+	metrics.Connectivity = make(map[string]models.Metric)
+	var wgclient, err = wgctrl.New()
+	if err != nil {
+		fillUnconnectedData(&metrics, peerMap)
+		return &metrics, err
+	}
+	defer wgclient.Close()
+	device, err := wgclient.Device(iface)
+	if err != nil {
+		fillUnconnectedData(&metrics, peerMap)
+		return &metrics, err
+	}
+	// TODO handle freebsd??
+	for i := range device.Peers {
+		currPeer := device.Peers[i]
+		id := peerMap[currPeer.PublicKey.String()].ID
+		address := peerMap[currPeer.PublicKey.String()].Address
+		if id == "" || address == "" {
+			logger.Log(0, "attempted to parse metrics for invalid peer from server", id, address)
+			continue
+		}
+		var newMetric = models.Metric{
+			NodeName: peerMap[currPeer.PublicKey.String()].Name,
+			IsServer: peerMap[currPeer.PublicKey.String()].IsServer,
+		}
+		logger.Log(2, "collecting metrics for peer", address)
+		newMetric.TotalReceived = currPeer.ReceiveBytes
+		newMetric.TotalSent = currPeer.TransmitBytes
+
+		// get latency
+		pinger, err := ping.NewPinger(address)
+		if err != nil {
+			logger.Log(0, "could not initiliaze ping for metrics on peer address", address, err.Error())
+			newMetric.Connected = false
+			newMetric.Latency = 999
+		} else {
+			pinger.Count = 1
+			pinger.Timeout = time.Second * 2
+			err = pinger.Run()
+			if err != nil {
+				logger.Log(0, "failed ping for metrics on peer address", address, err.Error())
+				newMetric.Connected = false
+				newMetric.Latency = 999
+			} else {
+				pingStats := pinger.Statistics()
+				newMetric.Uptime = 1
+				newMetric.Connected = true
+				newMetric.Latency = pingStats.AvgRtt.Milliseconds()
+			}
+		}
+		newMetric.TotalTime = 1
+		metrics.Connectivity[id] = newMetric
+	}
+
+	fillUnconnectedData(&metrics, peerMap)
+	return &metrics, nil
+}
+
+// GetExchangedBytesForNode - get exchanged bytes for current node peers
+func GetExchangedBytesForNode(node *models.Node, metrics *models.Metrics) error {
+
+	peers, err := logic.GetPeerUpdate(node)
+	if err != nil {
+		logger.Log(0, "Failed to get peers: ", err.Error())
+		return err
+	}
+	wgclient, err := wgctrl.New()
+	if err != nil {
+		return err
+	}
+	defer wgclient.Close()
+	device, err := wgclient.Device(node.Interface)
+	if err != nil {
+		return err
+	}
+	for _, currPeer := range device.Peers {
+		id := peers.PeerIDs[currPeer.PublicKey.String()].ID
+		address := peers.PeerIDs[currPeer.PublicKey.String()].Address
+		if id == "" || address == "" {
+			logger.Log(0, "attempted to parse metrics for invalid peer from server", id, address)
+			continue
+		}
+		logger.Log(2, "collecting exchanged bytes info for peer: ", address)
+		peerMetric := metrics.Connectivity[id]
+		peerMetric.TotalReceived = currPeer.ReceiveBytes
+		peerMetric.TotalSent = currPeer.TransmitBytes
+		metrics.Connectivity[id] = peerMetric
+	}
+	return nil
+}
+
+// == used to fill zero value data for non connected peers ==
+func fillUnconnectedData(metrics *models.Metrics, peerMap models.PeerMap) {
+	for r := range peerMap {
+		id := peerMap[r].ID
+		if !metrics.Connectivity[id].Connected {
+			newMetric := models.Metric{
+				NodeName:  peerMap[r].Name,
+				IsServer:  peerMap[r].IsServer,
+				Uptime:    0,
+				TotalTime: 1,
+				Connected: false,
+				Latency:   999,
+				PercentUp: 0,
+			}
+			metrics.Connectivity[id] = newMetric
+		}
+	}
+}

logic/networks.go

@@ -9,10 +9,11 @@ import (
 	"strings"
 
 	"github.com/c-robinson/iplib"
-	"github.com/go-playground/validator/v10"
+	validator "github.com/go-playground/validator/v10"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic/acls/nodeacls"
+	"github.com/gravitl/netmaker/logic/pro"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/netclient/ncutils"
 	"github.com/gravitl/netmaker/validation"
@@ -62,6 +63,9 @@ func DeleteNetwork(network string) error {
 		} else {
 			logger.Log(1, "could not remove servers before deleting network", network)
 		}
+		if err = pro.RemoveAllNetworkUsers(network); err != nil {
+			logger.Log(0, "failed to remove network users on network delete for network", network, err.Error())
+		}
 		return database.DeleteRecord(database.NETWORKS_TABLE_NAME, network)
 	}
 	return errors.New("node check failed. All nodes must be deleted before deleting network")
@@ -84,13 +88,24 @@ func CreateNetwork(network models.Network) (models.Network, error) {
 		}
 		network.AddressRange6 = normalizedRange
 	}
+
 	network.SetDefaults()
 	network.SetNodesLastModified()
 	network.SetNetworkLastModified()
 
+	pro.AddProNetDefaults(&network)
+
+	if len(network.ProSettings.AllowedGroups) == 0 {
+		network.ProSettings.AllowedGroups = []string{pro.DEFAULT_ALLOWED_GROUPS}
+	}
+
 	err := ValidateNetwork(&network, false)
 	if err != nil {
-		//returnErrorResponse(w, r, formatError(err, "badrequest"))
+		//logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+		return models.Network{}, err
+	}
+
+	if err = pro.InitializeNetworkUsers(network.NetID); err != nil {
 		return models.Network{}, err
 	}
 
@@ -98,10 +113,16 @@ func CreateNetwork(network models.Network) (models.Network, error) {
 	if err != nil {
 		return models.Network{}, err
 	}
+
 	if err = database.Insert(network.NetID, string(data), database.NETWORKS_TABLE_NAME); err != nil {
 		return models.Network{}, err
 	}
 
+	// == add all current users to network as network users ==
+	if err = InitializeNetUsers(&network); err != nil {
+		return network, err
+	}
+
 	return network, nil
 }
 
@@ -526,25 +547,29 @@ func IsNetworkNameUnique(network *models.Network) (bool, error) {
 }
 
 // UpdateNetwork - updates a network with another network's fields
-func UpdateNetwork(currentNetwork *models.Network, newNetwork *models.Network) (bool, bool, bool, bool, error) {
+func UpdateNetwork(currentNetwork *models.Network, newNetwork *models.Network) (bool, bool, bool, bool, []string, []string, error) {
 	if err := ValidateNetwork(newNetwork, true); err != nil {
-		return false, false, false, false, err
+		return false, false, false, false, nil, nil, err
 	}
 	if newNetwork.NetID == currentNetwork.NetID {
 		hasrangeupdate4 := newNetwork.AddressRange != currentNetwork.AddressRange
 		hasrangeupdate6 := newNetwork.AddressRange6 != currentNetwork.AddressRange6
 		localrangeupdate := newNetwork.LocalRange != currentNetwork.LocalRange
 		hasholepunchupdate := newNetwork.DefaultUDPHolePunch != currentNetwork.DefaultUDPHolePunch
+		groupDelta := append(StringDifference(newNetwork.ProSettings.AllowedGroups, currentNetwork.ProSettings.AllowedGroups),
+			StringDifference(currentNetwork.ProSettings.AllowedGroups, newNetwork.ProSettings.AllowedGroups)...)
+		userDelta := append(StringDifference(newNetwork.ProSettings.AllowedUsers, currentNetwork.ProSettings.AllowedUsers),
+			StringDifference(currentNetwork.ProSettings.AllowedUsers, newNetwork.ProSettings.AllowedUsers)...)
 		data, err := json.Marshal(newNetwork)
 		if err != nil {
-			return false, false, false, false, err
+			return false, false, false, false, nil, nil, err
 		}
 		newNetwork.SetNetworkLastModified()
 		err = database.Insert(newNetwork.NetID, string(data), database.NETWORKS_TABLE_NAME)
-		return hasrangeupdate4, hasrangeupdate6, localrangeupdate, hasholepunchupdate, err
+		return hasrangeupdate4, hasrangeupdate6, localrangeupdate, hasholepunchupdate, groupDelta, userDelta, err
 	}
 	// copy values
-	return false, false, false, false, errors.New("failed to update network " + newNetwork.NetID + ", cannot change netid.")
+	return false, false, false, false, nil, nil, errors.New("failed to update network " + newNetwork.NetID + ", cannot change netid.")
 }
 
 // GetNetwork - gets a network from database
@@ -596,6 +621,15 @@ func ValidateNetwork(network *models.Network, isUpdate bool) error {
 		}
 	}
 
+	if network.ProSettings != nil {
+		if network.ProSettings.DefaultAccessLevel < pro.NET_ADMIN || network.ProSettings.DefaultAccessLevel > pro.NO_ACCESS {
+			return fmt.Errorf("invalid access level")
+		}
+		if network.ProSettings.DefaultUserClientLimit < 0 || network.ProSettings.DefaultUserNodeLimit < 0 {
+			return fmt.Errorf("invalid node/client limit provided")
+		}
+	}
+
 	return err
 }
 
@@ -627,6 +661,17 @@ func SaveNetwork(network *models.Network) error {
 	return nil
 }
 
+// NetworkExists - check if network exists
+func NetworkExists(name string) (bool, error) {
+
+	var network string
+	var err error
+	if network, err = database.FetchRecord(database.NETWORKS_TABLE_NAME, name); err != nil {
+		return false, err
+	}
+	return len(network) > 0, nil
+}
+
 // == Private ==
 
 func networkNodesUpdateAction(networkName string, action string) error {

logic/nodes.go

@@ -7,12 +7,14 @@ import (
 	"sort"
 	"time"
 
-	"github.com/go-playground/validator/v10"
+	validator "github.com/go-playground/validator/v10"
 	"github.com/google/uuid"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic/acls"
 	"github.com/gravitl/netmaker/logic/acls/nodeacls"
+	"github.com/gravitl/netmaker/logic/pro"
+	"github.com/gravitl/netmaker/logic/pro/proacls"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/netclient/ncutils"
 	"github.com/gravitl/netmaker/servercfg"
@@ -128,6 +130,7 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
 			}
 		}
 	}
+	nodeACLDelta := currentNode.DefaultACL != newNode.DefaultACL
 	newNode.Fill(currentNode)
 
 	if currentNode.IsServer == "yes" && !validateServer(currentNode, newNode) {
@@ -137,7 +140,15 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
 	if err := ValidateNode(newNode, true); err != nil {
 		return err
 	}
+
 	if newNode.ID == currentNode.ID {
+		if nodeACLDelta {
+			if err := updateProNodeACLS(newNode); err != nil {
+				logger.Log(1, "failed to apply node level ACLs during creation of node", newNode.ID, "-", err.Error())
+				return err
+			}
+		}
+
 		newNode.SetLastModified()
 		if data, err := json.Marshal(newNode); err != nil {
 			return err
@@ -145,6 +156,7 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
 			return database.Insert(newNode.ID, string(data), database.NODES_TABLE_NAME)
 		}
 	}
+
 	return fmt.Errorf("failed to update node " + currentNode.ID + ", cannot change ID.")
 }
 
@@ -176,9 +188,16 @@ func DeleteNodeByID(node *models.Node, exterminate bool) error {
 	if err = database.DeleteRecord(database.NODES_TABLE_NAME, key); err != nil {
 		return err
 	}
+
 	if servercfg.IsDNSMode() {
 		SetDNS()
 	}
+	if node.OwnerID != "" {
+		err = pro.DissociateNetworkUserNode(node.OwnerID, node.Network, node.ID)
+		if err != nil {
+			logger.Log(0, "failed to dissasociate", node.OwnerID, "from node", node.ID, ":", err.Error())
+		}
+	}
 
 	_, err = nodeacls.RemoveNodeACL(nodeacls.NetworkID(node.Network), nodeacls.NodeID(node.ID))
 	if err != nil {
@@ -186,6 +205,10 @@ func DeleteNodeByID(node *models.Node, exterminate bool) error {
 		logger.Log(2, "attempted to remove node ACL for node", node.Name, node.ID)
 	}
 	// removeZombie <- node.ID
+	if err = DeleteMetrics(node.ID); err != nil {
+		logger.Log(1, "unable to remove metrics from DB for node", node.ID, err.Error())
+	}
+
 	if node.IsServer == "yes" {
 		return removeLocalServer(node)
 	}
@@ -219,6 +242,9 @@ func ValidateNode(node *models.Node, isUpdate bool) error {
 	_ = v.RegisterValidation("checkyesorno", func(fl validator.FieldLevel) bool {
 		return validation.CheckYesOrNo(fl)
 	})
+	_ = v.RegisterValidation("checkyesornoorunset", func(fl validator.FieldLevel) bool {
+		return validation.CheckYesOrNoOrUnset(fl)
+	})
 	err := v.Struct(node)
 
 	return err
@@ -255,6 +281,10 @@ func CreateNode(node *models.Node) error {
 		}
 	}
 
+	if node.DefaultACL == "" {
+		node.DefaultACL = "unset"
+	}
+
 	reverse := node.IsServer == "yes"
 	if node.Address == "" {
 		if parentNetwork.IsIPv4 == "yes" {
@@ -281,7 +311,7 @@ func CreateNode(node *models.Node) error {
 	//Create a JWT for the node
 	tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network)
 	if tokenString == "" {
-		//returnErrorResponse(w, r, errorResponse)
+		//logic.ReturnErrorResponse(w, r, errorResponse)
 		return err
 	}
 	err = ValidateNode(node, false)
@@ -305,9 +335,19 @@ func CreateNode(node *models.Node) error {
 		return err
 	}
 
+	if err = updateProNodeACLS(node); err != nil {
+		logger.Log(1, "failed to apply node level ACLs during creation of node", node.ID, "-", err.Error())
+		return err
+	}
+
 	if node.IsPending != "yes" {
 		DecrimentKey(node.Network, node.AccessKey)
 	}
+
+	if err = UpdateMetrics(node.ID, &models.Metrics{Connectivity: make(map[string]models.Metric)}); err != nil {
+		logger.Log(1, "failed to initialize metrics for node", node.Name, node.ID, err.Error())
+	}
+
 	SetNetworkNodesLastModified(node.Network)
 	if servercfg.IsDNSMode() {
 		err = SetDNS()
@@ -381,6 +421,10 @@ func SetNodeDefaults(node *models.Node) {
 
 	node.ExpirationDateTime = time.Now().Unix() + models.TEN_YEARS_IN_SECONDS
 
+	if node.DefaultACL == "" && node.IsServer != "yes" {
+		node.DefaultACL = parentNetwork.DefaultACL
+	}
+
 	if node.ListenPort == 0 {
 		node.ListenPort = parentNetwork.DefaultListenPort
 	}
@@ -435,6 +479,7 @@ func SetNodeDefaults(node *models.Node) {
 	node.SetDefaultIsK8S()
 	node.SetDefaultIsHub()
 	node.SetDefaultConnected()
+	node.SetDefaultACL()
 }
 
 // GetRecordKey - get record key
@@ -677,3 +722,19 @@ func findNode(ip string) (*models.Node, error) {
 	}
 	return nil, errors.New("node not found")
 }
+
+// == PRO ==
+
+func updateProNodeACLS(node *models.Node) error {
+	// == PRO node ACLs ==
+	networkNodes, err := GetNetworkNodes(node.Network)
+	if err != nil {
+		return err
+	}
+	if err = proacls.AdjustNodeAcls(node, networkNodes[:]); err != nil {
+		return err
+	}
+	return nil
+}
+
+// == END PRO ==

logic/peers.go

@@ -3,7 +3,6 @@ package logic
 import (
 	"errors"
 	"fmt"
-	"log"
 	"net"
 	"strconv"
 	"strings"
@@ -32,6 +31,7 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
 	} else if network.IsPointToSite == "yes" && node.IsHub != "yes" {
 		isP2S = true
 	}
+	var peerMap = make(models.PeerMap)
 
 	// udppeers = the peers parsed from the local interface
 	// gives us correct port to reach
@@ -61,6 +61,10 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
 		if node.NetworkSettings.IsPointToSite == "yes" && node.IsHub == "no" && peer.IsHub == "no" {
 			continue
 		}
+		if node.Connected != "yes" {
+			//skip unconnected nodes
+			continue
+		}
 
 		// if the node is not a server, set the endpoint
 		var setEndpoint = !(node.IsServer == "yes")
@@ -150,16 +154,26 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
 		}
 
 		peers = append(peers, peerData)
+		peerMap[peer.PublicKey] = models.IDandAddr{
+			Name:     peer.Name,
+			ID:       peer.ID,
+			Address:  peer.PrimaryAddress(),
+			IsServer: peer.IsServer,
+		}
+
 		if peer.IsServer == "yes" {
 			serverNodeAddresses = append(serverNodeAddresses, models.ServerAddr{IsLeader: IsLeader(&peer), Address: peer.Address})
 		}
 	}
 	if node.IsIngressGateway == "yes" {
-		extPeers, err := getExtPeers(node)
+		extPeers, idsAndAddr, err := getExtPeers(node)
 		if err == nil {
 			peers = append(peers, extPeers...)
-		} else {
-			log.Println("ERROR RETRIEVING EXTERNAL PEERS", err)
+			for i := range idsAndAddr {
+				peerMap[idsAndAddr[i].ID] = idsAndAddr[i]
+			}
+		} else if !database.IsEmptyRecord(err) {
+			logger.Log(1, "error retrieving external clients:", err.Error())
 		}
 	}
 
@@ -168,14 +182,16 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
 	peerUpdate.Peers = peers
 	peerUpdate.ServerAddrs = serverNodeAddresses
 	peerUpdate.DNS = getPeerDNS(node.Network)
+	peerUpdate.PeerIDs = peerMap
 	return peerUpdate, nil
 }
 
-func getExtPeers(node *models.Node) ([]wgtypes.PeerConfig, error) {
+func getExtPeers(node *models.Node) ([]wgtypes.PeerConfig, []models.IDandAddr, error) {
 	var peers []wgtypes.PeerConfig
+	var idsAndAddr []models.IDandAddr
 	extPeers, err := GetExtPeersList(node)
 	if err != nil {
-		return peers, err
+		return peers, idsAndAddr, err
 	}
 	for _, extPeer := range extPeers {
 		pubkey, err := wgtypes.ParseKey(extPeer.PublicKey)
@@ -209,14 +225,24 @@ func getExtPeers(node *models.Node) ([]wgtypes.PeerConfig, error) {
 				allowedips = append(allowedips, addr6)
 			}
 		}
+
+		primaryAddr := extPeer.Address
+		if primaryAddr == "" {
+			primaryAddr = extPeer.Address6
+		}
+
 		peer = wgtypes.PeerConfig{
 			PublicKey:         pubkey,
 			ReplaceAllowedIPs: true,
 			AllowedIPs:        allowedips,
 		}
 		peers = append(peers, peer)
+		idsAndAddr = append(idsAndAddr, models.IDandAddr{
+			ID:      peer.PublicKey.String(),
+			Address: primaryAddr,
+		})
 	}
-	return peers, nil
+	return peers, idsAndAddr, nil
 
 }
 
@@ -282,7 +308,7 @@ func GetAllowedIPs(node, peer *models.Node) []net.IPNet {
 
 	// handle ingress gateway peers
 	if peer.IsIngressGateway == "yes" {
-		extPeers, err := getExtPeers(peer)
+		extPeers, _, err := getExtPeers(peer)
 		if err != nil {
 			logger.Log(2, "could not retrieve ext peers for ", peer.Name, err.Error())
 		}
@@ -334,7 +360,7 @@ func GetAllowedIPs(node, peer *models.Node) []net.IPNet {
 				allowedips = append(allowedips, extAllowedIPs...)
 			}
 			if relayedNode.IsIngressGateway == "yes" {
-				extPeers, err := getExtPeers(relayedNode)
+				extPeers, _, err := getExtPeers(relayedNode)
 				if err == nil {
 					for _, extPeer := range extPeers {
 						allowedips = append(allowedips, extPeer.AllowedIPs...)
@@ -487,7 +513,7 @@ func GetPeerUpdateForRelayedNode(node *models.Node, udppeers map[string]string)
 	}
 	//if ingress add extclients
 	if node.IsIngressGateway == "yes" {
-		extPeers, err := getExtPeers(node)
+		extPeers, _, err := getExtPeers(node)
 		if err == nil {
 			peers = append(peers, extPeers...)
 		} else {

logic/pro/netcache/netcache.go

@@ -0,0 +1,57 @@
+package netcache
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/gravitl/netmaker/database"
+)
+
+const (
+	expirationTime = time.Minute * 5
+)
+
+// CValue - the cache object for a network
+type CValue struct {
+	Network    string    `json:"network"`
+	Value      string    `json:"value"`
+	Pass       string    `json:"pass"`
+	User       string    `json:"user"`
+	Expiration time.Time `json:"expiration"`
+}
+
+var errExpired = fmt.Errorf("expired")
+
+// Set - sets a value to a key in db
+func Set(k string, newValue *CValue) error {
+	newValue.Expiration = time.Now().Add(expirationTime)
+	newData, err := json.Marshal(newValue)
+	if err != nil {
+		return err
+	}
+
+	return database.Insert(k, string(newData), database.CACHE_TABLE_NAME)
+}
+
+// Get - gets a value from db, if expired, return err
+func Get(k string) (*CValue, error) {
+	record, err := database.FetchRecord(database.CACHE_TABLE_NAME, k)
+	if err != nil {
+		return nil, err
+	}
+	var entry CValue
+	if err := json.Unmarshal([]byte(record), &entry); err != nil {
+		return nil, err
+	}
+	if time.Now().After(entry.Expiration) {
+		return nil, errExpired
+	}
+
+	return &entry, nil
+}
+
+// Del - deletes a value from db
+func Del(k string) error {
+	return database.DeleteRecord(database.CACHE_TABLE_NAME, k)
+}

logic/pro/networks.go

@@ -0,0 +1,68 @@
+package pro
+
+import (
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+)
+
+// AddProNetDefaults - adds default values to a network model
+func AddProNetDefaults(network *models.Network) {
+	if network.ProSettings == nil {
+		newProSettings := promodels.ProNetwork{
+			DefaultAccessLevel:     NO_ACCESS,
+			DefaultUserNodeLimit:   0,
+			DefaultUserClientLimit: 0,
+			AllowedUsers:           []string{},
+			AllowedGroups:          []string{DEFAULT_ALLOWED_GROUPS},
+		}
+		network.ProSettings = &newProSettings
+	}
+	if network.ProSettings.AllowedUsers == nil {
+		network.ProSettings.AllowedUsers = []string{}
+	}
+	if network.ProSettings.AllowedGroups == nil {
+		network.ProSettings.AllowedGroups = []string{DEFAULT_ALLOWED_GROUPS}
+	}
+}
+
+// isUserGroupAllowed - checks if a user group is allowed on a network
+func isUserGroupAllowed(network *models.Network, groupName string) bool {
+	if network.ProSettings != nil {
+		if len(network.ProSettings.AllowedGroups) > 0 {
+			for i := range network.ProSettings.AllowedGroups {
+				currentGroup := network.ProSettings.AllowedGroups[i]
+				if currentGroup == DEFAULT_ALLOWED_GROUPS || currentGroup == groupName {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+func isUserInAllowedUsers(network *models.Network, userName string) bool {
+	if network.ProSettings != nil {
+		if len(network.ProSettings.AllowedUsers) > 0 {
+			for i := range network.ProSettings.AllowedUsers {
+				currentUser := network.ProSettings.AllowedUsers[i]
+				if currentUser == DEFAULT_ALLOWED_USERS || currentUser == userName {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+// IsUserAllowed - checks if given username + groups if a user is allowed on network
+func IsUserAllowed(network *models.Network, userName string, groups []string) bool {
+	isGroupAllowed := false
+	for _, g := range groups {
+		if isUserGroupAllowed(network, g) {
+			isGroupAllowed = true
+			break
+		}
+	}
+
+	return isUserInAllowedUsers(network, userName) || isGroupAllowed
+}

logic/pro/networks_test.go

@@ -0,0 +1,64 @@
+package pro
+
+import (
+	"testing"
+
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNetworkProSettings(t *testing.T) {
+	t.Run("Uninitialized with pro", func(t *testing.T) {
+		network := models.Network{
+			NetID: "helloworld",
+		}
+		assert.Nil(t, network.ProSettings)
+	})
+	t.Run("Initialized with pro", func(t *testing.T) {
+		network := models.Network{
+			NetID: "helloworld",
+		}
+		AddProNetDefaults(&network)
+		assert.NotNil(t, network.ProSettings)
+	})
+	t.Run("Net Zero Defaults set correctly with Pro", func(t *testing.T) {
+		network := models.Network{
+			NetID: "helloworld",
+		}
+		AddProNetDefaults(&network)
+		assert.NotNil(t, network.ProSettings)
+		assert.Equal(t, NO_ACCESS, network.ProSettings.DefaultAccessLevel)
+		assert.Equal(t, 0, network.ProSettings.DefaultUserClientLimit)
+		assert.Equal(t, 0, network.ProSettings.DefaultUserNodeLimit)
+	})
+	t.Run("Net Defaults set correctly with Pro", func(t *testing.T) {
+		network := models.Network{
+			NetID: "helloworld",
+			ProSettings: &promodels.ProNetwork{
+				DefaultAccessLevel:     NET_ADMIN,
+				DefaultUserNodeLimit:   10,
+				DefaultUserClientLimit: 25,
+			},
+		}
+		AddProNetDefaults(&network)
+		assert.NotNil(t, network.ProSettings)
+		assert.Equal(t, NET_ADMIN, network.ProSettings.DefaultAccessLevel)
+		assert.Equal(t, 25, network.ProSettings.DefaultUserClientLimit)
+		assert.Equal(t, 10, network.ProSettings.DefaultUserNodeLimit)
+	})
+	t.Run("Net Defaults set to allow all groups/users", func(t *testing.T) {
+		network := models.Network{
+			NetID: "helloworld",
+			ProSettings: &promodels.ProNetwork{
+				DefaultAccessLevel:     NET_ADMIN,
+				DefaultUserNodeLimit:   10,
+				DefaultUserClientLimit: 25,
+			},
+		}
+		AddProNetDefaults(&network)
+		assert.NotNil(t, network.ProSettings)
+		assert.Equal(t, len(network.ProSettings.AllowedGroups), 1)
+		assert.Equal(t, len(network.ProSettings.AllowedUsers), 0)
+	})
+}

logic/pro/networkuser.go

@@ -0,0 +1,252 @@
+package pro
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+)
+
+// InitializeNetworkUsers - intializes network users for a given network
+func InitializeNetworkUsers(network string) error {
+
+	_, err := database.FetchRecord(database.NETWORK_USER_TABLE_NAME, network)
+	if err != nil && database.IsEmptyRecord(err) {
+		newNetUserMap := make(promodels.NetworkUserMap)
+		netUserData, err := json.Marshal(newNetUserMap)
+		if err != nil {
+			return err
+		}
+
+		return database.Insert(network, string(netUserData), database.NETWORK_USER_TABLE_NAME)
+	}
+	return err
+}
+
+// GetNetworkUsers - gets the network users table
+func GetNetworkUsers(network string) (promodels.NetworkUserMap, error) {
+	currentUsers, err := database.FetchRecord(database.NETWORK_USER_TABLE_NAME, network)
+	if err != nil {
+		return nil, err
+	}
+	var userMap promodels.NetworkUserMap
+	if err = json.Unmarshal([]byte(currentUsers), &userMap); err != nil {
+		return nil, err
+	}
+	return userMap, nil
+}
+
+// CreateNetworkUser - adds a network user to db
+func CreateNetworkUser(network *models.Network, user *promodels.NetworkUser) error {
+
+	if DoesNetworkUserExist(network.NetID, user.ID) {
+		return nil
+	}
+
+	currentUsers, err := GetNetworkUsers(network.NetID)
+	if err != nil {
+		return err
+	}
+	user.SetDefaults()
+	currentUsers.Add(user)
+	data, err := json.Marshal(currentUsers)
+	if err != nil {
+		return err
+	}
+
+	return database.Insert(network.NetID, string(data), database.NETWORK_USER_TABLE_NAME)
+}
+
+// DeleteNetworkUser - deletes a network user and removes from all networks
+func DeleteNetworkUser(network, userid string) error {
+	currentUsers, err := GetNetworkUsers(network)
+	if err != nil {
+		return err
+	}
+
+	currentUsers.Delete(promodels.NetworkUserID(userid))
+	data, err := json.Marshal(currentUsers)
+	if err != nil {
+		return err
+	}
+
+	return database.Insert(network, string(data), database.NETWORK_USER_TABLE_NAME)
+}
+
+// DissociateNetworkUserNode - removes a node from a given user's node list
+func DissociateNetworkUserNode(userid, networkid, nodeid string) error {
+	nuser, err := GetNetworkUser(networkid, promodels.NetworkUserID(userid))
+	if err != nil {
+		return err
+	}
+	for i, n := range nuser.Nodes {
+		if n == nodeid {
+			nuser.Nodes = removeStringIndex(nuser.Nodes, i)
+			break
+		}
+	}
+	return UpdateNetworkUser(networkid, nuser)
+}
+
+// DissociateNetworkUserClient - removes a client from a given user's client list
+func DissociateNetworkUserClient(userid, networkid, clientid string) error {
+	nuser, err := GetNetworkUser(networkid, promodels.NetworkUserID(userid))
+	if err != nil {
+		return err
+	}
+	for i, n := range nuser.Clients {
+		if n == clientid {
+			nuser.Clients = removeStringIndex(nuser.Clients, i)
+			break
+		}
+	}
+	return UpdateNetworkUser(networkid, nuser)
+}
+
+// AssociateNetworkUserClient - removes a client from a given user's client list
+func AssociateNetworkUserClient(userid, networkid, clientid string) error {
+	nuser, err := GetNetworkUser(networkid, promodels.NetworkUserID(userid))
+	if err != nil {
+		return err
+	}
+	var found bool
+	for _, n := range nuser.Clients {
+		if n == clientid {
+			found = true
+			break
+		}
+	}
+	if found {
+		return nil
+	} else {
+		nuser.Clients = append(nuser.Clients, clientid)
+	}
+
+	return UpdateNetworkUser(networkid, nuser)
+}
+
+func removeStringIndex(s []string, index int) []string {
+	ret := make([]string, 0)
+	ret = append(ret, s[:index]...)
+	return append(ret, s[index+1:]...)
+}
+
+// GetNetworkUser - fetches a network user from a given network
+func GetNetworkUser(network string, userID promodels.NetworkUserID) (*promodels.NetworkUser, error) {
+	currentUsers, err := GetNetworkUsers(network)
+	if err != nil {
+		return nil, err
+	}
+	if currentUsers[userID].ID == "" {
+		return nil, fmt.Errorf("user %s does not exist", userID)
+	}
+	currentNetUser := currentUsers[userID]
+	return &currentNetUser, nil
+}
+
+// DoesNetworkUserExist - check if networkuser exists
+func DoesNetworkUserExist(network string, userID promodels.NetworkUserID) bool {
+	_, err := GetNetworkUser(network, userID)
+	return err == nil
+}
+
+// UpdateNetworkUser - gets a network user from given network
+func UpdateNetworkUser(network string, newUser *promodels.NetworkUser) error {
+	currentUsers, err := GetNetworkUsers(network)
+	if err != nil {
+		return err
+	}
+
+	currentUsers[newUser.ID] = *newUser
+	newUsersData, err := json.Marshal(&currentUsers)
+	if err != nil {
+		return err
+	}
+
+	return database.Insert(network, string(newUsersData), database.NETWORK_USER_TABLE_NAME)
+}
+
+// RemoveAllNetworkUsers - removes all network users from given network
+func RemoveAllNetworkUsers(network string) error {
+	return database.DeleteRecord(database.NETWORK_USER_TABLE_NAME, network)
+}
+
+// IsUserNodeAllowed - given a list of nodes, determine if the user's node is allowed based on ID
+// Checks if node is in given nodes list as well as being in user's list
+func IsUserNodeAllowed(nodes []models.Node, network, userID, nodeID string) bool {
+
+	netUser, err := GetNetworkUser(network, promodels.NetworkUserID(userID))
+	if err != nil {
+		return false
+	}
+
+	for i := range nodes {
+		if nodes[i].ID == nodeID {
+			for j := range netUser.Nodes {
+				if netUser.Nodes[j] == nodeID {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+// IsUserClientAllowed - given a list of clients, determine if the user's client is allowed based on ID
+// Checks if client is in given ext client list as well as being in user's list
+func IsUserClientAllowed(clients []models.ExtClient, network, userID, clientID string) bool {
+
+	netUser, err := GetNetworkUser(network, promodels.NetworkUserID(userID))
+	if err != nil {
+		return false
+	}
+
+	for i := range clients {
+		if clients[i].ClientID == clientID {
+			for j := range netUser.Clients {
+				if netUser.Clients[j] == clientID {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+// IsUserNetAdmin - checks if a user is a net admin or not
+func IsUserNetAdmin(network, userID string) bool {
+	var isAdmin bool
+	user, err := GetNetworkUser(network, promodels.NetworkUserID(userID))
+	if err != nil {
+		return isAdmin
+	}
+	return user.AccessLevel == NET_ADMIN
+}
+
+// MakeNetAdmin - makes a given user a network admin on given network
+func MakeNetAdmin(network, userID string) (ok bool) {
+	user, err := GetNetworkUser(network, promodels.NetworkUserID(userID))
+	if err != nil {
+		return ok
+	}
+	user.AccessLevel = NET_ADMIN
+	if err = UpdateNetworkUser(network, user); err != nil {
+		return ok
+	}
+	return true
+}
+
+// AssignAccessLvl - gives a user a specified access level
+func AssignAccessLvl(network, userID string, accesslvl int) (ok bool) {
+	user, err := GetNetworkUser(network, promodels.NetworkUserID(userID))
+	if err != nil {
+		return ok
+	}
+	user.AccessLevel = accesslvl
+	if err = UpdateNetworkUser(network, user); err != nil {
+		return ok
+	}
+	return true
+}

logic/pro/networkuser_test.go

@@ -0,0 +1,98 @@
+package pro
+
+import (
+	"testing"
+
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNetworkUserLogic(t *testing.T) {
+	database.InitializeDatabase()
+	networkUser := promodels.NetworkUser{
+		ID: "helloworld",
+	}
+	network := models.Network{
+		NetID:        "skynet",
+		AddressRange: "192.168.0.0/24",
+	}
+	nodes := []models.Node{
+		models.Node{ID: "coolnode"},
+	}
+
+	clients := []models.ExtClient{
+		models.ExtClient{
+			ClientID: "coolclient",
+		},
+	}
+	AddProNetDefaults(&network)
+	t.Run("Net Users initialized successfully", func(t *testing.T) {
+		err := InitializeNetworkUsers(network.NetID)
+		assert.Nil(t, err)
+	})
+
+	t.Run("Error when no network users", func(t *testing.T) {
+		user, err := GetNetworkUser(network.NetID, networkUser.ID)
+		assert.Nil(t, user)
+		assert.NotNil(t, err)
+	})
+
+	t.Run("Successful net user create", func(t *testing.T) {
+		DeleteNetworkUser(network.NetID, string(networkUser.ID))
+		err := CreateNetworkUser(&network, &networkUser)
+		assert.Nil(t, err)
+		user, err := GetNetworkUser(network.NetID, networkUser.ID)
+		assert.NotNil(t, user)
+		assert.Nil(t, err)
+		assert.Equal(t, 0, user.AccessLevel)
+		assert.Equal(t, 0, user.ClientLimit)
+	})
+
+	t.Run("Successful net user update", func(t *testing.T) {
+		networkUser.AccessLevel = 0
+		networkUser.ClientLimit = 1
+		err := UpdateNetworkUser(network.NetID, &networkUser)
+		assert.Nil(t, err)
+		user, err := GetNetworkUser(network.NetID, networkUser.ID)
+		assert.NotNil(t, user)
+		assert.Nil(t, err)
+		assert.Equal(t, 0, user.AccessLevel)
+		assert.Equal(t, 1, user.ClientLimit)
+	})
+
+	t.Run("Successful net user node isallowed", func(t *testing.T) {
+		networkUser.Nodes = append(networkUser.Nodes, "coolnode")
+		err := UpdateNetworkUser(network.NetID, &networkUser)
+		assert.Nil(t, err)
+		isUserNodeAllowed := IsUserNodeAllowed(nodes[:], network.NetID, string(networkUser.ID), "coolnode")
+		assert.True(t, isUserNodeAllowed)
+	})
+
+	t.Run("Successful net user node not allowed", func(t *testing.T) {
+		isUserNodeAllowed := IsUserNodeAllowed(nodes[:], network.NetID, string(networkUser.ID), "notanode")
+		assert.False(t, isUserNodeAllowed)
+	})
+
+	t.Run("Successful net user client isallowed", func(t *testing.T) {
+		networkUser.Clients = append(networkUser.Clients, "coolclient")
+		err := UpdateNetworkUser(network.NetID, &networkUser)
+		assert.Nil(t, err)
+		isUserClientAllowed := IsUserClientAllowed(clients[:], network.NetID, string(networkUser.ID), "coolclient")
+		assert.True(t, isUserClientAllowed)
+	})
+
+	t.Run("Successful net user client not allowed", func(t *testing.T) {
+		isUserClientAllowed := IsUserClientAllowed(clients[:], network.NetID, string(networkUser.ID), "notaclient")
+		assert.False(t, isUserClientAllowed)
+	})
+
+	t.Run("Successful net user delete", func(t *testing.T) {
+		err := DeleteNetworkUser(network.NetID, string(networkUser.ID))
+		assert.Nil(t, err)
+		user, err := GetNetworkUser(network.NetID, networkUser.ID)
+		assert.Nil(t, user)
+		assert.NotNil(t, err)
+	})
+}

logic/pro/proacls/nodes.go

@@ -0,0 +1,35 @@
+package proacls
+
+import (
+	"github.com/gravitl/netmaker/logic/acls"
+	"github.com/gravitl/netmaker/logic/acls/nodeacls"
+	"github.com/gravitl/netmaker/models"
+)
+
+// AdjustNodeAcls - adjusts ACLs based on a node's default value
+func AdjustNodeAcls(node *models.Node, networkNodes []models.Node) error {
+	networkID := nodeacls.NetworkID(node.Network)
+	nodeID := nodeacls.NodeID(node.ID)
+	currentACLs, err := nodeacls.FetchAllACLs(networkID)
+	if err != nil {
+		return err
+	}
+
+	for i := range networkNodes {
+		currentNodeID := nodeacls.NodeID(networkNodes[i].ID)
+		if currentNodeID == nodeID {
+			continue
+		}
+		// 2 cases
+		// both allow - allow
+		// either 1 denies - deny
+		if node.DoesACLDeny() || networkNodes[i].DoesACLDeny() {
+			currentACLs.ChangeAccess(acls.AclID(nodeID), acls.AclID(currentNodeID), acls.NotAllowed)
+		} else if node.DoesACLAllow() || networkNodes[i].DoesACLAllow() {
+			currentACLs.ChangeAccess(acls.AclID(nodeID), acls.AclID(currentNodeID), acls.Allowed)
+		}
+	}
+
+	_, err = currentACLs.Save(acls.ContainerID(node.Network))
+	return err
+}

logic/pro/types.go

@@ -0,0 +1,20 @@
+package pro
+
+const (
+	// == NET ACCESS END == indicates access for system admin (control of netmaker)
+	// NET_ADMIN - indicates access for network admin (control of network)
+	NET_ADMIN = 0
+	// NODE_ACCESS - indicates access for
+	NODE_ACCESS = 1
+	// CLIENT_ACCESS - indicates access for network user (limited to nodes + ext clients)
+	CLIENT_ACCESS = 2
+	// NO_ACCESS - indicates user has no access to network
+	NO_ACCESS = 3
+	// == NET ACCESS END ==
+	// DEFAULT_ALLOWED_GROUPS - default user group for all networks
+	DEFAULT_ALLOWED_GROUPS = "*"
+	// DEFAULT_ALLOWED_USERS - default allowed users for a network
+	DEFAULT_ALLOWED_USERS = "*"
+	// DB_GROUPS_KEY - represents db groups
+	DB_GROUPS_KEY = "netmaker-groups"
+)

logic/pro/usergroups.go

@@ -0,0 +1,80 @@
+package pro
+
+import (
+	"encoding/json"
+
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/models/promodels"
+)
+
+// InitializeGroups - initialize groups data structure if not present in the DB
+func InitializeGroups() error {
+	if !DoesUserGroupExist(DEFAULT_ALLOWED_GROUPS) {
+		return InsertUserGroup(DEFAULT_ALLOWED_GROUPS)
+	}
+	return nil
+}
+
+// InsertUserGroup - inserts a group into the
+func InsertUserGroup(groupName promodels.UserGroupName) error {
+	currentGroups, err := GetUserGroups()
+	if err != nil {
+		return err
+	}
+	currentGroups[groupName] = promodels.Void{}
+	newData, err := json.Marshal(&currentGroups)
+	if err != nil {
+		return err
+	}
+	return database.Insert(DB_GROUPS_KEY, string(newData), database.USER_GROUPS_TABLE_NAME)
+}
+
+// DeleteUserGroup - deletes a group from database
+func DeleteUserGroup(groupName promodels.UserGroupName) error {
+	var newGroups promodels.UserGroups
+	currentGroupRecords, err := database.FetchRecord(database.USER_GROUPS_TABLE_NAME, DB_GROUPS_KEY)
+	if err != nil && !database.IsEmptyRecord(err) {
+		return err
+	}
+	if err = json.Unmarshal([]byte(currentGroupRecords), &newGroups); err != nil {
+		return err
+	}
+	delete(newGroups, groupName)
+	newData, err := json.Marshal(&newGroups)
+	if err != nil {
+		return err
+	}
+	return database.Insert(DB_GROUPS_KEY, string(newData), database.USER_GROUPS_TABLE_NAME)
+}
+
+// GetUserGroups - get groups of users
+func GetUserGroups() (promodels.UserGroups, error) {
+	var returnGroups promodels.UserGroups
+	groupsRecord, err := database.FetchRecord(database.USER_GROUPS_TABLE_NAME, DB_GROUPS_KEY)
+	if err != nil {
+		if database.IsEmptyRecord(err) {
+			return make(promodels.UserGroups, 1), nil
+		}
+		return returnGroups, err
+	}
+
+	if err = json.Unmarshal([]byte(groupsRecord), &returnGroups); err != nil {
+		return returnGroups, err
+	}
+
+	return returnGroups, nil
+}
+
+// DoesUserGroupExist - checks if a user group exists
+func DoesUserGroupExist(group promodels.UserGroupName) bool {
+	currentGroups, err := GetUserGroups()
+	if err != nil {
+		return true
+	}
+	for k := range currentGroups {
+		if k == group {
+			return true
+		}
+	}
+	return false
+}

logic/pro/usergroups_test.go

@@ -0,0 +1,43 @@
+package pro
+
+import (
+	"testing"
+
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/models/promodels"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestUserGroupLogic(t *testing.T) {
+	database.InitializeDatabase()
+
+	t.Run("User Groups initialized successfully", func(t *testing.T) {
+		err := InitializeGroups()
+		assert.Nil(t, err)
+	})
+
+	t.Run("Check for default group", func(t *testing.T) {
+		groups, err := GetUserGroups()
+		assert.Nil(t, err)
+		var hasdefault bool
+		for k := range groups {
+			if string(k) == DEFAULT_ALLOWED_GROUPS {
+				hasdefault = true
+			}
+		}
+		assert.True(t, hasdefault)
+	})
+
+	t.Run("User Groups created successfully", func(t *testing.T) {
+		err := InsertUserGroup(promodels.UserGroupName("group1"))
+		assert.Nil(t, err)
+		err = InsertUserGroup(promodels.UserGroupName("group2"))
+		assert.Nil(t, err)
+	})
+
+	t.Run("User Groups deleted successfully", func(t *testing.T) {
+		err := DeleteUserGroup(promodels.UserGroupName("group1"))
+		assert.Nil(t, err)
+		assert.False(t, DoesUserGroupExist(promodels.UserGroupName("group1")))
+	})
+}

logic/security.go

@@ -0,0 +1,206 @@
+package logic
+
+import (
+	"encoding/json"
+	"net/http"
+	"strings"
+
+	"github.com/gorilla/mux"
+	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/logic/pro"
+	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
+	"github.com/gravitl/netmaker/servercfg"
+)
+
+const (
+	// ALL_NETWORK_ACCESS - represents all networks
+	ALL_NETWORK_ACCESS = "THIS_USER_HAS_ALL"
+
+	master_uname     = "masteradministrator"
+	Unauthorized_Msg = "unauthorized"
+	Unauthorized_Err = models.Error(Unauthorized_Msg)
+)
+
+// SecurityCheck - Check if user has appropriate permissions
+func SecurityCheck(reqAdmin bool, next http.Handler) http.HandlerFunc {
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		var errorResponse = models.ErrorResponse{
+			Code: http.StatusUnauthorized, Message: Unauthorized_Msg,
+		}
+
+		var params = mux.Vars(r)
+		bearerToken := r.Header.Get("Authorization")
+		// to have a custom DNS service adding entries
+		// we should refactor this, but is for the special case of an external service to query the DNS api
+		if strings.Contains(r.RequestURI, "/dns") && strings.ToUpper(r.Method) == "GET" && authenticateDNSToken(bearerToken) {
+			// do dns stuff
+			r.Header.Set("user", "nameserver")
+			networks, _ := json.Marshal([]string{ALL_NETWORK_ACCESS})
+			r.Header.Set("networks", string(networks))
+			next.ServeHTTP(w, r)
+			return
+		}
+		var networkName = params["networkname"]
+		if len(networkName) == 0 {
+			networkName = params["network"]
+		}
+		networks, username, err := UserPermissions(reqAdmin, networkName, bearerToken)
+		if err != nil {
+			ReturnErrorResponse(w, r, errorResponse)
+			return
+		}
+		networksJson, err := json.Marshal(&networks)
+		if err != nil {
+			ReturnErrorResponse(w, r, errorResponse)
+			return
+		}
+		r.Header.Set("user", username)
+		r.Header.Set("networks", string(networksJson))
+		next.ServeHTTP(w, r)
+	}
+}
+
+// NetUserSecurityCheck - Check if network user has appropriate permissions
+func NetUserSecurityCheck(isNodes, isClients bool, next http.Handler) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var errorResponse = models.ErrorResponse{
+			Code: http.StatusUnauthorized, Message: "unauthorized",
+		}
+		r.Header.Set("ismaster", "no")
+
+		var params = mux.Vars(r)
+		var netUserName = params["networkuser"]
+		var network = params["network"]
+
+		bearerToken := r.Header.Get("Authorization")
+
+		var tokenSplit = strings.Split(bearerToken, " ")
+		var authToken = ""
+
+		if len(tokenSplit) < 2 {
+			ReturnErrorResponse(w, r, errorResponse)
+			return
+		} else {
+			authToken = tokenSplit[1]
+		}
+
+		isMasterAuthenticated := authenticateMaster(authToken)
+		if isMasterAuthenticated {
+			r.Header.Set("user", "master token user")
+			r.Header.Set("ismaster", "yes")
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		userName, _, isadmin, err := VerifyUserToken(authToken)
+		if err != nil {
+			ReturnErrorResponse(w, r, errorResponse)
+			return
+		}
+		r.Header.Set("user", userName)
+
+		if isadmin {
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		if isNodes || isClients {
+			necessaryAccess := pro.NET_ADMIN
+			if isClients {
+				necessaryAccess = pro.CLIENT_ACCESS
+			}
+			if isNodes {
+				necessaryAccess = pro.NODE_ACCESS
+			}
+			u, err := pro.GetNetworkUser(network, promodels.NetworkUserID(userName))
+			if err != nil {
+				ReturnErrorResponse(w, r, errorResponse)
+				return
+			}
+			if u.AccessLevel > necessaryAccess {
+				ReturnErrorResponse(w, r, errorResponse)
+				return
+			}
+		} else if netUserName != userName {
+			ReturnErrorResponse(w, r, errorResponse)
+			return
+		}
+
+		next.ServeHTTP(w, r)
+	}
+}
+
+// UserPermissions - checks token stuff
+func UserPermissions(reqAdmin bool, netname string, token string) ([]string, string, error) {
+	var tokenSplit = strings.Split(token, " ")
+	var authToken = ""
+	userNetworks := []string{}
+
+	if len(tokenSplit) < 2 {
+		return userNetworks, "", Unauthorized_Err
+	} else {
+		authToken = tokenSplit[1]
+	}
+	//all endpoints here require master so not as complicated
+	if authenticateMaster(authToken) {
+		return []string{ALL_NETWORK_ACCESS}, master_uname, nil
+	}
+	username, networks, isadmin, err := VerifyUserToken(authToken)
+	if err != nil {
+		return nil, username, Unauthorized_Err
+	}
+	if !isadmin && reqAdmin {
+		return nil, username, Unauthorized_Err
+	}
+	userNetworks = networks
+	if isadmin {
+		return []string{ALL_NETWORK_ACCESS}, username, nil
+	}
+	// check network admin access
+	if len(netname) > 0 && (!authenticateNetworkUser(netname, userNetworks) || len(userNetworks) == 0) {
+		return nil, username, Unauthorized_Err
+	}
+	if !pro.IsUserNetAdmin(netname, username) {
+		return nil, "", Unauthorized_Err
+	}
+	return userNetworks, username, nil
+}
+
+// Consider a more secure way of setting master key
+func authenticateMaster(tokenString string) bool {
+	return tokenString == servercfg.GetMasterKey() && servercfg.GetMasterKey() != ""
+}
+
+func authenticateNetworkUser(network string, userNetworks []string) bool {
+	networkexists, err := NetworkExists(network)
+	if (err != nil && !database.IsEmptyRecord(err)) || !networkexists {
+		return false
+	}
+	return StringSliceContains(userNetworks, network)
+}
+
+//Consider a more secure way of setting master key
+func authenticateDNSToken(tokenString string) bool {
+	tokens := strings.Split(tokenString, " ")
+	if len(tokens) < 2 {
+		return false
+	}
+	return tokens[1] == servercfg.GetDNSKey()
+}
+
+func ContinueIfUserMatch(next http.Handler) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var errorResponse = models.ErrorResponse{
+			Code: http.StatusUnauthorized, Message: Unauthorized_Msg,
+		}
+		var params = mux.Vars(r)
+		var requestedUser = params["username"]
+		if requestedUser != r.Header.Get("user") {
+			ReturnErrorResponse(w, r, errorResponse)
+			return
+		}
+		next.ServeHTTP(w, r)
+	}
+}

logic/server.go

@@ -18,6 +18,8 @@ import (
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
+var EnterpriseCheckFuncs []interface{}
+
 // == Join, Checkin, and Leave for Server ==
 
 // KUBERNETES_LISTEN_PORT - starting port for Kubernetes in order to use NodePort range
@@ -164,6 +166,13 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
 	return *node, nil
 }
 
+// EnterpriseCheck - Runs enterprise functions if presented
+func EnterpriseCheck() {
+	for _, check := range EnterpriseCheckFuncs {
+		check.(func())()
+	}
+}
+
 // ServerUpdate - updates the server
 // replaces legacy Checkin code
 func ServerUpdate(serverNode *models.Node, ifaceDelta bool) error {

logic/serverconf.go

@@ -6,6 +6,21 @@ import (
 	"github.com/gravitl/netmaker/database"
 )
 
+var (
+	// Node_Limit - dummy var for community
+	Node_Limit = 1000000000
+	// Networks_Limit - dummy var for community
+	Networks_Limit = 1000000000
+	// Users_Limit - dummy var for community
+	Users_Limit = 1000000000
+	// Clients_Limit - dummy var for community
+	Clients_Limit = 1000000000
+	// Free_Tier - specifies if free tier
+	Free_Tier = false
+	// Is_EE - specifies if enterprise
+	Is_EE = false
+)
+
 // constant for database key for storing server ids
 const server_id_key = "nm-server-id"
 

logic/users.go

@@ -4,7 +4,10 @@ import (
 	"encoding/json"
 
 	"github.com/gravitl/netmaker/database"
+	"github.com/gravitl/netmaker/logger"
+	"github.com/gravitl/netmaker/logic/pro"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/models/promodels"
 )
 
 // GetUser - gets a user
@@ -20,3 +23,57 @@ func GetUser(username string) (models.User, error) {
 	}
 	return user, err
 }
+
+// GetGroupUsers - gets users in a group
+func GetGroupUsers(group string) ([]models.ReturnUser, error) {
+	var returnUsers []models.ReturnUser
+	users, err := GetUsers()
+	if err != nil {
+		return returnUsers, err
+	}
+	for _, user := range users {
+		if StringSliceContains(user.Groups, group) {
+			users = append(users, user)
+		}
+	}
+	return users, err
+}
+
+// == PRO ==
+
+// InitializeNetUsers - intializes network users for all users/networks
+func InitializeNetUsers(network *models.Network) error {
+	// == add all current users to network as network users ==
+	currentUsers, err := GetUsers()
+	if err != nil {
+		return err
+	}
+
+	for i := range currentUsers { // add all users to given network
+		newUser := promodels.NetworkUser{
+			ID:          promodels.NetworkUserID(currentUsers[i].UserName),
+			Clients:     []string{},
+			Nodes:       []string{},
+			AccessLevel: pro.NO_ACCESS,
+			ClientLimit: 0,
+			NodeLimit:   0,
+		}
+		if pro.IsUserAllowed(network, currentUsers[i].UserName, currentUsers[i].Groups) {
+			newUser.AccessLevel = network.ProSettings.DefaultAccessLevel
+			newUser.ClientLimit = network.ProSettings.DefaultUserClientLimit
+			newUser.NodeLimit = network.ProSettings.DefaultUserNodeLimit
+		}
+
+		if err = pro.CreateNetworkUser(network, &newUser); err != nil {
+			logger.Log(0, "failed to add network user settings to user", string(newUser.ID), "on network", network.NetID)
+		}
+	}
+	return nil
+}
+
+// SetUserDefaults - sets the defaults of a user to avoid empty fields
+func SetUserDefaults(user *models.User) {
+	if user.Groups == nil {
+		user.Groups = []string{pro.DEFAULT_ALLOWED_GROUPS}
+	}
+}

logic/util.go

@@ -203,3 +203,18 @@ func getNetworkProtocols(cidrs []string) (bool, bool) {
 	}
 	return ipv4, ipv6
 }
+
+// StringDifference - returns the elements in `a` that aren't in `b`.
+func StringDifference(a, b []string) []string {
+	mb := make(map[string]struct{}, len(b))
+	for _, x := range b {
+		mb[x] = struct{}{}
+	}
+	var diff []string
+	for _, x := range a {
+		if _, found := mb[x]; !found {
+			diff = append(diff, x)
+		}
+	}
+	return diff
+}

main.go

@@ -1,3 +1,4 @@
+// -build ee
 package main
 
 import (
@@ -22,6 +23,7 @@ import (
 	"github.com/gravitl/netmaker/functions"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/pro"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/mq"
 	"github.com/gravitl/netmaker/netclient/ncutils"
@@ -36,11 +38,11 @@ var version = "dev"
 func main() {
 	absoluteConfigPath := flag.String("c", "", "absolute path to configuration file")
 	flag.Parse()
-
 	setupConfig(*absoluteConfigPath)
 	servercfg.SetVersion(version)
 	fmt.Println(models.RetrieveLogo()) // print the logo
-	initialize()                       // initial db and acls; gen cert if required
+	// fmt.Println(models.ProLogo())
+	initialize() // initial db and acls; gen cert if required
 	setGarbageCollection()
 	setVerbosity()
 	defer database.CloseDB()
@@ -73,14 +75,23 @@ func initialize() { // Client Mode Prereq Check
 		logger.FatalLog("Error connecting to database")
 	}
 	logger.Log(0, "database successfully connected")
-	logic.SetJWTSecret()
 	if err = logic.AddServerIDIfNotPresent(); err != nil {
 		logger.Log(1, "failed to save server ID")
 	}
+
+	logic.SetJWTSecret()
+
+	if err = pro.InitializeGroups(); err != nil {
+		logger.Log(0, "could not initialize default user group, \"*\"")
+	}
+
 	err = logic.TimerCheckpoint()
 	if err != nil {
 		logger.Log(1, "Timer error occurred: ", err.Error())
 	}
+
+	logic.EnterpriseCheck()
+
 	var authProvider = auth.InitializeAuthProvider()
 	if authProvider != "" {
 		logger.Log(0, "OAuth provider,", authProvider+",", "initialized")

main_ee.go

@@ -0,0 +1,12 @@
+//go:build ee
+// +build ee
+
+package main
+
+import (
+	"github.com/gravitl/netmaker/ee"
+)
+
+func init() {
+	ee.InitEE()
+}

models/accessToken.go

@@ -1,10 +1,12 @@
 package models
 
+// AccessToken - token used to access netmaker
 type AccessToken struct {
 	APIConnString string `json:"apiconnstring"`
 	ClientConfig
 }
 
+// ClientConfig - the config of the client
 type ClientConfig struct {
 	Network    string `json:"network"`
 	Key        string `json:"key"`

models/extclient.go

@@ -13,4 +13,5 @@ type ExtClient struct {
 	IngressGatewayEndpoint string `json:"ingressgatewayendpoint" bson:"ingressgatewayendpoint"`
 	LastModified           int64  `json:"lastmodified" bson:"lastmodified"`
 	Enabled                bool   `json:"enabled" bson:"enabled"`
+	OwnerID                string `json:"ownerid" bson:"ownerid"`
 }

models/metrics.go

@@ -0,0 +1,45 @@
+package models
+
+import "time"
+
+// Metrics - metrics struct
+type Metrics struct {
+	Network      string            `json:"network" bson:"network" yaml:"network"`
+	NodeID       string            `json:"node_id" bson:"node_id" yaml:"node_id"`
+	NodeName     string            `json:"node_name" bson:"node_name" yaml:"node_name"`
+	IsServer     string            `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
+	Connectivity map[string]Metric `json:"connectivity" bson:"connectivity" yaml:"connectivity"`
+}
+
+// Metric - holds a metric for data between nodes
+type Metric struct {
+	NodeName      string        `json:"node_name" bson:"node_name" yaml:"node_name"`
+	IsServer      string        `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
+	Uptime        int64         `json:"uptime" bson:"uptime" yaml:"uptime"`
+	TotalTime     int64         `json:"totaltime" bson:"totaltime" yaml:"totaltime"`
+	Latency       int64         `json:"latency" bson:"latency" yaml:"latency"`
+	TotalReceived int64         `json:"totalreceived" bson:"totalreceived" yaml:"totalreceived"`
+	TotalSent     int64         `json:"totalsent" bson:"totalsent" yaml:"totalsent"`
+	ActualUptime  time.Duration `json:"actualuptime" bson:"actualuptime" yaml:"actualuptime"`
+	PercentUp     float64       `json:"percentup" bson:"percentup" yaml:"percentup"`
+	Connected     bool          `json:"connected" bson:"connected" yaml:"connected"`
+}
+
+// IDandAddr - struct to hold ID and primary Address
+type IDandAddr struct {
+	ID       string `json:"id" bson:"id" yaml:"id"`
+	Address  string `json:"address" bson:"address" yaml:"address"`
+	Name     string `json:"name" bson:"name" yaml:"name"`
+	IsServer string `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
+}
+
+// PeerMap - peer map for ids and addresses in metrics
+type PeerMap map[string]IDandAddr
+
+// MetricsMap - map for holding multiple metrics in memory
+type MetricsMap map[string]Metrics
+
+// NetworkMetrics - metrics model for all nodes in a network
+type NetworkMetrics struct {
+	Nodes MetricsMap `json:"nodes" bson:"nodes" yaml:"nodes"`
+}

models/mqtt.go

@@ -9,6 +9,7 @@ type PeerUpdate struct {
 	ServerAddrs   []ServerAddr         `json:"serveraddrs" bson:"serveraddrs" yaml:"serveraddrs"`
 	Peers         []wgtypes.PeerConfig `json:"peers" bson:"peers" yaml:"peers"`
 	DNS           string               `json:"dns" bson:"dns" yaml:"dns"`
+	PeerIDs       PeerMap              `json:"peerids" bson:"peerids" yaml:"peerids"`
 }
 
 // KeyUpdate - key update struct

models/names.go

@@ -231,6 +231,8 @@ var SMALL_NAMES = []string{
 	"cold",
 }
 
+var logoString = retrieveLogo()
+
 // GenerateNodeName - generates a random node name
 func GenerateNodeName() string {
 	rand.Seed(time.Now().UnixNano())
@@ -239,6 +241,15 @@ func GenerateNodeName() string {
 
 // RetrieveLogo - retrieves the ascii art logo for Netmaker
 func RetrieveLogo() string {
+	return logoString
+}
+
+// SetLogo - sets the logo ascii art
+func SetLogo(logo string) {
+	logoString = logo
+}
+
+func retrieveLogo() string {
 	return `              
  __   __     ______     ______   __    __     ______     __  __     ______     ______    
 /\ "-.\ \   /\  ___\   /\__  _\ /\ "-./  \   /\  __ \   /\ \/ /    /\  ___\   /\  == \   

models/network.go

@@ -2,33 +2,36 @@ package models
 
 import (
 	"time"
+
+	"github.com/gravitl/netmaker/models/promodels"
 )
 
 // Network Struct - contains info for a given unique network
 //At  some point, need to replace all instances of Name with something else like  Identifier
 type Network struct {
-	AddressRange        string      `json:"addressrange" bson:"addressrange" validate:"omitempty,cidrv4"`
-	AddressRange6       string      `json:"addressrange6" bson:"addressrange6" validate:"omitempty,cidrv6"`
-	NetID               string      `json:"netid" bson:"netid" validate:"required,min=1,max=12,netid_valid"`
-	NodesLastModified   int64       `json:"nodeslastmodified" bson:"nodeslastmodified"`
-	NetworkLastModified int64       `json:"networklastmodified" bson:"networklastmodified"`
-	DefaultInterface    string      `json:"defaultinterface" bson:"defaultinterface" validate:"min=1,max=15"`
-	DefaultListenPort   int32       `json:"defaultlistenport,omitempty" bson:"defaultlistenport,omitempty" validate:"omitempty,min=1024,max=65535"`
-	NodeLimit           int32       `json:"nodelimit" bson:"nodelimit"`
-	DefaultPostUp       string      `json:"defaultpostup" bson:"defaultpostup"`
-	DefaultPostDown     string      `json:"defaultpostdown" bson:"defaultpostdown"`
-	DefaultKeepalive    int32       `json:"defaultkeepalive" bson:"defaultkeepalive" validate:"omitempty,max=1000"`
-	AccessKeys          []AccessKey `json:"accesskeys" bson:"accesskeys"`
-	AllowManualSignUp   string      `json:"allowmanualsignup" bson:"allowmanualsignup" validate:"checkyesorno"`
-	IsLocal             string      `json:"islocal" bson:"islocal" validate:"checkyesorno"`
-	IsIPv4              string      `json:"isipv4" bson:"isipv4" validate:"checkyesorno"`
-	IsIPv6              string      `json:"isipv6" bson:"isipv6" validate:"checkyesorno"`
-	IsPointToSite       string      `json:"ispointtosite" bson:"ispointtosite" validate:"checkyesorno"`
-	LocalRange          string      `json:"localrange" bson:"localrange" validate:"omitempty,cidr"`
-	DefaultUDPHolePunch string      `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"`
-	DefaultExtClientDNS string      `json:"defaultextclientdns" bson:"defaultextclientdns"`
-	DefaultMTU          int32       `json:"defaultmtu" bson:"defaultmtu"`
-	DefaultACL          string      `json:"defaultacl" bson:"defaultacl" yaml:"defaultacl" validate:"checkyesorno"`
+	AddressRange        string                `json:"addressrange" bson:"addressrange" validate:"omitempty,cidrv4"`
+	AddressRange6       string                `json:"addressrange6" bson:"addressrange6" validate:"omitempty,cidrv6"`
+	NetID               string                `json:"netid" bson:"netid" validate:"required,min=1,max=12,netid_valid"`
+	NodesLastModified   int64                 `json:"nodeslastmodified" bson:"nodeslastmodified"`
+	NetworkLastModified int64                 `json:"networklastmodified" bson:"networklastmodified"`
+	DefaultInterface    string                `json:"defaultinterface" bson:"defaultinterface" validate:"min=1,max=15"`
+	DefaultListenPort   int32                 `json:"defaultlistenport,omitempty" bson:"defaultlistenport,omitempty" validate:"omitempty,min=1024,max=65535"`
+	NodeLimit           int32                 `json:"nodelimit" bson:"nodelimit"`
+	DefaultPostUp       string                `json:"defaultpostup" bson:"defaultpostup"`
+	DefaultPostDown     string                `json:"defaultpostdown" bson:"defaultpostdown"`
+	DefaultKeepalive    int32                 `json:"defaultkeepalive" bson:"defaultkeepalive" validate:"omitempty,max=1000"`
+	AccessKeys          []AccessKey           `json:"accesskeys" bson:"accesskeys"`
+	AllowManualSignUp   string                `json:"allowmanualsignup" bson:"allowmanualsignup" validate:"checkyesorno"`
+	IsLocal             string                `json:"islocal" bson:"islocal" validate:"checkyesorno"`
+	IsIPv4              string                `json:"isipv4" bson:"isipv4" validate:"checkyesorno"`
+	IsIPv6              string                `json:"isipv6" bson:"isipv6" validate:"checkyesorno"`
+	IsPointToSite       string                `json:"ispointtosite" bson:"ispointtosite" validate:"checkyesorno"`
+	LocalRange          string                `json:"localrange" bson:"localrange" validate:"omitempty,cidr"`
+	DefaultUDPHolePunch string                `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"`
+	DefaultExtClientDNS string                `json:"defaultextclientdns" bson:"defaultextclientdns"`
+	DefaultMTU          int32                 `json:"defaultmtu" bson:"defaultmtu"`
+	DefaultACL          string                `json:"defaultacl" bson:"defaultacl" yaml:"defaultacl" validate:"checkyesorno"`
+	ProSettings         *promodels.ProNetwork `json:"prosettings,omitempty" bson:"prosettings,omitempty" yaml:"prosettings,omitempty"`
 }
 
 // SaveData - sensitive fields of a network that should be kept the same

models/node.go

@@ -101,6 +101,9 @@ type Node struct {
 	FirewallInUse   string      `json:"firewallinuse" bson:"firewallinuse" yaml:"firewallinuse"`
 	InternetGateway string      `json:"internetgateway" bson:"internetgateway" yaml:"internetgateway"`
 	Connected       string      `json:"connected" bson:"connected" yaml:"connected" validate:"checkyesorno"`
+	// == PRO ==
+	DefaultACL string `json:"defaultacl,omitempty" bson:"defaultacl,omitempty" yaml:"defaultacl,omitempty" validate:"checkyesornoorunset"`
+	OwnerID    string `json:"ownerid,omitempty" bson:"ownerid,omitempty" yaml:"ownerid,omitempty"`
 }
 
 // NodesArray - used for node sorting
@@ -139,6 +142,13 @@ func (node *Node) SetDefaultConnected() {
 	}
 }
 
+// Node.SetDefaultACL
+func (node *Node) SetDefaultACL() {
+	if node.DefaultACL == "" {
+		node.DefaultACL = "yes"
+	}
+}
+
 // Node.SetDefaultMTU - sets default MTU of a node
 func (node *Node) SetDefaultMTU() {
 	if node.MTU == 0 {
@@ -438,6 +448,10 @@ func (newNode *Node) Fill(currentNode *Node) { // TODO add new field for nftable
 	if newNode.Connected == "" {
 		newNode.Connected = currentNode.Connected
 	}
+	if newNode.DefaultACL == "" {
+		newNode.DefaultACL = currentNode.DefaultACL
+	}
+
 	newNode.TrafficKeys = currentNode.TrafficKeys
 }
 
@@ -469,3 +483,15 @@ func (node *Node) NameInNodeCharSet() bool {
 	}
 	return true
 }
+
+// == PRO ==
+
+// Node.DoesACLAllow - checks if default ACL on node is "yes"
+func (node *Node) DoesACLAllow() bool {
+	return node.DefaultACL == "yes"
+}
+
+// Node.DoesACLDeny - checks if default ACL on node is "no"
+func (node *Node) DoesACLDeny() bool {
+	return node.DefaultACL == "no"
+}

models/promodels/networkuser.go

@@ -0,0 +1,37 @@
+package promodels
+
+// NetworkUserID - ID field for a network user
+type NetworkUserID string
+
+// NetworkUser - holds fields for a network user
+type NetworkUser struct {
+	AccessLevel int           `json:"accesslevel" bson:"accesslevel" yaml:"accesslevel"`
+	ClientLimit int           `json:"clientlimit" bson:"clientlimit" yaml:"clientlimit"`
+	NodeLimit   int           `json:"nodelimit" bson:"nodelimit" yaml:"nodelimit"`
+	ID          NetworkUserID `json:"id" bson:"id" yaml:"id"`
+	Clients     []string      `json:"clients" bson:"clients" yaml:"clients"`
+	Nodes       []string      `json:"nodes" bson:"nodes" yaml:"nodes"`
+}
+
+// NetworkUserMap - map of network users
+type NetworkUserMap map[NetworkUserID]NetworkUser
+
+// NetworkUserMap.Delete - deletes a network user struct from a given map in memory
+func (N NetworkUserMap) Delete(ID NetworkUserID) {
+	delete(N, ID)
+}
+
+// NetworkUserMap.Add - adds a network user struct to given network user map in memory
+func (N NetworkUserMap) Add(User *NetworkUser) {
+	N[User.ID] = *User
+}
+
+// SetDefaults - adds the defaults to network user
+func (U *NetworkUser) SetDefaults() {
+	if U.Clients == nil {
+		U.Clients = []string{}
+	}
+	if U.Nodes == nil {
+		U.Nodes = []string{}
+	}
+}

models/promodels/pro.go

@@ -0,0 +1,19 @@
+package promodels
+
+// ProNetwork - struct for all pro Network related fields
+type ProNetwork struct {
+	DefaultAccessLevel     int      `json:"defaultaccesslevel" bson:"defaultaccesslevel" yaml:"defaultaccesslevel"`
+	DefaultUserNodeLimit   int      `json:"defaultusernodelimit" bson:"defaultusernodelimit" yaml:"defaultusernodelimit"`
+	DefaultUserClientLimit int      `json:"defaultuserclientlimit" bson:"defaultuserclientlimit" yaml:"defaultuserclientlimit"`
+	AllowedUsers           []string `json:"allowedusers" bson:"allowedusers" yaml:"allowedusers"`
+	AllowedGroups          []string `json:"allowedgroups" bson:"allowedgroups" yaml:"allowedgroups"`
+}
+
+// LoginMsg - login message struct for nodes to join via SSO login
+// Need to change mac to public key for tighter verification ?
+type LoginMsg struct {
+	Mac      string `json:"mac"`
+	Network  string `json:"network"`
+	User     string `json:"user,omitempty"`
+	Password string `json:"password,omitempty"`
+}

models/promodels/usergroups.go

@@ -0,0 +1,9 @@
+package promodels
+
+type Void struct{}
+
+// UserGroupName - string representing a group name
+type UserGroupName string
+
+// UserGroups - groups type, holds group names
+type UserGroups map[UserGroupName]Void

models/structs.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"strings"
+	"time"
 
 	jwt "github.com/golang-jwt/jwt/v4"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
@@ -28,6 +29,7 @@ type User struct {
 	Password string   `json:"password" bson:"password" validate:"required,min=5"`
 	Networks []string `json:"networks" bson:"networks"`
 	IsAdmin  bool     `json:"isadmin" bson:"isadmin"`
+	Groups   []string `json:"groups" bson:"groups" yaml:"groups"`
 }
 
 // ReturnUser - return user struct
@@ -35,6 +37,7 @@ type ReturnUser struct {
 	UserName string   `json:"username" bson:"username"`
 	Networks []string `json:"networks" bson:"networks"`
 	IsAdmin  bool     `json:"isadmin" bson:"isadmin"`
+	Groups   []string `json:"groups" bson:"groups"`
 }
 
 // UserAuthParams - user auth params struct
@@ -48,6 +51,7 @@ type UserClaims struct {
 	IsAdmin  bool
 	UserName string
 	Networks []string
+	Groups   []string
 	jwt.RegisteredClaims
 }
 
@@ -95,10 +99,11 @@ type SuccessResponse struct {
 
 // AccessKey - access key struct
 type AccessKey struct {
-	Name         string `json:"name" bson:"name" validate:"omitempty,max=20"`
-	Value        string `json:"value" bson:"value" validate:"omitempty,alphanum,max=16"`
-	AccessString string `json:"accessstring" bson:"accessstring"`
-	Uses         int    `json:"uses" bson:"uses" validate:"numeric,min=0"`
+	Name         string     `json:"name" bson:"name" validate:"omitempty,max=345"`
+	Value        string     `json:"value" bson:"value" validate:"omitempty,alphanum,max=16"`
+	AccessString string     `json:"accessstring" bson:"accessstring"`
+	Uses         int        `json:"uses" bson:"uses" validate:"numeric,min=0"`
+	Expiration   *time.Time `json:"expiration" bson:"expiration"`
 }
 
 // DisplayKey - what is displayed for key
@@ -200,6 +205,7 @@ type NodeGet struct {
 	Node         Node                 `json:"node" bson:"node" yaml:"node"`
 	Peers        []wgtypes.PeerConfig `json:"peers" bson:"peers" yaml:"peers"`
 	ServerConfig ServerConfig         `json:"serverconfig" bson:"serverconfig" yaml:"serverconfig"`
+	PeerIDs      PeerMap              `json:"peerids,omitempty" bson:"peerids,omitempty" yaml:"peerids,omitempty"`
 }
 
 // ServerConfig - struct for dealing with the server information for a netclient
@@ -212,6 +218,7 @@ type ServerConfig struct {
 	Version     string `yaml:"version"`
 	MQPort      string `yaml:"mqport"`
 	Server      string `yaml:"server"`
+	Is_EE       bool   `yaml:"isee"`
 }
 
 // User.NameInCharset - returns if name is in charset below or not

mq/handlers.go

@@ -2,6 +2,8 @@ package mq
 
 import (
 	"encoding/json"
+	"fmt"
+	"time"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/gravitl/netmaker/database"
@@ -9,6 +11,7 @@ import (
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/netclient/ncutils"
+	"github.com/gravitl/netmaker/servercfg"
 )
 
 // DefaultHandler default message queue handler  -- NOT USED
@@ -93,6 +96,50 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
 	}()
 }
 
+// UpdateMetrics  message Handler -- handles updates from client nodes for metrics
+func UpdateMetrics(client mqtt.Client, msg mqtt.Message) {
+	if logic.Is_EE {
+		go func() {
+			id, err := getID(msg.Topic())
+			if err != nil {
+				logger.Log(1, "error getting node.ID sent on ", msg.Topic(), err.Error())
+				return
+			}
+			currentNode, err := logic.GetNodeByID(id)
+			if err != nil {
+				logger.Log(1, "error getting node ", id, err.Error())
+				return
+			}
+			decrypted, decryptErr := decryptMsg(&currentNode, msg.Payload())
+			if decryptErr != nil {
+				logger.Log(1, "failed to decrypt message for node ", id, decryptErr.Error())
+				return
+			}
+
+			var newMetrics models.Metrics
+			if err := json.Unmarshal(decrypted, &newMetrics); err != nil {
+				logger.Log(1, "error unmarshaling payload ", err.Error())
+				return
+			}
+
+			updateNodeMetrics(&currentNode, &newMetrics)
+
+			if err = logic.UpdateMetrics(id, &newMetrics); err != nil {
+				logger.Log(1, "faield to update node metrics", id, currentNode.Name, err.Error())
+				return
+			}
+			if servercfg.IsMetricsExporter() {
+				if err := pushMetricsToExporter(newMetrics); err != nil {
+					logger.Log(2, fmt.Sprintf("failed to push node: [%s] metrics to exporter, err: %v",
+						currentNode.Name, err))
+				}
+			}
+
+			logger.Log(1, "updated node metrics", id, currentNode.Name)
+		}()
+	}
+}
+
 // ClientPeerUpdate  message handler -- handles updating peers after signal from client nodes
 func ClientPeerUpdate(client mqtt.Client, msg mqtt.Message) {
 	go func() {
@@ -146,3 +193,46 @@ func updateNodePeers(currentNode *models.Node) {
 		}
 	}
 }
+
+func updateNodeMetrics(currentNode *models.Node, newMetrics *models.Metrics) {
+	oldMetrics, err := logic.GetMetrics(currentNode.ID)
+	if err != nil {
+		logger.Log(1, "error finding old metrics for node", currentNode.ID, currentNode.Name)
+		return
+	}
+
+	var attachedClients []models.ExtClient
+	if currentNode.IsIngressGateway == "yes" {
+		clients, err := logic.GetExtClientsByID(currentNode.ID, currentNode.Network)
+		if err == nil {
+			attachedClients = clients
+		}
+	}
+	if len(attachedClients) > 0 {
+		// associate ext clients with IDs
+		for i := range attachedClients {
+			extMetric := newMetrics.Connectivity[attachedClients[i].PublicKey]
+			delete(newMetrics.Connectivity, attachedClients[i].PublicKey)
+			if extMetric.Connected { // add ext client metrics
+				newMetrics.Connectivity[attachedClients[i].ClientID] = extMetric
+			}
+		}
+	}
+
+	// run through metrics for each peer
+	for k := range newMetrics.Connectivity {
+		currMetric := newMetrics.Connectivity[k]
+		oldMetric := oldMetrics.Connectivity[k]
+		currMetric.TotalTime += oldMetric.TotalTime
+		currMetric.Uptime += oldMetric.Uptime // get the total uptime for this connection
+		currMetric.PercentUp = 100.0 * (float64(currMetric.Uptime) / float64(currMetric.TotalTime))
+		totalUpMinutes := currMetric.Uptime * 5
+		currMetric.ActualUptime = time.Duration(totalUpMinutes) * time.Minute
+		delete(oldMetrics.Connectivity, k) // remove from old data
+		newMetrics.Connectivity[k] = currMetric
+	}
+
+	for k := range oldMetrics.Connectivity { // cleanup any left over data, self healing
+		delete(newMetrics.Connectivity, k)
+	}
+}

mq/mq.go

@@ -85,9 +85,9 @@ func SetupMQTT() {
 			client.Disconnect(240)
 			logger.Log(0, "node client subscription failed")
 		}
-		if token := client.Subscribe(DynamicSecSubTopic, 0, mqtt.MessageHandler(watchDynSecTopic)); token.WaitTimeout(MQ_TIMEOUT*time.Second) && token.Error() != nil {
+		if token := client.Subscribe("metrics/#", 0, mqtt.MessageHandler(UpdateMetrics)); token.WaitTimeout(MQ_TIMEOUT*time.Second) && token.Error() != nil {
 			client.Disconnect(240)
-			logger.Log(0, "Dynamic security client subscription failed")
+			logger.Log(0, "node metrics subscription failed")
 		}
 
 		opts.SetOrderMatters(true)

mq/publishers.go

@@ -2,11 +2,13 @@ package mq
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
+	"time"
 
-	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
+	"github.com/gravitl/netmaker/logic/metrics"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/servercfg"
 	"github.com/gravitl/netmaker/serverctl"
@@ -105,6 +107,11 @@ func NodeUpdate(node *models.Node) error {
 // sendPeers - retrieve networks, send peer ports to all peers
 func sendPeers() {
 
+	networks, err := logic.GetNetworks()
+	if err != nil {
+		logger.Log(1, "error retrieving networks for keepalive", err.Error())
+	}
+
 	var force bool
 	peer_force_send++
 	if peer_force_send == 5 {
@@ -121,10 +128,8 @@ func sendPeers() {
 		if err != nil {
 			logger.Log(3, "error occurred on timer,", err.Error())
 		}
-	}
-	networks, err := logic.GetNetworks()
-	if err != nil && !database.IsEmptyRecord(err) {
-		logger.Log(1, "error retrieving networks for keepalive", err.Error())
+
+		collectServerMetrics(networks[:])
 	}
 
 	for _, network := range networks {
@@ -176,3 +181,66 @@ func ServerStartNotify() error {
 	}
 	return nil
 }
+
+// function to collect and store metrics for server nodes
+func collectServerMetrics(networks []models.Network) {
+	if !logic.Is_EE {
+		return
+	}
+	if len(networks) > 0 {
+		for i := range networks {
+			currentNetworkNodes, err := logic.GetNetworkNodes(networks[i].NetID)
+			if err != nil {
+				continue
+			}
+			currentServerNodes := logic.GetServerNodes(networks[i].NetID)
+			if len(currentServerNodes) > 0 {
+				for i := range currentServerNodes {
+					if logic.IsLocalServer(&currentServerNodes[i]) {
+						serverMetrics := logic.CollectServerMetrics(currentServerNodes[i].ID, currentNetworkNodes)
+						if serverMetrics != nil {
+							serverMetrics.NodeName = currentServerNodes[i].Name
+							serverMetrics.NodeID = currentServerNodes[i].ID
+							serverMetrics.IsServer = "yes"
+							serverMetrics.Network = currentServerNodes[i].Network
+							if err = metrics.GetExchangedBytesForNode(&currentServerNodes[i], serverMetrics); err != nil {
+								logger.Log(1, fmt.Sprintf("failed to update exchanged bytes info for server: %s, err: %v",
+									currentServerNodes[i].Name, err))
+							}
+							updateNodeMetrics(&currentServerNodes[i], serverMetrics)
+							if err = logic.UpdateMetrics(currentServerNodes[i].ID, serverMetrics); err != nil {
+								logger.Log(1, "failed to update metrics for server node", currentServerNodes[i].ID)
+							}
+							if servercfg.IsMetricsExporter() {
+								logger.Log(2, "-------------> SERVER METRICS: ", fmt.Sprintf("%+v", serverMetrics))
+								if err := pushMetricsToExporter(*serverMetrics); err != nil {
+									logger.Log(2, "failed to push server metrics to exporter: ", err.Error())
+								}
+							}
+
+						}
+
+					}
+				}
+			}
+		}
+	}
+}
+
+func pushMetricsToExporter(metrics models.Metrics) error {
+	logger.Log(2, "----> Pushing metrics to exporter")
+	data, err := json.Marshal(metrics)
+	if err != nil {
+		return errors.New("failed to marshal metrics: " + err.Error())
+	}
+	if token := mqclient.Publish("metrics_exporter", 0, true, data); !token.WaitTimeout(MQ_TIMEOUT*time.Second) || token.Error() != nil {
+		var err error
+		if token.Error() == nil {
+			err = errors.New("connection timeout")
+		} else {
+			err = token.Error()
+		}
+		return err
+	}
+	return nil
+}

netclient/cli_options/flags.go

@@ -133,6 +133,20 @@ func GetFlags(hostname string) []cli.Flag {
 			Value:   "",
 			Usage:   "Access Token for signing up machine with Netmaker server during initial 'add'.",
 		},
+		&cli.StringFlag{
+			Name:    "server",
+			Aliases: []string{"s"},
+			EnvVars: []string{"HOST_SERVER"},
+			Value:   "",
+			Usage:   "Host server (domain of API) [Example: api.example.com]. Do not include \"http(s)://\" use it for the Single Sign-on along with the network parameter",
+		},
+		&cli.StringFlag{
+			Name:    "user",
+			Aliases: []string{"u"},
+			EnvVars: []string{"USER_NAME"},
+			Value:   "",
+			Usage:   "User name provided upon joins if joining over basic auth is desired.",
+		},
 		&cli.StringFlag{
 			Name:    "localrange",
 			EnvVars: []string{"NETCLIENT_LOCALRANGE"},

netclient/command/commands.go

@@ -1,6 +1,7 @@
 package command
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -15,6 +16,27 @@ import (
 func Join(cfg *config.ClientConfig, privateKey string) error {
 	var err error
 	//join network
+	if cfg.SsoServer != "" {
+		// User wants to get access key from the OIDC server
+		// Do that before the Joining Network flow by performing the end point auth flow
+		// if performed successfully an access key is obtained from the server and then we
+		// proceed with the usual flow 'pretending' that user is feeded us with an access token
+		if len(cfg.Network) == 0 || cfg.Network == "all" {
+			return fmt.Errorf("no network provided. Specify network with \"-n <net name>\"")
+		}
+		logger.Log(1, "Logging into %s via:", cfg.Network, cfg.SsoServer)
+		err = functions.JoinViaSSo(cfg, privateKey)
+		if err != nil {
+			logger.Log(0, "Join failed: ", err.Error())
+			return err
+		}
+
+		if cfg.AccessKey == "" {
+			return errors.New("login failed")
+		}
+	}
+
+	logger.Log(1, "Joining network: ", cfg.Network)
 	err = functions.JoinNetwork(cfg, privateKey)
 	if err != nil {
 		if !strings.Contains(err.Error(), "ALREADY_INSTALLED") {