diff --git a/src/main.go b/src/main.go index 96d7d3f..434ce57 100644 --- a/src/main.go +++ b/src/main.go @@ -44,7 +44,7 @@ var ( name = "Zoraxy" version = "2.6.6" nodeUUID = "generic" - development = false //Set this to false to use embedded web fs + development = true //Set this to false to use embedded web fs bootTime = time.Now().Unix() /* diff --git a/src/mod/dynamicproxy/dpcore/utils.go b/src/mod/dynamicproxy/dpcore/utils.go index 7f99fb4..27459b6 100644 --- a/src/mod/dynamicproxy/dpcore/utils.go +++ b/src/mod/dynamicproxy/dpcore/utils.go @@ -25,7 +25,9 @@ func replaceLocationHost(urlString string, rrr *ResponseRewriteRuleSet, useTLS b //E.g. Proxy config: blog.example.com -> example.com/blog //Check if it is actually redirecting to example.com instead of a new domain //like news.example.com. - if rrr.ProxyDomain != u.Host { + // The later check bypass apache screw up method of redirection header + // e.g. https://imuslab.com -> http://imuslab.com:443 + if rrr.ProxyDomain != u.Host && !strings.Contains(u.Host, rrr.OriginalHost+":") { //New location domain not matching proxy target domain. //Do not modify location header return urlString, nil diff --git a/src/reverseproxy.go b/src/reverseproxy.go index 000653c..1e032a4 100644 --- a/src/reverseproxy.go +++ b/src/reverseproxy.go @@ -644,7 +644,7 @@ func HandleIncomingPortSet(w http.ResponseWriter, r *http.Request) { newIncomingPortInt, err := strconv.Atoi(newIncomingPort) if err != nil { - utils.SendErrorResponse(w, "invalid incoming port given") + utils.SendErrorResponse(w, "Invalid incoming port given") return } @@ -652,7 +652,7 @@ func HandleIncomingPortSet(w http.ResponseWriter, r *http.Request) { if dynamicProxyRouter.Root == nil || dynamicProxyRouter.Root.Domain == "" { //Check if proxy root is set before checking recursive listen //Fixing issue #43 - utils.SendErrorResponse(w, "Proxy root not set") + utils.SendErrorResponse(w, "Set Proxy Root before changing inbound port") return } diff --git a/src/web/components/rules.html b/src/web/components/rules.html index b70a6ab..a952ed8 100644 --- a/src/web/components/rules.html +++ b/src/web/components/rules.html @@ -377,7 +377,8 @@ column.empty().append(`
Enter the username and password for allowing them to access this proxy endpoint
@@ -49,6 +51,31 @@Exclude specific paths from the basic auth interface. Useful if you are hosting services require remote API access.
+| Username | +Password | +Remove | +
|---|---|---|
| No Path Excluded | +||