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.

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

Fix and improve backend error handling with passthrough #2407

Merged
merged 2 commits into from
Jun 18, 2018
Merged

Fix and improve backend error handling with passthrough #2407

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16db8fc
Fix and improve backend error hadnling with passthrough
nwmac Jun 18, 2018
e506bdb
Remove use of json.IsValid which is only in go 1.9 onwards
nwmac Jun 18, 2018
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
59 changes: 53 additions & 6 deletions src/backend/app-core/passthrough.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ import (
// API Host Prefix to replace if the custom header is supplied
const apiPrefix = "api."

type PassthroughErrorStatus struct {
StatusCode int `json:"statusCode"`
Status string `json:"status"`
}

type PassthroughError struct {
Error *PassthroughErrorStatus `json:"error"`
ErrorResponse *json.RawMessage `json:"errorResponse"`
}

func getEchoURL(c echo.Context) url.URL {
log.Debug("getEchoURL")
u := c.Request().URL().(*standard.URL).URL
Expand Down Expand Up @@ -83,24 +93,44 @@ func buildJSONResponse(cnsiList []string, responses map[string]*interfaces.CNSIR
for _, guid := range cnsiList {
var response []byte
cnsiResponse, ok := responses[guid]
var errorStatus = &PassthroughErrorStatus{
StatusCode: -1,
}
var errorResponse []byte
switch {
case !ok:
response = []byte(`{"error": {"statusCode": 500, "status": "Request timed out"}}`)
errorStatus.StatusCode = 500
errorStatus.Status = "Request timed out"
case cnsiResponse.Error != nil:
response = []byte(fmt.Sprintf(`{"error": {"statusCode": 500, "status": %q}}`, cnsiResponse.Error.Error()))
errorStatus.StatusCode = 500
errorStatus.Status = cnsiResponse.Error.Error()
case cnsiResponse.Response != nil:
response = cnsiResponse.Response
}
// Check the HTTP Status code to make sure that it is actually a valid response
if cnsiResponse.StatusCode >= 400 {
errorJson, err := json.Marshal(cnsiResponse)
if err != nil {
errorJson = []byte(fmt.Sprintf(`{"statusCode": 500, "status": "Failed to proxy request"}`))
errorStatus.Status = cnsiResponse.Status
errorStatus.StatusCode = cnsiResponse.StatusCode
if errorStatus.StatusCode <= 0 {
errorStatus.StatusCode = 500
errorStatus.Status = "Failed to proxy request"
}
// Check that the error response was valid json - convert to string otherwise
if !isValidJSON(cnsiResponse.Response) {
errorResponse = []byte(fmt.Sprintf("%q", cnsiResponse.Response))
} else {
errorResponse = cnsiResponse.Response
}
response = []byte(fmt.Sprintf(`{"error": "%s", "errorResponse": %q}`, errorJson, string(cnsiResponse.Response)))
}
if len(response) > 0 {
jsonResponse[guid] = (*json.RawMessage)(&response)
} else if errorStatus.StatusCode >= 0 {
passthroughError := &PassthroughError{
Error: errorStatus,
ErrorResponse: (*json.RawMessage)(&errorResponse),
}
res, _ := json.Marshal(passthroughError)
jsonResponse[guid] = (*json.RawMessage)(&res)
} else {
jsonResponse[guid] = nil
}
Expand All @@ -109,6 +139,13 @@ func buildJSONResponse(cnsiList []string, responses map[string]*interfaces.CNSIR
return jsonResponse
}

// When we move to goland 1.9 we can use json.isValid()
func isValidJSON(data []byte) bool {
var res interface{}
err := json.Unmarshal(data, res)
return err == nil
}

func (p *portalProxy) buildCNSIRequest(cnsiGUID string, userGUID string, method string, uri *url.URL, body []byte, header http.Header) (interfaces.CNSIRequest, error) {
log.Debug("buildCNSIRequest")
cnsiRequest := interfaces.CNSIRequest{
Expand Down Expand Up @@ -334,6 +371,7 @@ func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<-

if err != nil {
cnsiRequest.StatusCode = 500
cnsiRequest.Status = "Error proxing request"
cnsiRequest.Response = []byte(err.Error())
cnsiRequest.Error = err
} else if res.Body != nil {
Expand All @@ -343,6 +381,15 @@ func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<-
defer res.Body.Close()
}

// If Status Code >=400, log this as a warning
if cnsiRequest.StatusCode >= 400 {
contentType := res.Header.Get("Content-Type")
log.Warnf("Passthrough response: URL: %s, Status Code: %d, Status: %s, Content Type: %s, Length: %d",
cnsiRequest.URL.String(), cnsiRequest.StatusCode, cnsiRequest.Status, contentType, res.ContentLength)
log.Warn(string(cnsiRequest.Response))

}

if done != nil {
done <- cnsiRequest
}
Expand Down