mirror of
https://github.com/fatedier/frp.git
synced 2025-07-29 09:18:11 +00:00
type http/tcpmux proxy support route_by_http_user, tcpmux support passthourgh mode (#2932)
This commit is contained in:
@@ -10,7 +10,6 @@ import (
|
||||
"github.com/fatedier/frp/test/e2e/framework/consts"
|
||||
"github.com/fatedier/frp/test/e2e/mock/server/httpserver"
|
||||
"github.com/fatedier/frp/test/e2e/pkg/request"
|
||||
"github.com/fatedier/frp/test/e2e/pkg/utils"
|
||||
|
||||
"github.com/gorilla/websocket"
|
||||
. "github.com/onsi/ginkgo"
|
||||
@@ -59,28 +58,83 @@ var _ = Describe("[Feature: HTTP]", func() {
|
||||
|
||||
f.RunProcesses([]string{serverConf}, []string{clientConf})
|
||||
|
||||
// foo path
|
||||
framework.NewRequestExpect(f).Explain("foo path").Port(vhostHTTPPort).
|
||||
tests := []struct {
|
||||
path string
|
||||
expectResp string
|
||||
desc string
|
||||
}{
|
||||
{path: "/foo", expectResp: "foo", desc: "foo path"},
|
||||
{path: "/bar", expectResp: "bar", desc: "bar path"},
|
||||
{path: "/other", expectResp: "foo", desc: "other path"},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
framework.NewRequestExpect(f).Explain(test.desc).Port(vhostHTTPPort).
|
||||
RequestModify(func(r *request.Request) {
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPPath(test.path)
|
||||
}).
|
||||
ExpectResp([]byte(test.expectResp)).
|
||||
Ensure()
|
||||
}
|
||||
})
|
||||
|
||||
It("HTTP route by HTTP user", func() {
|
||||
vhostHTTPPort := f.AllocPort()
|
||||
serverConf := getDefaultServerConf(vhostHTTPPort)
|
||||
|
||||
fooPort := f.AllocPort()
|
||||
f.RunServer("", newHTTPServer(fooPort, "foo"))
|
||||
|
||||
barPort := f.AllocPort()
|
||||
f.RunServer("", newHTTPServer(barPort, "bar"))
|
||||
|
||||
otherPort := f.AllocPort()
|
||||
f.RunServer("", newHTTPServer(otherPort, "other"))
|
||||
|
||||
clientConf := consts.DefaultClientConfig
|
||||
clientConf += fmt.Sprintf(`
|
||||
[foo]
|
||||
type = http
|
||||
local_port = %d
|
||||
custom_domains = normal.example.com
|
||||
route_by_http_user = user1
|
||||
|
||||
[bar]
|
||||
type = http
|
||||
local_port = %d
|
||||
custom_domains = normal.example.com
|
||||
route_by_http_user = user2
|
||||
|
||||
[catchAll]
|
||||
type = http
|
||||
local_port = %d
|
||||
custom_domains = normal.example.com
|
||||
`, fooPort, barPort, otherPort)
|
||||
|
||||
f.RunProcesses([]string{serverConf}, []string{clientConf})
|
||||
|
||||
// user1
|
||||
framework.NewRequestExpect(f).Explain("user1").Port(vhostHTTPPort).
|
||||
RequestModify(func(r *request.Request) {
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPPath("/foo")
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPAuth("user1", "")
|
||||
}).
|
||||
ExpectResp([]byte("foo")).
|
||||
Ensure()
|
||||
|
||||
// bar path
|
||||
framework.NewRequestExpect(f).Explain("bar path").Port(vhostHTTPPort).
|
||||
// user2
|
||||
framework.NewRequestExpect(f).Explain("user2").Port(vhostHTTPPort).
|
||||
RequestModify(func(r *request.Request) {
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPPath("/bar")
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPAuth("user2", "")
|
||||
}).
|
||||
ExpectResp([]byte("bar")).
|
||||
Ensure()
|
||||
|
||||
// other path
|
||||
framework.NewRequestExpect(f).Explain("other path").Port(vhostHTTPPort).
|
||||
// other user
|
||||
framework.NewRequestExpect(f).Explain("other user").Port(vhostHTTPPort).
|
||||
RequestModify(func(r *request.Request) {
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPPath("/other")
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPAuth("user3", "")
|
||||
}).
|
||||
ExpectResp([]byte("foo")).
|
||||
ExpectResp([]byte("other")).
|
||||
Ensure()
|
||||
})
|
||||
|
||||
@@ -110,18 +164,14 @@ var _ = Describe("[Feature: HTTP]", func() {
|
||||
// set incorrect auth header
|
||||
framework.NewRequestExpect(f).Port(vhostHTTPPort).
|
||||
RequestModify(func(r *request.Request) {
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPHeaders(map[string]string{
|
||||
"Authorization": utils.BasicAuth("test", "invalid"),
|
||||
})
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPAuth("test", "invalid")
|
||||
}).
|
||||
Ensure(framework.ExpectResponseCode(401))
|
||||
|
||||
// set correct auth header
|
||||
framework.NewRequestExpect(f).Port(vhostHTTPPort).
|
||||
RequestModify(func(r *request.Request) {
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPHeaders(map[string]string{
|
||||
"Authorization": utils.BasicAuth("test", "test"),
|
||||
})
|
||||
r.HTTP().HTTPHost("normal.example.com").HTTPAuth("test", "test")
|
||||
}).
|
||||
Ensure()
|
||||
})
|
||||
|
Reference in New Issue
Block a user