summaryrefslogtreecommitdiff
path: root/tests/plugins/http
diff options
context:
space:
mode:
Diffstat (limited to 'tests/plugins/http')
-rw-r--r--tests/plugins/http/configs/.rr-env.yaml6
-rw-r--r--tests/plugins/http/configs/.rr-http.yaml4
-rw-r--r--tests/plugins/http/handler_test.go100
-rw-r--r--tests/plugins/http/http_plugin_test.go66
-rw-r--r--tests/plugins/http/response_test.go14
-rw-r--r--tests/plugins/http/uploads_test.go16
6 files changed, 99 insertions, 107 deletions
diff --git a/tests/plugins/http/configs/.rr-env.yaml b/tests/plugins/http/configs/.rr-env.yaml
index 99358b04..4ea8ec73 100644
--- a/tests/plugins/http/configs/.rr-env.yaml
+++ b/tests/plugins/http/configs/.rr-env.yaml
@@ -3,17 +3,13 @@ rpc:
server:
command: "php ../../http/client.php env pipes"
- user: ""
- group: ""
- env:
- "env_key": "ENV_VALUE"
relay: "pipes"
relay_timeout: "20s"
http:
address: 127.0.0.1:12084
max_request_size: 1024
- middleware: [ "" ]
+ middleware: []
env:
"RR_HTTP": "true"
"env_key": "ENV_VALUE"
diff --git a/tests/plugins/http/configs/.rr-http.yaml b/tests/plugins/http/configs/.rr-http.yaml
index c95bc049..b4910160 100644
--- a/tests/plugins/http/configs/.rr-http.yaml
+++ b/tests/plugins/http/configs/.rr-http.yaml
@@ -3,10 +3,6 @@ rpc:
server:
command: "php ../../http/client.php echo pipes"
- user: ""
- group: ""
- env:
- "RR_HTTP": "true"
relay: "pipes"
relay_timeout: "20s"
diff --git a/tests/plugins/http/handler_test.go b/tests/plugins/http/handler_test.go
index 40e3a720..c8709678 100644
--- a/tests/plugins/http/handler_test.go
+++ b/tests/plugins/http/handler_test.go
@@ -26,7 +26,7 @@ func TestHandler_Echo(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "echo", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -56,7 +56,7 @@ func TestHandler_Echo(t *testing.T) {
}(hs)
time.Sleep(time.Millisecond * 10)
- body, r, err := get("http://localhost:8177/?hello=world")
+ body, r, err := get("http://127.0.0.1:8177/?hello=world")
assert.NoError(t, err)
defer func() {
_ = r.Body.Close()
@@ -77,7 +77,7 @@ func TestHandler_Headers(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "header", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -111,7 +111,7 @@ func TestHandler_Headers(t *testing.T) {
}()
time.Sleep(time.Millisecond * 100)
- req, err := http.NewRequest("GET", "http://localhost:8078?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:8078?hello=world", nil)
assert.NoError(t, err)
req.Header.Add("input", "sample")
@@ -138,7 +138,7 @@ func TestHandler_Empty_User_Agent(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "user-agent", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -172,7 +172,7 @@ func TestHandler_Empty_User_Agent(t *testing.T) {
}()
time.Sleep(time.Millisecond * 10)
- req, err := http.NewRequest("GET", "http://localhost:19658?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:19658?hello=world", nil)
assert.NoError(t, err)
req.Header.Add("user-agent", "")
@@ -198,7 +198,7 @@ func TestHandler_User_Agent(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "user-agent", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -232,7 +232,7 @@ func TestHandler_User_Agent(t *testing.T) {
}()
time.Sleep(time.Millisecond * 10)
- req, err := http.NewRequest("GET", "http://localhost:25688?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:25688?hello=world", nil)
assert.NoError(t, err)
req.Header.Add("User-Agent", "go-agent")
@@ -258,7 +258,7 @@ func TestHandler_Cookies(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "cookie", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -292,7 +292,7 @@ func TestHandler_Cookies(t *testing.T) {
}()
time.Sleep(time.Millisecond * 10)
- req, err := http.NewRequest("GET", "http://localhost:8079", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:8079", nil)
assert.NoError(t, err)
req.AddCookie(&http.Cookie{Name: "input", Value: "input-value"})
@@ -323,7 +323,7 @@ func TestHandler_JsonPayload_POST(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "payload", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -359,7 +359,7 @@ func TestHandler_JsonPayload_POST(t *testing.T) {
req, err := http.NewRequest(
"POST",
- "http://localhost"+hs.Addr,
+ "http://127.0.0.1"+hs.Addr,
bytes.NewBufferString(`{"key":"value"}`),
)
assert.NoError(t, err)
@@ -387,7 +387,7 @@ func TestHandler_JsonPayload_PUT(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "payload", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -421,7 +421,7 @@ func TestHandler_JsonPayload_PUT(t *testing.T) {
}()
time.Sleep(time.Millisecond * 10)
- req, err := http.NewRequest("PUT", "http://localhost"+hs.Addr, bytes.NewBufferString(`{"key":"value"}`))
+ req, err := http.NewRequest("PUT", "http://127.0.0.1"+hs.Addr, bytes.NewBufferString(`{"key":"value"}`))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/json")
@@ -447,7 +447,7 @@ func TestHandler_JsonPayload_PATCH(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "payload", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -481,7 +481,7 @@ func TestHandler_JsonPayload_PATCH(t *testing.T) {
}()
time.Sleep(time.Millisecond * 10)
- req, err := http.NewRequest("PATCH", "http://localhost"+hs.Addr, bytes.NewBufferString(`{"key":"value"}`))
+ req, err := http.NewRequest("PATCH", "http://127.0.0.1"+hs.Addr, bytes.NewBufferString(`{"key":"value"}`))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/json")
@@ -507,7 +507,7 @@ func TestHandler_FormData_POST(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -552,7 +552,7 @@ func TestHandler_FormData_POST(t *testing.T) {
form.Add("arr[c]p", "l")
form.Add("arr[c]z", "")
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, strings.NewReader(form.Encode()))
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, strings.NewReader(form.Encode()))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
@@ -580,7 +580,7 @@ func TestHandler_FormData_POST_Overwrite(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -626,7 +626,7 @@ func TestHandler_FormData_POST_Overwrite(t *testing.T) {
form.Add("arr[c]p", "l")
form.Add("arr[c]z", "")
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, strings.NewReader(form.Encode()))
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, strings.NewReader(form.Encode()))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
@@ -653,7 +653,7 @@ func TestHandler_FormData_POST_Form_UrlEncoded_Charset(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -698,7 +698,7 @@ func TestHandler_FormData_POST_Form_UrlEncoded_Charset(t *testing.T) {
form.Add("arr[c]p", "l")
form.Add("arr[c]z", "")
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, strings.NewReader(form.Encode()))
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, strings.NewReader(form.Encode()))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
@@ -725,7 +725,7 @@ func TestHandler_FormData_PUT(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -770,7 +770,7 @@ func TestHandler_FormData_PUT(t *testing.T) {
form.Add("arr[c]p", "l")
form.Add("arr[c]z", "")
- req, err := http.NewRequest("PUT", "http://localhost"+hs.Addr, strings.NewReader(form.Encode()))
+ req, err := http.NewRequest("PUT", "http://127.0.0.1"+hs.Addr, strings.NewReader(form.Encode()))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
@@ -797,7 +797,7 @@ func TestHandler_FormData_PATCH(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -842,7 +842,7 @@ func TestHandler_FormData_PATCH(t *testing.T) {
form.Add("arr[c]p", "l")
form.Add("arr[c]z", "")
- req, err := http.NewRequest("PATCH", "http://localhost"+hs.Addr, strings.NewReader(form.Encode()))
+ req, err := http.NewRequest("PATCH", "http://127.0.0.1"+hs.Addr, strings.NewReader(form.Encode()))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
@@ -869,7 +869,7 @@ func TestHandler_Multipart_POST(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -956,7 +956,7 @@ func TestHandler_Multipart_POST(t *testing.T) {
t.Errorf("error closing the writer: error %v", err)
}
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, &mb)
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, &mb)
assert.NoError(t, err)
req.Header.Set("Content-Type", w.FormDataContentType())
@@ -983,7 +983,7 @@ func TestHandler_Multipart_PUT(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1070,7 +1070,7 @@ func TestHandler_Multipart_PUT(t *testing.T) {
t.Errorf("error closing the writer: error %v", err)
}
- req, err := http.NewRequest("PUT", "http://localhost"+hs.Addr, &mb)
+ req, err := http.NewRequest("PUT", "http://127.0.0.1"+hs.Addr, &mb)
assert.NoError(t, err)
req.Header.Set("Content-Type", w.FormDataContentType())
@@ -1097,7 +1097,7 @@ func TestHandler_Multipart_PATCH(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "data", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1186,7 +1186,7 @@ func TestHandler_Multipart_PATCH(t *testing.T) {
t.Errorf("error closing the writer: error %v", err)
}
- req, err := http.NewRequest("PATCH", "http://localhost"+hs.Addr, &mb)
+ req, err := http.NewRequest("PATCH", "http://127.0.0.1"+hs.Addr, &mb)
assert.NoError(t, err)
req.Header.Set("Content-Type", w.FormDataContentType())
@@ -1213,7 +1213,7 @@ func TestHandler_Error(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "error", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1247,7 +1247,7 @@ func TestHandler_Error(t *testing.T) {
}()
time.Sleep(time.Millisecond * 10)
- _, r, err := get("http://localhost:8177/?hello=world")
+ _, r, err := get("http://127.0.0.1:8177/?hello=world")
assert.NoError(t, err)
defer func() {
_ = r.Body.Close()
@@ -1259,7 +1259,7 @@ func TestHandler_Error2(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "error2", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1293,7 +1293,7 @@ func TestHandler_Error2(t *testing.T) {
}()
time.Sleep(time.Millisecond * 10)
- _, r, err := get("http://localhost:8177/?hello=world")
+ _, r, err := get("http://127.0.0.1:8177/?hello=world")
assert.NoError(t, err)
defer func() {
_ = r.Body.Close()
@@ -1305,7 +1305,7 @@ func TestHandler_Error3(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "pid", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1344,7 +1344,7 @@ func TestHandler_Error3(t *testing.T) {
b2.Write([]byte(" "))
}
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, b2)
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, b2)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
@@ -1364,7 +1364,7 @@ func TestHandler_ResponseDuration(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "echo", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1409,7 +1409,7 @@ func TestHandler_ResponseDuration(t *testing.T) {
}
})
- body, r, err := get("http://localhost:8177/?hello=world")
+ body, r, err := get("http://127.0.0.1:8177/?hello=world")
assert.NoError(t, err)
defer func() {
_ = r.Body.Close()
@@ -1425,7 +1425,7 @@ func TestHandler_ResponseDurationDelayed(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "echoDelay", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1470,7 +1470,7 @@ func TestHandler_ResponseDurationDelayed(t *testing.T) {
}
})
- body, r, err := get("http://localhost:8177/?hello=world")
+ body, r, err := get("http://127.0.0.1:8177/?hello=world")
assert.NoError(t, err)
defer func() {
_ = r.Body.Close()
@@ -1485,7 +1485,7 @@ func TestHandler_ErrorDuration(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "error", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1530,7 +1530,7 @@ func TestHandler_ErrorDuration(t *testing.T) {
}
})
- _, r, err := get("http://localhost:8177/?hello=world")
+ _, r, err := get("http://127.0.0.1:8177/?hello=world")
assert.NoError(t, err)
defer func() {
_ = r.Body.Close()
@@ -1560,7 +1560,7 @@ func TestHandler_IP(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "ip", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1621,7 +1621,7 @@ func TestHandler_XRealIP(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "ip", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1687,7 +1687,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "ip", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1752,7 +1752,7 @@ func TestHandler_XForwardedFor_NotTrustedRemoteIp(t *testing.T) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "ip", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1800,7 +1800,7 @@ func BenchmarkHandler_Listen_Echo(b *testing.B) {
p, err := pool.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "echo", "pipes") },
pipe.NewPipeFactory(),
- pool.Config{
+ &pool.Config{
NumWorkers: uint64(runtime.NumCPU()),
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -1838,7 +1838,7 @@ func BenchmarkHandler_Listen_Echo(b *testing.B) {
b.ReportAllocs()
bb := "WORLD"
for n := 0; n < b.N; n++ {
- r, err := http.Get("http://localhost:8177/?hello=world")
+ r, err := http.Get("http://127.0.0.1:8177/?hello=world")
if err != nil {
b.Fail()
}
diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go
index c3949911..db62781f 100644
--- a/tests/plugins/http/http_plugin_test.go
+++ b/tests/plugins/http/http_plugin_test.go
@@ -251,7 +251,7 @@ func TestHTTPInformerReset(t *testing.T) {
}
func echoHTTP(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:10084?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:10084?hello=world", nil)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
@@ -371,7 +371,7 @@ func TestSSL(t *testing.T) {
}
func sslNoRedirect(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:8085?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:8085?hello=world", nil)
assert.NoError(t, err)
r, err := sslClient.Do(req)
@@ -393,7 +393,7 @@ func sslNoRedirect(t *testing.T) {
}
func sslEcho(t *testing.T) {
- req, err := http.NewRequest("GET", "https://localhost:8893?hello=world", nil)
+ req, err := http.NewRequest("GET", "https://127.0.0.1:8893?hello=world", nil)
assert.NoError(t, err)
r, err := sslClient.Do(req)
@@ -505,7 +505,7 @@ func TestSSLRedirect(t *testing.T) {
}
func sslRedirect(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:8087?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:8087?hello=world", nil)
assert.NoError(t, err)
r, err := sslClient.Do(req)
@@ -593,7 +593,7 @@ func TestSSLPushPipes(t *testing.T) {
}
func sslPush(t *testing.T) {
- req, err := http.NewRequest("GET", "https://localhost:8894?hello=world", nil)
+ req, err := http.NewRequest("GET", "https://127.0.0.1:8894?hello=world", nil)
assert.NoError(t, err)
r, err := sslClient.Do(req)
@@ -604,7 +604,7 @@ func sslPush(t *testing.T) {
b, err := ioutil.ReadAll(r.Body)
assert.NoError(t, err)
- assert.Equal(t, "", r.Header.Get("Http2-Push"))
+ assert.Equal(t, "", r.Header.Get("Http2-Release"))
assert.NoError(t, err)
assert.Equal(t, 201, r.StatusCode)
@@ -864,7 +864,7 @@ func TestH2CUpgrade(t *testing.T) {
}
func h2cUpgrade(t *testing.T) {
- req, err := http.NewRequest("PRI", "http://localhost:8083?hello=world", nil)
+ req, err := http.NewRequest("PRI", "http://127.0.0.1:8083?hello=world", nil)
if err != nil {
t.Fatal(err)
}
@@ -955,7 +955,7 @@ func TestH2C(t *testing.T) {
}
func h2c(t *testing.T) {
- req, err := http.NewRequest("PRI", "http://localhost:8083?hello=world", nil)
+ req, err := http.NewRequest("PRI", "http://127.0.0.1:8083?hello=world", nil)
if err != nil {
t.Fatal(err)
}
@@ -1047,7 +1047,7 @@ func TestHttpMiddleware(t *testing.T) {
}
func middleware(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:18903?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:18903?hello=world", nil)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
@@ -1062,7 +1062,7 @@ func middleware(t *testing.T) {
err = r.Body.Close()
assert.NoError(t, err)
- req, err = http.NewRequest("GET", "http://localhost:18903/halt", nil)
+ req, err = http.NewRequest("GET", "http://127.0.0.1:18903/halt", nil)
assert.NoError(t, err)
r, err = http.DefaultClient.Do(req)
@@ -1127,7 +1127,7 @@ logs:
mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes()
mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).MinTimes(1)
- mockLogger.EXPECT().Debug("201 GET http://localhost:34999/?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
+ mockLogger.EXPECT().Debug("201 GET http://127.0.0.1:34999/?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Info("WORLD").MinTimes(1)
mockLogger.EXPECT().Debug("worker event received", "event", events.EventWorkerLog, "worker state", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Error(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() // placeholder for the workerlogerror
@@ -1193,7 +1193,7 @@ logs:
}
func echoError(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:34999?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:34999?hello=world", nil)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
@@ -1278,7 +1278,7 @@ func TestHttpEnvVariables(t *testing.T) {
}
func envVarsTest(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:12084", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:12084", nil)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
@@ -1432,7 +1432,7 @@ func TestHTTPSupervisedPool(t *testing.T) {
}
func echoHTTP2(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:18888?hello=world", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:18888?hello=world", nil)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
@@ -1638,7 +1638,7 @@ func bigEchoHTTP(t *testing.T) {
bt := bytes.NewBuffer(buf)
- req, err := http.NewRequest("GET", "http://localhost:10085?hello=world", bt)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:10085?hello=world", bt)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
@@ -1723,7 +1723,7 @@ func TestStaticEtagPlugin(t *testing.T) {
func serveStaticSampleEtag(t *testing.T) {
// OK 200 response
- b, r, err := get("http://localhost:21603/sample.txt")
+ b, r, err := get("http://127.0.0.1:21603/sample.txt")
assert.NoError(t, err)
assert.Equal(t, "sample\n", b)
assert.Equal(t, r.StatusCode, http.StatusOK)
@@ -1736,7 +1736,7 @@ func serveStaticSampleEtag(t *testing.T) {
Timeout: time.Second * 5,
}
- parsedURL, _ := url.Parse("http://localhost:21603/sample.txt")
+ parsedURL, _ := url.Parse("http://127.0.0.1:21603/sample.txt")
req := &http.Request{
Method: http.MethodGet,
@@ -1828,7 +1828,7 @@ func serveStaticSampleNotAllowedPath(t *testing.T) {
parsedURL := &url.URL{
Scheme: "http",
User: nil,
- Host: "localhost:21603",
+ Host: "127.0.0.1:21603",
Path: "%2e%2e%/tests/",
}
@@ -1845,7 +1845,7 @@ func serveStaticSampleNotAllowedPath(t *testing.T) {
parsedURL = &url.URL{
Scheme: "http",
User: nil,
- Host: "localhost:21603",
+ Host: "127.0.0.1:21603",
Path: "%2e%2e%5ctests/",
}
@@ -1862,7 +1862,7 @@ func serveStaticSampleNotAllowedPath(t *testing.T) {
parsedURL = &url.URL{
Scheme: "http",
User: nil,
- Host: "localhost:21603",
+ Host: "127.0.0.1:21603",
Path: "..%2ftests/",
}
@@ -1879,7 +1879,7 @@ func serveStaticSampleNotAllowedPath(t *testing.T) {
parsedURL = &url.URL{
Scheme: "http",
User: nil,
- Host: "localhost:21603",
+ Host: "127.0.0.1:21603",
Path: "%2e%2e%2ftests/",
}
@@ -1893,7 +1893,7 @@ func serveStaticSampleNotAllowedPath(t *testing.T) {
assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
_ = resp.Body.Close()
- _, r, err := get("http://localhost:21603/../../../../tests/../static/sample.txt")
+ _, r, err := get("http://127.0.0.1:21603/../../../../tests/../static/sample.txt")
assert.NoError(t, err)
assert.Equal(t, 403, r.StatusCode)
_ = r.Body.Close()
@@ -1971,7 +1971,7 @@ func TestStaticPlugin(t *testing.T) {
}
func staticHeaders(t *testing.T) {
- req, err := http.NewRequest("GET", "http://localhost:21603/client.php", nil)
+ req, err := http.NewRequest("GET", "http://127.0.0.1:21603/client.php", nil)
if err != nil {
t.Fatal(err)
}
@@ -1999,7 +1999,7 @@ func staticHeaders(t *testing.T) {
}
func staticNotForbid(t *testing.T) {
- b, r, err := get("http://localhost:21603/client.php")
+ b, r, err := get("http://127.0.0.1:21603/client.php")
assert.NoError(t, err)
assert.Equal(t, all("../../../tests/client.php"), b)
assert.Equal(t, all("../../../tests/client.php"), b)
@@ -2007,7 +2007,7 @@ func staticNotForbid(t *testing.T) {
}
func serveStaticSample(t *testing.T) {
- b, r, err := get("http://localhost:21603/sample.txt")
+ b, r, err := get("http://127.0.0.1:21603/sample.txt")
assert.NoError(t, err)
assert.Equal(t, "sample\n", b)
_ = r.Body.Close()
@@ -2104,7 +2104,7 @@ func TestStaticFilesDisabled(t *testing.T) {
}
func staticFilesDisabled(t *testing.T) {
- b, r, err := get("http://localhost:45877/client.php?hello=world")
+ b, r, err := get("http://127.0.0.1:45877/client.php?hello=world")
if err != nil {
t.Fatal(err)
}
@@ -2126,9 +2126,9 @@ func TestStaticFilesForbid(t *testing.T) {
mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).AnyTimes()
mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).AnyTimes()
- mockLogger.EXPECT().Debug("201 GET http://localhost:34653/http?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
- mockLogger.EXPECT().Debug("201 GET http://localhost:34653/client.XXX?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
- mockLogger.EXPECT().Debug("201 GET http://localhost:34653/client.php?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
+ mockLogger.EXPECT().Debug("201 GET http://127.0.0.1:34653/http?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
+ mockLogger.EXPECT().Debug("201 GET http://127.0.0.1:34653/client.XXX?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
+ mockLogger.EXPECT().Debug("201 GET http://127.0.0.1:34653/client.php?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Error("file open error", "error", gomock.Any()).AnyTimes()
mockLogger.EXPECT().Debug("no such file or directory", "error", gomock.Any()).AnyTimes()
mockLogger.EXPECT().Debug("possible path to dir provided").AnyTimes()
@@ -2198,19 +2198,19 @@ func TestStaticFilesForbid(t *testing.T) {
}
func staticTestFilesDir(t *testing.T) {
- b, r, err := get("http://localhost:34653/http?hello=world")
+ b, r, err := get("http://127.0.0.1:34653/http?hello=world")
assert.NoError(t, err)
assert.Equal(t, "WORLD", b)
_ = r.Body.Close()
}
func staticNotFound(t *testing.T) {
- b, _, _ := get("http://localhost:34653/client.XXX?hello=world") //nolint:bodyclose
+ b, _, _ := get("http://127.0.0.1:34653/client.XXX?hello=world") //nolint:bodyclose
assert.Equal(t, "WORLD", b)
}
func staticFilesForbid(t *testing.T) {
- b, r, err := get("http://localhost:34653/client.php?hello=world")
+ b, r, err := get("http://127.0.0.1:34653/client.php?hello=world")
if err != nil {
t.Fatal(err)
}
@@ -2288,7 +2288,7 @@ func TestHTTPIssue659(t *testing.T) {
}
func echoIssue659(t *testing.T) {
- req, err := http.NewRequest(http.MethodGet, "http://localhost:32552", nil)
+ req, err := http.NewRequest(http.MethodGet, "http://127.0.0.1:32552", nil)
assert.NoError(t, err)
r, err := http.DefaultClient.Do(req)
diff --git a/tests/plugins/http/response_test.go b/tests/plugins/http/response_test.go
index 276c22ef..f754429d 100644
--- a/tests/plugins/http/response_test.go
+++ b/tests/plugins/http/response_test.go
@@ -45,13 +45,13 @@ func (tw *testWriter) Push(target string, opts *http.PushOptions) error {
}
func TestNewResponse_Error(t *testing.T) {
- r, err := handler.NewResponse(payload.Payload{Context: []byte(`invalid payload`)})
+ r, err := handler.NewResponse(&payload.Payload{Context: []byte(`invalid payload`)})
assert.Error(t, err)
assert.Nil(t, r)
}
func TestNewResponse_Write(t *testing.T) {
- r, err := handler.NewResponse(payload.Payload{
+ r, err := handler.NewResponse(&payload.Payload{
Context: []byte(`{"headers":{"key":["value"]},"status": 301}`),
Body: []byte(`sample body`),
})
@@ -68,7 +68,7 @@ func TestNewResponse_Write(t *testing.T) {
}
func TestNewResponse_Stream(t *testing.T) {
- r, err := handler.NewResponse(payload.Payload{
+ r, err := handler.NewResponse(&payload.Payload{
Context: []byte(`{"headers":{"key":["value"]},"status": 301}`),
})
@@ -93,7 +93,7 @@ func TestNewResponse_Stream(t *testing.T) {
}
func TestNewResponse_StreamError(t *testing.T) {
- r, err := handler.NewResponse(payload.Payload{
+ r, err := handler.NewResponse(&payload.Payload{
Context: []byte(`{"headers":{"key":["value"]},"status": 301}`),
})
@@ -114,7 +114,7 @@ func TestNewResponse_StreamError(t *testing.T) {
}
func TestWrite_HandlesPush(t *testing.T) {
- r, err := handler.NewResponse(payload.Payload{
+ r, err := handler.NewResponse(&payload.Payload{
Context: []byte(`{"headers":{"Http2-Push":["/test.js"],"content-type":["text/html"]},"status": 200}`),
})
@@ -129,7 +129,7 @@ func TestWrite_HandlesPush(t *testing.T) {
}
func TestWrite_HandlesTrailers(t *testing.T) {
- r, err := handler.NewResponse(payload.Payload{
+ r, err := handler.NewResponse(&payload.Payload{
Context: []byte(`{"headers":{"Trailer":["foo, bar", "baz"],"foo":["test"],"bar":["demo"]},"status": 200}`),
})
@@ -148,7 +148,7 @@ func TestWrite_HandlesTrailers(t *testing.T) {
}
func TestWrite_HandlesHandlesWhitespacesInTrailer(t *testing.T) {
- r, err := handler.NewResponse(payload.Payload{
+ r, err := handler.NewResponse(&payload.Payload{
Context: []byte(
`{"headers":{"Trailer":["foo\t,bar , baz"],"foo":["a"],"bar":["b"],"baz":["c"]},"status": 200}`),
})
diff --git a/tests/plugins/http/uploads_test.go b/tests/plugins/http/uploads_test.go
index df696668..54f2bead 100644
--- a/tests/plugins/http/uploads_test.go
+++ b/tests/plugins/http/uploads_test.go
@@ -31,7 +31,7 @@ func TestHandler_Upload_File(t *testing.T) {
pool, err := poolImpl.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "upload", "pipes") },
pipe.NewPipeFactory(),
- poolImpl.Config{
+ &poolImpl.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -85,7 +85,7 @@ func TestHandler_Upload_File(t *testing.T) {
t.Errorf("error closing the file: error %v", err)
}
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, &mb)
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, &mb)
assert.NoError(t, err)
req.Header.Set("Content-Type", w.FormDataContentType())
@@ -114,7 +114,7 @@ func TestHandler_Upload_NestedFile(t *testing.T) {
pool, err := poolImpl.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "upload", "pipes") },
pipe.NewPipeFactory(),
- poolImpl.Config{
+ &poolImpl.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -168,7 +168,7 @@ func TestHandler_Upload_NestedFile(t *testing.T) {
t.Errorf("error closing the file: error %v", err)
}
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, &mb)
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, &mb)
assert.NoError(t, err)
req.Header.Set("Content-Type", w.FormDataContentType())
@@ -197,7 +197,7 @@ func TestHandler_Upload_File_NoTmpDir(t *testing.T) {
pool, err := poolImpl.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "upload", "pipes") },
pipe.NewPipeFactory(),
- poolImpl.Config{
+ &poolImpl.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -251,7 +251,7 @@ func TestHandler_Upload_File_NoTmpDir(t *testing.T) {
t.Errorf("error closing the file: error %v", err)
}
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, &mb)
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, &mb)
assert.NoError(t, err)
req.Header.Set("Content-Type", w.FormDataContentType())
@@ -280,7 +280,7 @@ func TestHandler_Upload_File_Forbids(t *testing.T) {
pool, err := poolImpl.Initialize(context.Background(),
func() *exec.Cmd { return exec.Command("php", "../../http/client.php", "upload", "pipes") },
pipe.NewPipeFactory(),
- poolImpl.Config{
+ &poolImpl.Config{
NumWorkers: 1,
AllocateTimeout: time.Second * 1000,
DestroyTimeout: time.Second * 1000,
@@ -334,7 +334,7 @@ func TestHandler_Upload_File_Forbids(t *testing.T) {
t.Errorf("error closing the file: error %v", err)
}
- req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, &mb)
+ req, err := http.NewRequest("POST", "http://127.0.0.1"+hs.Addr, &mb)
assert.NoError(t, err)
req.Header.Set("Content-Type", w.FormDataContentType())
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 02:45:57 +0000