fix: npe when replacing vhost

Author: chetan

daemon.go

@@ -286,7 +286,6 @@ func (d *Daemon) removeVhost(w http.ResponseWriter, r *http.Request) {
 func (d *Daemon) doRemoveVhost(vhost *Vhost, w http.ResponseWriter) {
 	fmt.Printf("[*] removing vhost: %s -> %d\n", vhost.Host, vhost.ServicePort)
 	fmt.Fprintf(w, "removing vhost: %s -> %d\n", vhost.Host, vhost.ServicePort)
-	vhost.Close()
 	d.loggedHandler.RemoveVhost(vhost.Host)
 	d.saveVhosts()
 }
@@ -349,7 +348,6 @@ func (d *Daemon) addVhost(binding string, w http.ResponseWriter) *Vhost {
 	// remove any existing vhost
 	if v := d.loggedHandler.GetVhost(vhost.Host); v != nil {
 		fmt.Printf("[*] removing existing vhost: %s -> %d\n", v.Host, v.ServicePort)
-		v.Close()
 		d.loggedHandler.RemoveVhost(vhost.Host)
 	}
 

daemon_test.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"path"
 	"strings"
 	"testing"
 
@@ -22,13 +23,30 @@ func setup() error {
 	fmt.Println("using temp dir:", temp)
 	os.Setenv("CERT_PATH", temp)
 	os.Setenv("CAROOT_PATH", temp)
+	os.Setenv("CAROOT", temp)
 	err = InitTrustStore()
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
+func reset() {
+	os.Remove(path.Join(temp, "vhosts.json"))
+}
+
+func listTempDir() {
+	files, err := os.ReadDir(temp)
+	if err != nil {
+		fmt.Println("error reading temp dir:", err)
+		return
+	}
+	fmt.Println("temp dir contents:")
+	for _, f := range files {
+		fmt.Println(" -", f.Name())
+	}
+}
+
 func teardown() {
 	os.RemoveAll(temp)
 }
@@ -48,6 +66,7 @@ func TestMain(m *testing.M) {
 }
 
 func TestListClients(t *testing.T) {
+	reset()
 	request, _ := http.NewRequest("GET", "/events/next/", nil)
 	response := httptest.NewRecorder()
 
@@ -79,14 +98,18 @@ func TestListClients(t *testing.T) {
 }
 
 func TestAddRemoveVhost(t *testing.T) {
-
+	reset()
 	vhostMux := CreateVhostMux([]string{}, true)
 	lh := NewLoggedHandler(vhostMux)
+	assert.Equal(t, 0, len(lh.vhostMux.Servers))
+
 	d := NewDaemon(lh, "", 0, 0)
 
 	r := httptest.NewRecorder()
 	d.addVhost("foo:8000", r)
 	assert.Equal(t, 1, len(lh.vhostMux.Servers))
+	assert.NotNil(t, lh.vhostMux.Servers["foo"], "has vhost for foo")
+	assert.NotNil(t, lh.vhostMux.Servers["foo"].Handler, "has handler for foo")
 
 	v := d.loggedHandler.GetVhost("foo")
 	d.doRemoveVhost(v, r)

logged_handler.go

@@ -58,7 +58,11 @@ func (lh *LoggedHandler) GetVhost(host string) *Vhost {
 }
 
 func (lh *LoggedHandler) RemoveVhost(host string) {
-	delete(lh.vhostMux.Servers, host)
+	vhost := lh.vhostMux.Servers[host]
+	if vhost != nil {
+		vhost.Close()
+		delete(lh.vhostMux.Servers, host)
+	}
 }
 
 // DumpServers to the given writer
@@ -114,11 +118,7 @@ func (lh *LoggedHandler) pushLog(host string, msg string) {
 	fmt.Println(msg)
 
 	if vhost := lh.GetVhost(host); vhost != nil {
-		vhost.logChan <- msg // push to buffer
-		for _, logChan := range vhost.listeners {
-			// push to client listeners
-			logChan <- msg
-		}
+		vhost.PushLog(msg)
 	}
 }
 

vhost.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net/http"
 	"net/url"
+	"runtime/debug"
 	"strconv"
 	"strings"
 
@@ -27,6 +28,7 @@ type Vhost struct {
 	logRing   *deque.Deque[string] `json:"-"`
 	logChan   LogListener          `json:"-"`
 	listeners []LogListener        `json:"-"`
+	closed    bool                 `json:"-"`
 }
 
 type LogListener chan string
@@ -52,6 +54,7 @@ func (v *VhostMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer func() {
 		if val := recover(); val != nil {
 			log.Printf("Error proxying request `%s` to `%s`: %v", originalURL, r.URL, val)
+			log.Printf("%s", debug.Stack())
 			w.WriteHeader(http.StatusServiceUnavailable)
 			fmt.Fprintf(w, "Error proxying request `%s` to `%s`: %v", originalURL, r.URL, val)
 		}
@@ -121,6 +124,8 @@ func CreateVhost(input string, useTLS bool) (*Vhost, error) {
 		}
 	}
 
+	vhost.Init()
+
 	return vhost, nil
 }
 
@@ -167,6 +172,10 @@ func (v *Vhost) BufferAsString() string {
 }
 
 func (v *Vhost) Close() {
+	if v.closed {
+		return
+	}
+	v.closed = true
 	if v.logChan != nil {
 		close(v.logChan)
 	}
@@ -175,6 +184,17 @@ func (v *Vhost) Close() {
 	}
 }
 
+func (v *Vhost) PushLog(msg string) {
+	if v.closed {
+		return
+	}
+	v.logChan <- msg // push to buffer
+	for _, logChan := range v.listeners {
+		// push to client listeners
+		logChan <- msg
+	}
+}
+
 func (v *Vhost) populateLogBuffer() {
 	for line := range v.logChan {
 		if v.logRing.Len() < 10 {