Merge pull request #841 from Morethanevil/main

Update CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,28 @@
+# v3.2.7 09 Oct 2025
+
++ Update Sidebar CSS by [Saeraphinx](https://github.com/Saeraphinx)
++ fix restart after acme dns challenge by [jimmyGALLAND](https://github.com/jimmyGALLAND)
++ fix acme renew by [jimmyGALLAND](https://github.com/jimmyGALLAND)
+
+
+# v3.2.6 (Prerelease) 16 Sep 2025
+
++ feat(plugins): Implement plugin API key management and authentication middleware by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
++ fix: Handle existing symlink in start_zerotier function by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM) [#758](https://github.com/tobychui/zoraxy/issues/758)
++ fix: panics when rewriting headers for websockets, and strange issue with logging across a month boundary by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM) [#771](https://github.com/tobychui/zoraxy/issues/771)
++ add CODEOWNERS file by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
++ Update lego to v4.25.2 by [zen8841](https://github.com/zen8841)
++ feat(sso): forward auth body and alternate headers by james-d-elliott [#819](https://github.com/tobychui/zoraxy/issues/819)
++ feat(sso): clear settings by [james-d-elliott](https://github.com/james-d-elliott)
++ feat(plugins): Implement event system w/ POC events by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
++ feature: new container environment vars by [PassiveLemon](https://github.com/PassiveLemon)
++ Update example plugins by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
++ feat(event system): Flesh out EventPayload interface by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
++ feat(plugin API): Plugin-to-plugin-comms by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
++ put plugin API on separate mux not protected by CSRF by [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
++ fix Enable Lan and Loopback [#799](https://github.com/tobychui/zoraxy/issues/799)
+
+
 # v3.2.5 20 Jul 2025
 
 

src/mod/dynamicproxy/Server.go

@@ -92,6 +92,7 @@ func (h *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 
 		//Plugin routing
+
 		if h.Parent.Option.PluginManager != nil && h.Parent.Option.PluginManager.HandleRoute(w, r, sep.Tags) {
 			//Request handled by subroute
 			return

src/mod/dynamicproxy/dpcore/dpcore.go

@@ -438,15 +438,7 @@ func (p *ReverseProxy) ProxyHTTPS(rw http.ResponseWriter, req *http.Request) (in
 	if !strings.Contains(host, ":") {
 		host += ":443"
 	}
-	serverName := ""
-	//if p.Transport != nil {
-	//	if tr, ok := p.Transport.(*http.Transport); ok && tr.TLSClientConfig != nil && tr.TLSClientConfig.ServerName != "" {
-	//		serverName = tr.TLSClientConfig.ServerName
-	//	}
-	//}
-	if serverName == "" {
-		serverName = req.URL.Hostname()
-	}
+	serverName := req.URL.Hostname()
 
 	// Connect with SNI offload
 	tlsConfig := &tls.Config{

src/mod/dynamicproxy/endpoints.go

@@ -272,11 +272,6 @@ func (ep *ProxyEndpoint) Remove() error {
 	return nil
 }
 
-// Check if the proxy endpoint is enabled
-func (ep *ProxyEndpoint) IsEnabled() bool {
-	return !ep.Disabled
-}
-
 // Write changes to runtime without respawning the proxy handler
 // use prepare -> remove -> add if you change anything in the endpoint
 // that effects the proxy routing src / dest

src/mod/dynamicproxy/proxyRequestHandler.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"imuslab.com/zoraxy/mod/dynamicproxy/dpcore"
-	"imuslab.com/zoraxy/mod/dynamicproxy/loadbalance"
 	"imuslab.com/zoraxy/mod/dynamicproxy/rewrite"
 	"imuslab.com/zoraxy/mod/netutils"
 	"imuslab.com/zoraxy/mod/statistic"
@@ -96,47 +95,27 @@ func (router *Router) GetProxyEndpointFromHostname(hostname string) *ProxyEndpoi
 	return targetSubdomainEndpoint
 }
 
+// Clearn URL Path (without the http:// part) replaces // in a URL to /
+func (router *Router) clearnURL(targetUrlOPath string) string {
+	return strings.ReplaceAll(targetUrlOPath, "//", "/")
+}
+
 // Rewrite URL rewrite the prefix part of a virtual directory URL with /
 func (router *Router) rewriteURL(rooturl string, requestURL string) string {
 	rewrittenURL := requestURL
 	rewrittenURL = strings.TrimPrefix(rewrittenURL, strings.TrimSuffix(rooturl, "/"))
 
 	if strings.Contains(rewrittenURL, "//") {
-		rewrittenURL = strings.ReplaceAll(rewrittenURL, "//", "/")
+		rewrittenURL = router.clearnURL(rewrittenURL)
 	}
 	return rewrittenURL
 }
 
-// upstreamHostSwap check if this loopback to one of the proxy rule in the system. If yes, do a shortcut target swap
-// this prevents unnecessary external DNS lookup and connection, return true if swapped and request is already handled
-// by the loopback handler. Only continue if return is false
-func (h *ProxyHandler) upstreamHostSwap(w http.ResponseWriter, r *http.Request, selectedUpstream *loadbalance.Upstream) bool {
-	upstreamHostname := selectedUpstream.OriginIpOrDomain
-	if strings.Contains(upstreamHostname, ":") {
-		upstreamHostname = strings.Split(upstreamHostname, ":")[0]
-	}
-	loopbackProxyEndpoint := h.Parent.GetProxyEndpointFromHostname(upstreamHostname)
-	if loopbackProxyEndpoint != nil {
-		//This is a loopback request. Swap the target to the loopback target
-		//h.Parent.Option.Logger.PrintAndLog("proxy", "Detected a loopback request to self. Swap the target to "+loopbackProxyEndpoint.RootOrMatchingDomain, nil)
-		if loopbackProxyEndpoint.IsEnabled() {
-			h.hostRequest(w, r, loopbackProxyEndpoint)
-		} else {
-			//Endpoint disabled, return 503
-			http.ServeFile(w, r, "./web/rperror.html")
-			h.Parent.logRequest(r, false, 521, "host-http", r.Host, upstreamHostname)
-		}
-		return true
-	}
-	return false
-}
-
 // Handle host request
 func (h *ProxyHandler) hostRequest(w http.ResponseWriter, r *http.Request, target *ProxyEndpoint) {
 	r.Header.Set("X-Forwarded-Host", r.Host)
 	r.Header.Set("X-Forwarded-Server", "zoraxy-"+h.Parent.Option.HostUUID)
 	reqHostname := r.Host
-
 	/* Load balancing */
 	selectedUpstream, err := h.Parent.loadBalancer.GetRequestUpstreamTarget(w, r, target.ActiveOrigins, target.UseStickySession)
 	if err != nil {
@@ -146,12 +125,6 @@ func (h *ProxyHandler) hostRequest(w http.ResponseWriter, r *http.Request, targe
 		return
 	}
 
-	/* Upstream Host Swap (use to detect loopback to self) */
-	if h.upstreamHostSwap(w, r, selectedUpstream) {
-		//Request handled by the loopback handler
-		return
-	}
-
 	/* WebSocket automatic proxy */
 	requestURL := r.URL.String()
 	if r.Header["Upgrade"] != nil && strings.ToLower(r.Header["Upgrade"][0]) == "websocket" {

src/mod/uptime/uptime.go

@@ -211,6 +211,7 @@ func getWebsiteStatus(url string) (int, error) {
 	}
 
 	resp, err := client.Do(req)
+	//resp, err := client.Get(url)
 	if err != nil {
 		//Try replace the http with https and vise versa
 		rewriteURL := ""