kemko/reproxy
1
0
Fork 0
mirror of https://github.com/kemko/reproxy.git synced 2026-01-01 15:55:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix static match on / url

Browse Source
This commit is contained in:
Umputun
2021-06-08 03:28:30 -05:00
parent 3497599d03
commit 3fb723c8b9
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/discovery/discovery.go
View File

@@ -175,14 +175,18 @@ func (s *Service) Match(srv, src string) (res Matches) {
res.Routes = append(res.Routes, MatchedRoute{Destination: dest, Alive: m.IsAlive(), Mapper: m})
}
case MTStatic:
if src == m.AssetsWebRoot || strings.HasPrefix(src, m.AssetsWebRoot+"/") {
wr := m.AssetsWebRoot
if wr != "/" {
wr += "/"
}
if src == m.AssetsWebRoot || strings.HasPrefix(src, wr) {
res.MatchType = MTStatic
destSfx := ":norm"
if m.AssetsSPA {
destSfx = ":spa"
}
res.Routes = append(res.Routes, MatchedRoute{
Destination: m.AssetsWebRoot + ":" + m.AssetsLocation + destSfx, Alive: true})
Destination: m.AssetsWebRoot + ":" + m.AssetsLocation + destSfx, Alive: true, Mapper: m})
return res
}
}
@@ -350,13 +354,17 @@ func (s *Service) extendMapper(m URLMapper) URLMapper {
// static match with assets uses AssetsWebRoot and AssetsLocation
if m.MatchType == MTStatic && m.AssetsWebRoot != "" && m.AssetsLocation != "" {
m.AssetsWebRoot = strings.TrimSuffix(m.AssetsWebRoot, "/")
if m.AssetsWebRoot != "/" {
m.AssetsWebRoot = strings.TrimSuffix(m.AssetsWebRoot, "/")
}
m.AssetsLocation = strings.TrimSuffix(m.AssetsLocation, "/") + "/"
}
// static match without assets defined defaulted to src:dst/
if m.MatchType == MTStatic && m.AssetsWebRoot == "" && m.AssetsLocation == "" {
m.AssetsWebRoot = strings.TrimSuffix(src, "/")
if src != "/" {
m.AssetsWebRoot = strings.TrimSuffix(src, "/")
}
m.AssetsLocation = strings.TrimSuffix(m.Dst, "/") + "/"
}

7
app/discovery/discovery_test.go
View File

@@ -112,6 +112,8 @@ func TestService_Match(t *testing.T) {
{SrcMatch: *regexp.MustCompile("/path/"), Dst: "/var/web/path", ProviderID: PIDocker, MatchType: MTStatic},
{SrcMatch: *regexp.MustCompile("/www2/"), Dst: "/var/web2", ProviderID: PIDocker, MatchType: MTStatic,
AssetsWebRoot: "/www2", AssetsLocation: "/var/web2", AssetsSPA: true},
{SrcMatch: *regexp.MustCompile("/"), Dst: "/var/web0", ProviderID: PIDocker, MatchType: MTStatic,
AssetsWebRoot: "/", AssetsLocation: "/var/web0", AssetsSPA: false, Server: "m22.example.com"},
}, nil
},
}
@@ -122,7 +124,7 @@ func TestService_Match(t *testing.T) {
err := svc.Run(ctx)
require.Error(t, err)
assert.Equal(t, context.DeadlineExceeded, err)
assert.Equal(t, 11, len(svc.Mappers()))
assert.Equal(t, 12, len(svc.Mappers()))
tbl := []struct {
server, src string
@@ -154,13 +156,14 @@ func TestService_Match(t *testing.T) {
{"m1.example.com", "/www", Matches{MTStatic, []MatchedRoute{{Destination: "/www:/var/web/:norm", Alive: true}}}},
{"xyx.example.com", "/path/something", Matches{MTStatic, []MatchedRoute{{Destination: "/path:/var/web/path/:norm", Alive: true}}}},
{"m1.example.com", "/www2", Matches{MTStatic, []MatchedRoute{{Destination: "/www2:/var/web2/:spa", Alive: true}}}},
{"m22.example.com", "/someplace/index.html", Matches{MTStatic, []MatchedRoute{{Destination: "/:/var/web0/:norm", Alive: true}}}},
}
for i, tt := range tbl {
tt := tt
t.Run(strconv.Itoa(i), func(t *testing.T) {
res := svc.Match(tt.server, tt.src)
require.Equal(t, len(tt.res.Routes), len(res.Routes))
require.Equal(t, len(tt.res.Routes), len(res.Routes), res.Routes)
for i := 0; i < len(res.Routes); i++ {
assert.Equal(t, tt.res.Routes[i].Alive, res.Routes[i].Alive)
assert.Equal(t, tt.res.Routes[i].Destination, res.Routes[i].Destination)