Add Makefile build

This prepares for multiple binaries and distribution builds

Makefile

@@ -0,0 +1,68 @@
+BINDIR      := $(CURDIR)/bin
+INSTALL_PATH ?= /usr/local/bin
+DIST_DIRS   := find * -type d -exec
+TARGETS     := darwin/amd64 darwin/arm64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64
+TARGET_OBJS ?= darwin-amd64.tar.gz darwin-amd64.tar.gz.sha256 darwin-amd64.tar.gz.sha256sum darwin-arm64.tar.gz darwin-arm64.tar.gz.sha256 darwin-arm64.tar.gz.sha256sum linux-amd64.tar.gz linux-amd64.tar.gz.sha256 linux-amd64.tar.gz.sha256sum linux-386.tar.gz linux-386.tar.gz.sha256 linux-386.tar.gz.sha256sum linux-arm.tar.gz linux-arm.tar.gz.sha256 linux-arm.tar.gz.sha256sum linux-arm64.tar.gz linux-arm64.tar.gz.sha256 linux-arm64.tar.gz.sha256sum linux-ppc64le.tar.gz linux-ppc64le.tar.gz.sha256 linux-ppc64le.tar.gz.sha256sum linux-s390x.tar.gz linux-s390x.tar.gz.sha256 linux-s390x.tar.gz.sha256sum windows-amd64.zip windows-amd64.zip.sha256 windows-amd64.zip.sha256sum
+BINNAME     ?= rdpgw
+
+# Rebuild the binary if any of these files change
+SRC := $(shell find . -type f -name '*.go' -print) go.mod go.sum
+
+# Required for globs to work correctly
+SHELL      = /usr/bin/env bash
+
+GIT_COMMIT = $(shell git rev-parse HEAD)
+GIT_SHA    = $(shell git rev-parse --short HEAD)
+GIT_TAG    = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
+GIT_DIRTY  = $(shell test -n "`git status --porcelain`" && echo "dirty" || echo "clean")
+
+ifdef VERSION
+	BINARY_VERSION = $(VERSION)
+endif
+BINARY_VERSION ?= ${GIT_TAG}
+
+VERSION_METADATA = unreleased
+# Clear the "unreleased" string in BuildMetadata
+ifneq ($(GIT_TAG),)
+	VERSION_METADATA =
+endif
+
+.PHONY: all
+all: mod build
+
+# ------------------------------------------------------------------------------
+#  build
+
+.PHONY: build
+build: $(BINDIR)/$(BINNAME)
+
+$(BINDIR)/$(BINNAME): $(SRC)
+	GOMODULE=on go build $(GOFLAGS) -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)'/$(BINNAME) ./cmd/rdpgw
+
+# ------------------------------------------------------------------------------
+#  install
+
+.PHONY: install
+install: build
+	@install "$(BINDIR)/$(BINNAME)" "$(INSTALL_PATH)/$(BINNAME)"
+
+# ------------------------------------------------------------------------------
+#  mod
+
+.PHONY: mod
+mod:
+	go mod tidy
+
+# ------------------------------------------------------------------------------
+#  clean
+
+.PHONY: clean
+clean:
+	@rm -rf '$(BINDIR)' ./_dist
+
+.PHONY: info
+info:
+	 @echo "Version:           ${VERSION}"
+	 @echo "Git Tag:           ${GIT_TAG}"
+	 @echo "Git Commit:        ${GIT_COMMIT}"
+	 @echo "Git Tree State:    ${GIT_DIRTY}"

cmd/rdpgw/api/token.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/bolkedebruin/rdpgw/security"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/security"
 	"log"
 	"net/http"
 )

cmd/rdpgw/main.go

