umputun/reproxy
1
1
Fork 0
mirror of https://github.com/umputun/reproxy.git synced 2024-11-26 22:53:47 +03:00
Code Issues Projects Releases Wiki Activity

fix redirects for docker provider

Browse Source
This commit is contained in:
Umputun 2023-02-25 22:30:54 -06:00
parent 22063f08cd
commit ca65980093
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/discovery/provider/docker.go
View File

@ -119,8 +119,8 @@ func (d *Docker) parseContainerInfo(c containerInfo) (res []discovery.URLMapper)
if v, ok := d.labelN(c.Labels, n, "dest"); ok { if v, ok := d.labelN(c.Labels, n, "dest"); ok {
enabled, explicit = true, true enabled, explicit = true, true
if strings.HasPrefix(v, "http://") || strings.HasPrefix(v, "https://") { if strings.HasPrefix(v, "http://") || strings.HasPrefix(v, "https://") || strings.HasPrefix(v, "@") {
destURL = v // proxy to http:// and https:// destinations as-is destURL = v // proxy to http:// and https://, or redirect - destinations as-is, don't add host and port
} else { } else {
destURL = fmt.Sprintf("http://%s:%d%s", c.IP, port, v) destURL = fmt.Sprintf("http://%s:%d%s", c.IP, port, v)
} }

29
app/discovery/provider/docker_test.go
View File

@ -187,6 +187,10 @@ func TestDocker_ListMultiFallBack(t *testing.T) {
"reproxy.2.server": "m2.example.com", "reproxy.2.route": "^/a/2/(.*)", "reproxy.2.server": "m2.example.com", "reproxy.2.route": "^/a/2/(.*)",
"reproxy.2.dest": "/a/2/$1", "reproxy.2.assets": "/web2:/var/www2", "reproxy.2.dest": "/a/2/$1", "reproxy.2.assets": "/web2:/var/www2",
"reproxy.3.server": "feedmaster.umputun.com",
"reproxy.3.route": "^/feed/echo-msk/source/(.*)",
"reproxy.3.dest": "https://master.feed-master.com/feed/echo-msk/source/@1",
}, },
}, },
}, nil }, nil
@ -196,24 +200,29 @@ func TestDocker_ListMultiFallBack(t *testing.T) {
d := Docker{DockerClient: dclient} d := Docker{DockerClient: dclient}
res, err := d.List() res, err := d.List()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 5, len(res), "3 proxy, 2 assets") require.Equal(t, 6, len(res), "4 proxy, 2 assets")
assert.Equal(t, "^/a/1/(.*)", res[0].SrcMatch.String()) assert.Equal(t, "^/feed/echo-msk/source/(.*)", res[0].SrcMatch.String())
assert.Equal(t, "http://127.0.0.2:12348/a/1/$1", res[0].Dst) assert.Equal(t, "https://master.feed-master.com/feed/echo-msk/source/@1", res[0].Dst)
assert.Equal(t, "example.com", res[0].Server) assert.Equal(t, "feedmaster.umputun.com", res[0].Server)
assert.Equal(t, "http://127.0.0.2:12348/ping", res[0].PingURL) assert.Equal(t, "http://127.0.0.2:12348/ping", res[0].PingURL)
assert.Equal(t, "^/a/2/(.*)", res[1].SrcMatch.String()) assert.Equal(t, "^/a/1/(.*)", res[1].SrcMatch.String())
assert.Equal(t, "http://127.0.0.2:12348/a/2/$1", res[1].Dst) assert.Equal(t, "http://127.0.0.2:12348/a/1/$1", res[1].Dst)
assert.Equal(t, "example.com", res[1].Server)
assert.Equal(t, "http://127.0.0.2:12348/ping", res[1].PingURL) assert.Equal(t, "http://127.0.0.2:12348/ping", res[1].PingURL)
assert.Equal(t, "m2.example.com", res[1].Server)
assert.Equal(t, "^/a/2/(.*)", res[2].SrcMatch.String()) assert.Equal(t, "^/a/2/(.*)", res[2].SrcMatch.String())
assert.Equal(t, "http://127.0.0.2:12348/a/2/$1", res[2].Dst) assert.Equal(t, "http://127.0.0.2:12348/a/2/$1", res[2].Dst)
assert.Equal(t, "http://127.0.0.2:12348/ping", res[2].PingURL) assert.Equal(t, "http://127.0.0.2:12348/ping", res[2].PingURL)
assert.Equal(t, "m2.example.com", res[2].Server) assert.Equal(t, "m2.example.com", res[2].Server)
assert.Equal(t, "/web2", res[2].AssetsWebRoot)
assert.Equal(t, "/var/www2", res[2].AssetsLocation) assert.Equal(t, "^/a/2/(.*)", res[3].SrcMatch.String())
assert.Equal(t, "http://127.0.0.2:12348/a/2/$1", res[3].Dst)
assert.Equal(t, "http://127.0.0.2:12348/ping", res[3].PingURL)
assert.Equal(t, "m2.example.com", res[3].Server)
assert.Equal(t, "/web2", res[3].AssetsWebRoot)
assert.Equal(t, "/var/www2", res[3].AssetsLocation)
} }
func TestDocker_ListWithAutoAPI(t *testing.T) { func TestDocker_ListWithAutoAPI(t *testing.T) {
@ -398,6 +407,8 @@ func TestDocker_labelN(t *testing.T) {
{map[string]string{"a": "123", "reproxy.1.port": "9999"}, 1, "port", "9999", true}, {map[string]string{"a": "123", "reproxy.1.port": "9999"}, 1, "port", "9999", true},
{map[string]string{"a": "123", "reproxy.1.port": "9999", "reproxy.0.port": "7777"}, 1, "port", "9999", true}, {map[string]string{"a": "123", "reproxy.1.port": "9999", "reproxy.0.port": "7777"}, 1, "port", "9999", true},
{map[string]string{"a": "123", "reproxy.1.port": "9999", "reproxy.0.port": "7777"}, 0, "port", "7777", true}, {map[string]string{"a": "123", "reproxy.1.port": "9999", "reproxy.0.port": "7777"}, 0, "port", "7777", true},
{map[string]string{"reproxy.2.dest": "@302 https://master.feed-master.com/feed/echo-msk/source/@1"}, 2, "dest",
"@302 https://master.feed-master.com/feed/echo-msk/source/@1", true},
} }
d := Docker{} d := Docker{}