Commit 2ee6c926 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Revert allowing request bodies on RPC GET operations.

parent 8e8a0fe4

CHANGELOG.md

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 


## [Unreleased]

### Changed

- RPC now allows a request payload on GET requests.

- RPC now allows omitting the `unwrap` parameter for requests with empty payloads.



## [3.18.0] - 2023-10-24

server/api_rpc.go

+26 −26
Original line number Diff line number Diff line
@@ -142,29 +142,11 @@ func (s *ApiServer) RpcFuncHttp(w http.ResponseWriter, r *http.Request) { 
	// indicate that raw behaviour is expected.

	_, unwrap := queryParams["unwrap"]



	// Prepare input to function. Attempt to read request body no matter what the HTTP method is.

	// Prepare input to function.

	var payload string

	if b, err := io.ReadAll(r.Body); err == nil && len(b) > 0 {

		recvBytes = len(b)

		// Maybe attempt to decode to a JSON string to mimic existing GRPC Gateway behaviour.

		if !unwrap {

			err = json.Unmarshal(b, &payload)

			if err != nil {

				w.Header().Set("content-type", "application/json")

				w.WriteHeader(http.StatusBadRequest)

				sentBytes, err = w.Write(badJSONBytes)

	if r.Method == "POST" {

		b, err := io.ReadAll(r.Body)

		if err != nil {

					s.logger.Debug("Error writing response to client", zap.Error(err))

				}

				return

			}

		} else {

			payload = string(b)

		}

	} else if err == io.EOF && r.Method == http.MethodGet {

		// GET requests with no request body always return an EOF immediately. A body is not usually

		// expected, so treat this as a simple GET with no request body rather than an error.

	} else if err != nil {

			// Request body too large.

			if err.Error() == "http: request body too large" {

				w.Header().Set("content-type", "application/json")
@@ -185,6 +167,24 @@ func (s *ApiServer) RpcFuncHttp(w http.ResponseWriter, r *http.Request) { 
			}

			return

		}

		recvBytes = len(b)



		// Maybe attempt to decode to a JSON string to mimic existing GRPC Gateway behaviour.

		if recvBytes > 0 && !unwrap {

			err = json.Unmarshal(b, &payload)

			if err != nil {

				w.Header().Set("content-type", "application/json")

				w.WriteHeader(http.StatusBadRequest)

				sentBytes, err = w.Write(badJSONBytes)

				if err != nil {

					s.logger.Debug("Error writing response to client", zap.Error(err))

				}

				return

			}

		} else {

			payload = string(b)

		}

	}



	queryParams.Del("http_key")