Skip to content

fix: store HTTP response body as raw string #723

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.

Sign up for GitHub

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

Draft
alexluong wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: store HTTP response body as raw string #723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 7 additions & 30 deletions internal/destregistry/providers/destwebhook/httphelper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package destwebhook

import (
"context"
"encoding/json"
"fmt"
"io"
"net/http"
Expand Down Expand Up @@ -51,15 +50,8 @@ func ExecuteHTTPRequest(ctx context.Context, client *http.Client, req *http.Requ
// Extract body for error details
var bodyStr string
if delivery.Response != nil {
if body, ok := delivery.Response["body"]; ok {
switch v := body.(type) {
case string:
bodyStr = v
case map[string]interface{}:
if jsonBytes, err := json.Marshal(v); err == nil {
bodyStr = string(jsonBytes)
}
}
if body, ok := delivery.Response["body"].(string); ok {
bodyStr = body
}
}

Expand Down Expand Up @@ -131,27 +123,12 @@ func ClassifyNetworkError(err error) string {
}
}

// ParseHTTPResponse reads and parses the HTTP response body into the delivery.
// ParseHTTPResponse reads the HTTP response body into the delivery as a raw string.
// The body is stored verbatim regardless of content type to preserve data integrity.
func ParseHTTPResponse(delivery *destregistry.Delivery, resp *http.Response) {
bodyBytes, _ := io.ReadAll(resp.Body)

if strings.Contains(resp.Header.Get("Content-Type"), "application/json") {
var response map[string]interface{}
if err := json.Unmarshal(bodyBytes, &response); err != nil {
delivery.Response = map[string]interface{}{
"status": resp.StatusCode,
"body": string(bodyBytes),
}
return
}
delivery.Response = map[string]interface{}{
"status": resp.StatusCode,
"body": response,
}
} else {
delivery.Response = map[string]interface{}{
"status": resp.StatusCode,
"body": string(bodyBytes),
}
delivery.Response = map[string]interface{}{
"status": resp.StatusCode,
"body": string(bodyBytes),
}
}
Loading