Added RawPath to HttpProxy. Issue fabiolb#486

tuempeltaucher · Jul 25, 2018 · a06f985 · a06f985
1 parent c1498bc
commit a06f985
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/proxy/http_handler.go b/proxy/http_handler.go
@@ -17,6 +17,7 @@ func newHTTPProxy(target *url.URL, tr http.RoundTripper, flush time.Duration) ht
 			req.URL.Scheme = target.Scheme
 			req.URL.Host = target.Host
 			req.URL.Path = target.Path
+			req.URL.RawPath = target.RawPath
 			req.URL.RawQuery = target.RawQuery
 			if _, ok := req.Header["User-Agent"]; !ok {
 				// explicitly disable User-Agent so it's not set to default value

diff --git a/proxy/http_proxy.go b/proxy/http_proxy.go
@@ -96,6 +96,7 @@ func (p *HTTPProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		Scheme:   scheme(r),
 		Host:     r.Host,
 		Path:     r.URL.Path,
+		RawPath:  r.URL.RawPath,
 		RawQuery: r.URL.RawQuery,
 	}
 
@@ -113,6 +114,7 @@ func (p *HTTPProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		Scheme: t.URL.Scheme,
 		Host:   t.URL.Host,
 		Path:   r.URL.Path,
+		RawPath:  r.URL.RawPath,
 	}
 	if t.URL.RawQuery == "" || r.URL.RawQuery == "" {
 		targetURL.RawQuery = t.URL.RawQuery + r.URL.RawQuery
@@ -133,6 +135,9 @@ func (p *HTTPProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if t.StripPath != "" && strings.HasPrefix(r.URL.Path, t.StripPath) {
 		targetURL.Path = targetURL.Path[len(t.StripPath):]
 	}
+        if t.StripPath != "" && strings.HasPrefix(r.URL.RawPath, t.StripPath) {
+		targetURL.RawPath = targetURL.RawPath[len(t.StripPath):]
+        }
 
 	if err := addHeaders(r, p.Config, t.StripPath); err != nil {
 		http.Error(w, "cannot parse "+r.RemoteAddr, http.StatusInternalServerError)