merge conflicts resolved

Author: abhishek9686

.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")
+}