unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

parse url encoded form in rpc handler (#1183)

Browse Source 
* parse url encoded form in rpc handler

* Remove comment
This commit is contained in:
Asim Aslam 2020-02-11 11:27:16 +00:00 committed by GitHub
parent 4a03183481
commit d1d6eada98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/handler/rpc/rpc.go
View File

@ -202,8 +202,9 @@ func hasCodec(ct string, codecs []string) bool {
func requestPayload(r *http.Request) ([]byte, error) { func requestPayload(r *http.Request) ([]byte, error) {
// we have to decode json-rpc and proto-rpc because we suck // we have to decode json-rpc and proto-rpc because we suck
// well actually because there's no proxy codec right now // well actually because there's no proxy codec right now
switch r.Header.Get("Content-Type") { ct := r.Header.Get("Content-Type")
case "application/json-rpc": switch {
case strings.Contains(ct, "application/json-rpc"):
msg := codec.Message{ msg := codec.Message{
Type: codec.Request, Type: codec.Request,
Header: make(map[string]string), Header: make(map[string]string),
@ -217,7 +218,7 @@ func requestPayload(r *http.Request) ([]byte, error) {
return nil, err return nil, err
} }
return ([]byte)(raw), nil return ([]byte)(raw), nil
case "application/proto-rpc", "application/octet-stream": case strings.Contains(ct, "application/proto-rpc"), strings.Contains(ct, "application/octet-stream"):
msg := codec.Message{ msg := codec.Message{
Type: codec.Request, Type: codec.Request,
Header: make(map[string]string), Header: make(map[string]string),
@ -232,6 +233,19 @@ func requestPayload(r *http.Request) ([]byte, error) {
} }
b, _ := raw.Marshal() b, _ := raw.Marshal()
return b, nil return b, nil
case strings.Contains(ct, "application/www-x-form-urlencoded"):
r.ParseForm()
// generate a new set of values from the form
vals := make(map[string]string)
for k, v := range r.Form {
vals[k] = strings.Join(v, ",")
}
// marshal
b, _ := json.Marshal(vals)
return b, nil
// TODO: application/grpc
} }
// otherwise as per usual // otherwise as per usual