serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-06 02:48:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

proxy: use untouched URL for concatenating

Browse source 
Signed-off-by: Tw <tw19881113@gmail.com>
This commit is contained in:
Tw 2017-04-17 11:00:36 +08:00
parent 8d1da68b47
commit 344017dc21
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
caddyhttp/proxy/proxy_test.go
View file

@ -26,6 +26,7 @@ import (
"github.com/mholt/caddy/caddyfile"
"github.com/mholt/caddy/caddyhttp/httpserver"
"github.com/mholt/caddy/caddyhttp/staticfiles"
"golang.org/x/net/websocket"
)
@ -896,10 +897,11 @@ func basicAuthTestcase(t *testing.T, upstreamUser, clientUser *url.Userinfo) {
func TestProxyDirectorURL(t *testing.T) {
for i, c := range []struct {
requestURL string
targetURL string
without string
expectURL string
originalPath string
requestURL string
targetURL string
without string
expectURL string
}{
{
requestURL: `http://localhost:2020/test`,
@ -969,6 +971,12 @@ func TestProxyDirectorURL(t *testing.T) {
targetURL: `https://localhost:2021/%2C`,
expectURL: `https://localhost:2021/%2C/%2C`,
},
{
originalPath: `///test`,
requestURL: `http://localhost:2020/%2F/test`,
targetURL: `https://localhost:2021/`,
expectURL: `https://localhost:2021/%2F/test`,
},
} {
targetURL, err := url.Parse(c.targetURL)
if err != nil {
@ -980,6 +988,8 @@ func TestProxyDirectorURL(t *testing.T) {
t.Errorf("case %d failed to create request: %s", i, err)
continue
}
req = req.WithContext(context.WithValue(req.Context(),
staticfiles.URLPathCtxKey, c.originalPath))
NewSingleHostReverseProxy(targetURL, c.without, 0).Director(req)
if expect, got := c.expectURL, req.URL.String(); expect != got {

9
caddyhttp/proxy/reverseproxy.go
View file

@ -25,6 +25,7 @@ import (
"golang.org/x/net/http2"
"github.com/mholt/caddy/caddyhttp/httpserver"
"github.com/mholt/caddy/caddyhttp/staticfiles"
)
var (
@ -154,7 +155,13 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int) *
prefer(target.RawPath, target.Path),
prefer(req.URL.RawPath, req.URL.Path))
}
req.URL.Path = singleJoiningSlash(target.Path, req.URL.Path)
untouchedPath, _ := req.Context().Value(staticfiles.URLPathCtxKey).(string)
req.URL.Path = singleJoiningSlash(target.Path,
prefer(untouchedPath, req.URL.Path))
// req.URL.Path must be consistent with decoded form of req.URL.RawPath if any
if req.URL.RawPath != "" && req.URL.RawPath != req.URL.EscapedPath() {
panic("RawPath doesn't match Path")
}
// Trims the path of the socket from the URL path.
// This is done because req.URL passed to your proxied service