@@ -3,11 +3,11 @@ package main
 import (
 	"context"
 	"crypto/tls"
-	"github.com/bolkedebruin/rdpgw/api"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/api"
-	"github.com/bolkedebruin/rdpgw/common"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/common"
-	"github.com/bolkedebruin/rdpgw/config"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/config"
-	"github.com/bolkedebruin/rdpgw/protocol"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/protocol"
-	"github.com/bolkedebruin/rdpgw/security"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/security"
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
@@ -68,7 +68,7 @@ func main() {
 		OIDCTokenVerifier:    verifier,
 		PAATokenGenerator:    security.GeneratePAAToken,
 		UserTokenGenerator:   security.GenerateUserToken,
-		EnableUserToken:	  conf.Security.EnableUserToken,
+		EnableUserToken:      conf.Security.EnableUserToken,
 		SessionKey:           []byte(conf.Server.SessionKey),
 		SessionEncryptionKey: []byte(conf.Server.SessionEncryptionKey),
 		Hosts:                conf.Server.Hosts,
@@ -77,7 +77,7 @@ func main() {
 		BandwidthAutoDetect:  conf.Client.BandwidthAutoDetect,
 		ConnectionType:       conf.Client.ConnectionType,
 		SplitUserDomain:      conf.Client.SplitUserDomain,
-		DefaultDomain:		  conf.Client.DefaultDomain,
+		DefaultDomain:        conf.Client.DefaultDomain,
 	}
 	api.NewApi()
 
@@ -127,9 +127,9 @@ func main() {
 			EnableAll: conf.Caps.RedirectAll,
 		},
 		VerifyTunnelCreate: security.VerifyPAAToken,
-		VerifyServerFunc: security.VerifyServerFunc,
+		VerifyServerFunc:   security.VerifyServerFunc,
-		SendBuf: conf.Server.SendBuf,
+		SendBuf:            conf.Server.SendBuf,
-		ReceiveBuf: conf.Server.ReceiveBuf,
+		ReceiveBuf:         conf.Server.ReceiveBuf,
 	}
 	gw := protocol.Gateway{
 		ServerConf: &handlerConfig,

cmd/rdpgw/protocol/common.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
-	"github.com/bolkedebruin/rdpgw/transport"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/transport"
 	"io"
 	"log"
 	"net"
@@ -27,10 +27,10 @@ type SessionInfo struct {
 	ConnId           string
 	// The underlying incoming transport being either websocket or legacy http
 	// in case of websocket TransportOut will equal TransportIn
-	TransportIn      transport.Transport
+	TransportIn transport.Transport
 	// The underlying outgoing transport being either websocket or legacy http
 	// in case of websocket TransportOut will equal TransportOut
-	TransportOut     transport.Transport
+	TransportOut transport.Transport
 	// The remote desktop server (rdp, vnc etc) the clients intends to connect to
 	RemoteServer	 string
 	// The obtained client ip address

cmd/rdpgw/protocol/gateway.go

@@ -3,8 +3,8 @@ package protocol
 import (
 	"context"
 	"errors"
-	"github.com/bolkedebruin/rdpgw/common"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/common"
-	"github.com/bolkedebruin/rdpgw/transport"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/transport"
 	"github.com/gorilla/websocket"
 	"github.com/patrickmn/go-cache"
 	"github.com/prometheus/client_golang/prometheus"

cmd/rdpgw/protocol/server.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/binary"
 	"errors"
-	"github.com/bolkedebruin/rdpgw/common"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/common"
 	"io"
 	"log"
 	"net"
@@ -39,13 +39,13 @@ type ServerConf struct {
 	IdleTimeout          int
 	SmartCardAuth        bool
 	TokenAuth            bool
-	ReceiveBuf			 int
+	ReceiveBuf           int
-	SendBuf				 int
+	SendBuf              int
 }
 
 func NewServer(s *SessionInfo, conf *ServerConf) *Server {
 	h := &Server{
-		State:				  SERVER_STATE_INITIAL,
+		State:                SERVER_STATE_INITIAL,
 		Session:              s,
 		RedirectFlags:        makeRedirectFlags(conf.RedirectFlags),
 		IdleTimeout:          conf.IdleTimeout,

cmd/rdpgw/security/jwt.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/bolkedebruin/rdpgw/common"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/common"
-	"github.com/bolkedebruin/rdpgw/protocol"
+	"github.com/bolkedebruin/rdpgw/cmd/rdpgw/protocol"
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/square/go-jose/v3"
 	"github.com/square/go-jose/v3/jwt"