Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Body Compression Issue Fix #4

Merged
merged 3 commits into from
Sep 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions toxics/httputils/body.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,36 @@ var StatusBodyTemplate = map[int]string{
<body><center><h1>504 Gateway Timeout</h1></body></html>`,
}

func EditResponseBody(r *http.Response, body string) {
r.Body = io.NopCloser(strings.NewReader(body))
func EditResponseBody(r *http.Response, body, encoding, contentType string) {
compressedBody := encodeBody(r, []byte(body), encoding)

r.ContentLength = int64(len(body))
r.Header.Set("Content-Type", getContentType(contentType))
r.Body = io.NopCloser(strings.NewReader(string(compressedBody)))
}

func getContentType(contentType string) string {
if contentType == "" {
contentType = "text/plain"
}
return contentType
}

func encodeBody(r *http.Response, body []byte, encoding string) []byte {
r.Header.Set("Content-Encoding", "")
switch encoding {
case "gzip":
compressedBody, err := Gzip(body)
if err == nil {
r.Header.Set("Content-Encoding", "gzip")
return compressedBody
}
case "deflate":
compressedBody, err := Deflate(body)
if err == nil {
r.Header.Set("Content-Encoding", "deflate")
return compressedBody
}
}
return body
}
30 changes: 30 additions & 0 deletions toxics/httputils/body_encoding.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package httputils

import (
"bytes"
"compress/gzip"
"compress/zlib"
)

func Gzip(body []byte) ([]byte, error) {
var buf bytes.Buffer
gz := gzip.NewWriter(&buf)
if _, err := gz.Write(body); err != nil {
gz.Close()
return nil, err
}
gz.Close()
return buf.Bytes(), nil
}

// Deflate compresses the body using the DEFLATE algorithm.
func Deflate(body []byte) ([]byte, error) {
var buf bytes.Buffer
z := zlib.NewWriter(&buf)
if _, err := z.Write(body); err != nil {
z.Close()
return nil, err
}
z.Close()
return buf.Bytes(), nil
}
2 changes: 1 addition & 1 deletion toxics/httputils/body_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestEditResponseBody(t *testing.T) {

AssertBodyNotEqual(t, body, []byte(checkBody))

httputils.EditResponseBody(resp, checkBody)
httputils.EditResponseBody(resp, checkBody, "", "")

body, _ = io.ReadAll(resp.Body)

Expand Down
12 changes: 2 additions & 10 deletions toxics/httputils/status_code.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,8 @@ func SetHttpStatusCode(r *http.Response, statusCode int) {
// if the status code is not recognized, do not change it
}

func SetResponseBody(r *http.Response, statusCode int, body string) {
if body != "" {
EditResponseBody(r, body)
} else {
setErrorResponseBody(r, statusCode)
}
}

func setErrorResponseBody(r *http.Response, statusCode int) {
func SetErrorResponseBody(r *http.Response, statusCode int) {
if _, exists := StatusBodyTemplate[statusCode]; statusCode >= 200 && statusCode < 600 && exists {
EditResponseBody(r, StatusBodyTemplate[statusCode])
EditResponseBody(r, StatusBodyTemplate[statusCode], "", "text/html")
}
}
4 changes: 2 additions & 2 deletions toxics/httputils/status_code_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestSetResponseBodyWithBody(t *testing.T) {
body, _ := io.ReadAll(resp.Body)
AssertBodyNotEqual(t, body, []byte(checkBody))

httputils.SetResponseBody(resp, 200, checkBody)
httputils.EditResponseBody(resp, checkBody, "", "text/plain")

body, _ = io.ReadAll(resp.Body)
AssertBodyEqual(t, body, []byte(checkBody))
Expand All @@ -57,7 +57,7 @@ func TestSetResponseBodyWithStatusCodeBody(t *testing.T) {
body, _ := io.ReadAll(resp.Body)
AssertBodyNotEqual(t, body, []byte(status500))

httputils.SetResponseBody(resp, 500, "")
httputils.SetErrorResponseBody(resp, 500)

body, _ = io.ReadAll(resp.Body)
AssertBodyEqual(t, body, []byte(status500))
Expand Down
6 changes: 4 additions & 2 deletions toxics/modify_body.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ import (
)

type ModifyBodyToxic struct {
Body string `json:"body"`
Body string `json:"body"`
ContentEnconding string `json:"content_encoding"`
ContentType string `json:"content_type"`
}

func (t *ModifyBodyToxic) ModifyResponseBody(resp *http.Response) {
if t.Body == "" {
return
}
httputils.EditResponseBody(resp, t.Body)
httputils.EditResponseBody(resp, t.Body, t.ContentEnconding, t.ContentType)
}

func (t *ModifyBodyToxic) Pipe(stub *ToxicStub) {
Expand Down
8 changes: 7 additions & 1 deletion toxics/status_code.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ type StatusCodeToxic struct {
StatusCode int `json:"status_code"`
ModifyResponseBody int `json:"modify_response_body"`
ResponseBody string `json:"response_body"`
ContentEnconding string `json:"content_encoding"`
ContentType string `json:"content_type"`
}

func (t *StatusCodeToxic) ModifyResponseCode(resp *http.Response) {
httputils.SetHttpStatusCode(resp, t.StatusCode)

if t.ModifyResponseBody == 1 {
httputils.SetResponseBody(resp, t.StatusCode, t.ResponseBody)
if t.ResponseBody != "" {
httputils.EditResponseBody(resp, t.ResponseBody, t.ContentEnconding, t.ContentType)
} else {
httputils.SetErrorResponseBody(resp, t.StatusCode)
}
}
}

Expand Down