Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

fix(docker-proxy): reduce DB writes to optimize the proxy calls EE-5516 (#9148)

Browse source
This commit is contained in:
andres-portainer 2023-07-05 09:25:05 -03:00 • committed by GitHub
parent b37120802e
commit 74515f102d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 61 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/http/proxy/factory/utils/json.go
View file

@ -49,18 +49,8 @@ func getBody(body io.ReadCloser, contentType string, isGzip bool) (interface{},
defer reader.Close()
bodyBytes, err := io.ReadAll(reader)
if err != nil {
return nil, err
}
err = body.Close()
if err != nil {
return nil, err
}
var data interface{}
err = unmarshal(contentType, bodyBytes, &data)
err := unmarshal(contentType, reader, &data)
if err != nil {
return nil, err
}
@ -85,7 +75,7 @@ func marshal(contentType string, data interface{}) ([]byte, error) {
return nil, fmt.Errorf("content type is not supported for marshaling: %s", contentType)
}
func unmarshal(contentType string, body []byte, returnBody interface{}) error {
func unmarshal(contentType string, body io.Reader, returnBody interface{}) error {
// Note: contentType can look like: "application/json" or "application/json; charset=utf-8"
mediaType, _, err := mime.ParseMediaType(contentType)
if err != nil {
@ -94,9 +84,9 @@ func unmarshal(contentType string, body []byte, returnBody interface{}) error {
switch mediaType {
case "application/yaml":
return yaml.Unmarshal(body, returnBody)
return yaml.NewDecoder(body).Decode(returnBody)
case "application/json", "":
return json.Unmarshal(body, returnBody)
return json.NewDecoder(body).Decode(returnBody)
}
return fmt.Errorf("content type is not supported for unmarshaling: %s", contentType)

45
api/http/proxy/factory/utils/request.go
View file

@ -1,45 +0,0 @@
package utils
import (
"bytes"
"io"
"net/http"
"strconv"
)
// GetRequestAsMap returns the response content as a generic JSON object
func GetRequestAsMap(request *http.Request) (map[string]interface{}, error) {
data, err := getRequestBody(request)
if err != nil {
return nil, err
}
return data.(map[string]interface{}), nil
}
// RewriteRequest will replace the existing request body with the one specified
// in parameters
func RewriteRequest(request *http.Request, newData interface{}) error {
data, err := marshal(getContentType(request.Header), newData)
if err != nil {
return err
}
body := io.NopCloser(bytes.NewReader(data))
request.Body = body
request.ContentLength = int64(len(data))
if request.Header == nil {
request.Header = make(http.Header)
}
request.Header.Set("Content-Length", strconv.Itoa(len(data)))
return nil
}
func getRequestBody(request *http.Request) (interface{}, error) {
isGzip := request.Header.Get("Content-Encoding") == "gzip"
return getBody(request.Body, getContentType(request.Header), isGzip)
}

9
api/http/proxy/factory/utils/response.go
View file

@ -77,7 +77,7 @@ func RewriteAccessDeniedResponse(response *http.Response) error {
// RewriteResponse will replace the existing response body and status code with the one specified
// in parameters
func RewriteResponse(response *http.Response, newResponseData interface{}, statusCode int) error {
data, err := marshal(getContentType(response.Header), newResponseData)
data, err := marshal(getContentType(response), newResponseData)
if err != nil {
return err
}
@ -98,14 +98,13 @@ func RewriteResponse(response *http.Response, newResponseData interface{}, statu
func getResponseBody(response *http.Response) (interface{}, error) {
isGzip := response.Header.Get("Content-Encoding") == "gzip"
if isGzip {
response.Header.Del("Content-Encoding")
}
return getBody(response.Body, getContentType(response.Header), isGzip)
return getBody(response.Body, getContentType(response), isGzip)
}
func getContentType(headers http.Header) string {
return headers.Get("Content-type")
func getContentType(response *http.Response) string {
return response.Header.Get("Content-type")
}