Skip to content

fix: handle HTML responses in panel management API requests #12264

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

Open
jakub961241 wants to merge 1 commit into
base: dev-v2
Choose a base branch
from
+18 −4
Open

fix: handle HTML responses in panel management API requests #12264

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
22 changes: 18 additions & 4 deletions core/utils/req_helper/proxy_local/req_to_local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,30 @@ func NewLocalClient(reqUrl, reqMethod string, body io.Reader, ctx *gin.Context)
}
defer resp.Body.Close()

if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("do request failed, err: %v", resp.Status)
}
bodyByte, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("read resp body from request failed, err: %v", err)
}

if resp.StatusCode == http.StatusUnauthorized {
return nil, fmt.Errorf("authentication failed: remote panel returned 401 Unauthorized, please check API key or credentials")
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("do request failed, status: %s", resp.Status)
}

contentType := resp.Header.Get("Content-Type")
if !strings.Contains(contentType, "application/json") && !strings.Contains(contentType, "text/json") {
preview := string(bodyByte)
if len(preview) > 200 {
preview = preview[:200]
}
return nil, fmt.Errorf("expected JSON response but got Content-Type: %s, body: %s", contentType, preview)
}

var respJson dto.Response
if err := json.Unmarshal(bodyByte, &respJson); err != nil {
return nil, fmt.Errorf("json umarshal resp data failed, err: %v", err)
return nil, fmt.Errorf("json unmarshal resp data failed, err: %v", err)
}
if respJson.Code != http.StatusOK {
return nil, errors.New(strings.ReplaceAll(respJson.Message, i18n.Get("ErrInternalServerKey"), ""))
Expand Down