fix: minor NPEs; added test

Author: chetan

.gitignore

@@ -31,3 +31,4 @@ dist/
 .vproxy.conf
 t/
 *.pprof
+.history

Makefile

@@ -1,27 +1,37 @@
 
 SHELL := bash
 
+# Build the vproxy binary (using go build)
 build: clean
 	go build ./bin/vproxy
+	echo "built ./vproxy"
 
+# Build a snapshot (using goreleaser)
 snapshot: clean
 	goreleaser release --snapshot --clean
 
+# Install the generated homebrew formula into local homebrew tap
 install-formula: snapshot
-	cp -a dist/homebrew/Formula/*.rb /usr/local/Homebrew/Library/Taps/jittering/homebrew-kegs/Formula/
+	[ -z "$$HOMEBREW_PREFIX" ] && echo "HOMEBREW_PREFIX is not set" && exit 1
+	cp -a dist/homebrew/Formula/*.rb $${HOMEBREW_PREFIX}/Library/Taps/jittering/homebrew-kegs/Formula/
 
+# Build for linux (x64) (for testing only, release uses goreleaser)
 build-linux:
 	GOOS=linux go build -o vproxy-linux-x64 ./bin/vproxy/
 
+# Build for mac (x64) (for testing only, release uses goreleaser)
 build-mac:
 	 GOOS=darwin go build -o vproxy-macos-x64 ./bin/vproxy/
 
+# Build for windows (x64) (for testing only, release uses goreleaser)
 build-windows:
 	GOOS=windows go build -o vproxy-windows-x64 ./bin/vproxy/
 
+# Release using goreleaser
 release: clean
 	goreleaser release --clean
 
+# Check goreleaser config and generated homebrew formula style for errors
 check-style:
 	goreleaser check
 	goreleaser --snapshot --skip-validate --clean
@@ -30,6 +40,7 @@ check-style:
 		| grep -v Enabled | grep -v '#' | grep -v '^$$' | tr ':\n' ','); \
 		brew style --display-cop-names --except-cops="$${cops}" ./dist/*.rb;
 
+## Build and install into homebrew bin path, restart service
 build-brew:
 	 go build -ldflags \
 	 	"-X main.version=snapshot \
@@ -38,12 +49,27 @@ build-brew:
 			-X main.builtBy=$$(whoami)" \
 		-o vproxy ./bin/vproxy/
 
-	 sudo mv vproxy /opt/homebrew/opt/vproxy/bin/vproxy
+	 sudo mv vproxy $${HOMEBREW_PREFIX}/opt/vproxy/bin/vproxy
 	 sudo pkill -f 'vproxy daemon'
 
+# Clean build artifacts
 clean:
 	rm -f ./vproxy*
 	rm -rf ./dist/
 
+# Build and install to /usr/local/bin
 install: build
 	sudo cp -a ./vproxy /usr/local/bin/vproxy
+
+help: ## Show make target help
+	@(grep -A1 '^#' $(MAKEFILE_LIST) \
+		| grep -v '^--$$' \
+		| while IFS= read -r line1 && IFS= read -r line2; do \
+				if [[ "$$line2" =~ ^[a-zA-Z_-]+:.*$$ ]]; then \
+					echo "$$line2 #$$line1"; \
+				fi; \
+			done; \
+		grep -hE '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST)) \
+			| sort \
+			| awk '!seen[$$1]++' \
+			| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

daemon.go

@@ -108,6 +108,15 @@ func testListener(addr string) {
 	l.Close()
 }
 
+func (d *Daemon) Shutdown() {
+	if d.enableHTTP() && d.httpListener != nil {
+		d.httpListener.Close()
+	}
+	if d.enableTLS() && d.httpsListener != nil {
+		d.httpsListener.Close()
+	}
+}
+
 // Run the daemon service. Does not return until the service is killed.
 func (d *Daemon) Run() {
 	d.httpAddr = fmt.Sprintf("%s:%d", d.listenHost, d.httpPort)

daemon_test.go

@@ -1,12 +1,52 @@
 package vproxy
 
 import (
+	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
+var temp = ""
+
+func setup() error {
+	var err error
+	temp, err = os.MkdirTemp("", "vproxy")
+	if err != nil {
+		return err
+	}
+	fmt.Println("using temp dir:", temp)
+	os.Setenv("CERT_PATH", temp)
+	os.Setenv("CAROOT_PATH", temp)
+	err = InitTrustStore()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func teardown() {
+	os.RemoveAll(temp)
+}
+
+func TestMain(m *testing.M) {
+	err := setup()
+	if err != nil {
+		fmt.Println("setup error:", err)
+		os.Exit(1)
+	}
+
+	code := m.Run()
+
+	teardown()
+
+	os.Exit(code)
+}
+
 func TestListClients(t *testing.T) {
 	request, _ := http.NewRequest("GET", "/events/next/", nil)
 	response := httptest.NewRecorder()
@@ -15,7 +55,7 @@ func TestListClients(t *testing.T) {
 	lh := NewLoggedHandler(vhostMux)
 
 	// start daemon
-	d := NewDaemon(lh, "127.0.0.1", 80, 443)
+	d := NewDaemon(lh, "127.0.0.1", 0, 0)
 
 	d.listClients(response, request)
 	if response.Code != http.StatusOK {
@@ -35,4 +75,20 @@ func TestListClients(t *testing.T) {
 	if !strings.Contains(res, "test.local.com") {
 		t.Fatalf("list does not contain test.local.com:\n%s", response.Body.String())
 	}
+	d.Shutdown()
+}
+
+func TestAddRemoveVhost(t *testing.T) {
+
+	vhostMux := CreateVhostMux([]string{}, true)
+	lh := NewLoggedHandler(vhostMux)
+	d := NewDaemon(lh, "", 0, 0)
+
+	r := httptest.NewRecorder()
+	d.addVhost("foo:8000", r)
+	assert.Equal(t, 1, len(lh.vhostMux.Servers))
+
+	v := d.loggedHandler.GetVhost("foo")
+	d.doRemoveVhost(v, r)
+	assert.Equal(t, 0, len(lh.vhostMux.Servers))
 }

logged_handler.go

@@ -87,7 +87,7 @@ func (lh *LoggedHandler) CreateTLSConfig() *tls.Config {
 	}
 
 	// build cn and return
-	cfg.BuildNameToCertificate()
+	// cfg.BuildNameToCertificate()
 	return cfg
 }
 

vhost.go

@@ -167,8 +167,12 @@ func (v *Vhost) BufferAsString() string {
 }
 
 func (v *Vhost) Close() {
-	close(v.logChan)
-	v.logRing.Clear()
+	if v.logChan != nil {
+		close(v.logChan)
+	}
+	if v.logRing != nil {
+		v.logRing.Clear()
+	}
 }
 
 func (v *Vhost) populateLogBuffer() {