From 2a6f4d52b239b71f06d1465edfa0a2afb016f7fe Mon Sep 17 00:00:00 2001
From: Toby Chui <tobychui@users.noreply.github.com>
Date: Sat, 13 Sep 2025 23:46:38 +0800
Subject: [PATCH] Refactor mux setup and fix ReverseProxyInit typo

- Reorganized HTTP mux initialization to clarify plugin and webmin UI routing, replacing parentMux with entryMux.
- Fixed typo in ReverseProxyInit function name and updated its usage in main.go.
---
 src/main.go         | 22 +++++++++-------------
 src/reverseproxy.go |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main.go b/src/main.go
index dd786c6..ac3d20f 100644
--- a/src/main.go
+++ b/src/main.go
@@ -99,8 +99,9 @@ func main() {
 	}
 	nodeUUID = string(uuidBytes)
 
-	//Create a new webmin mux and csrf middleware layer
+	//Create a new webmin mux, plugin mux and csrf middleware layer
 	webminPanelMux = http.NewServeMux()
+	pluginAPIMux := http.NewServeMux()
 	csrfMiddleware = csrf.Protect(
 		[]byte(nodeUUID),
 		csrf.CookieName(CSRF_COOKIENAME),
@@ -112,24 +113,19 @@ func main() {
 	//Startup all modules, see start.go
 	startupSequence()
 
-	//Initiate management interface APIs
+	//Initiate APIs
 	requireAuth = !(*noauth)
 	initAPIs(webminPanelMux)
-
-	// Create a new plugin API mux
-	pluginAPIMux := http.NewServeMux()
 	initRestAPI(pluginAPIMux)
 
-	// Create a parent mux to route /plugin endpoints without CSRF, others with CSRF
-	parentMux := http.NewServeMux()
-	// /plugin (rest API) endpoints: no CSRF
-	parentMux.Handle("/plugin/", pluginAPIMux)
-	// all other endpoints: with CSRF
-	parentMux.Handle("/", csrfMiddleware(webminPanelMux))
+	// Create a entry mux to accept all management interface requests
+	entryMux := http.NewServeMux()
+	entryMux.Handle("/plugin/", pluginAPIMux)            //For plugins API access
+	entryMux.Handle("/", csrfMiddleware(webminPanelMux)) //For webmin UI access, require csrf token
 
 	// Start the reverse proxy server in go routine
 	go func() {
-		ReverseProxtInit()
+		ReverseProxyInit()
 	}()
 
 	time.Sleep(500 * time.Millisecond)
@@ -144,7 +140,7 @@ func main() {
 		SystemWideLogger.Println(SYSTEM_NAME + " started. Visit control panel at http://" + *webUIPort)
 	}
 
-	err = http.ListenAndServe(*webUIPort, parentMux)
+	err = http.ListenAndServe(*webUIPort, entryMux)
 
 	if err != nil {
 		log.Fatal(err)
diff --git a/src/reverseproxy.go b/src/reverseproxy.go
index f57a7c8..aeb4e2b 100644
--- a/src/reverseproxy.go
+++ b/src/reverseproxy.go
@@ -26,7 +26,7 @@ var (
 )
 
 // Add user customizable reverse proxy
-func ReverseProxtInit() {
+func ReverseProxyInit() {
 	/*
 		Load Reverse Proxy Global Settings
 	*/