|
@@ -130,16 +130,14 @@ func (this *HTTPServer) ServeHTTP(responseStream http.ResponseWriter, requestStr
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // TODO: fix
|
|
|
|
|
- // handler := HTTPServerHandler{}
|
|
|
|
|
- // copyStruct(&handler, &handlerSpec)
|
|
|
|
|
- // handlerSpec = handler
|
|
|
|
|
- handler := handlerSpec
|
|
|
|
|
|
|
+ handler := HTTPServerHandler{}
|
|
|
|
|
+ copyStruct(&handler, &handlerSpec)
|
|
|
|
|
+ handlerSpec = handler
|
|
|
|
|
|
|
|
// Parse GET query
|
|
// Parse GET query
|
|
|
if method == METHOD_GET && handler.Data != nil {
|
|
if method == METHOD_GET && handler.Data != nil {
|
|
|
// TODO: support arrays
|
|
// TODO: support arrays
|
|
|
- query := map[string]string{}
|
|
|
|
|
|
|
+ query := map[string]any{}
|
|
|
for key, values := range requestStream.URL.Query() {
|
|
for key, values := range requestStream.URL.Query() {
|
|
|
for _, value := range values {
|
|
for _, value := range values {
|
|
|
query[key] = value
|
|
query[key] = value
|
|
@@ -153,7 +151,7 @@ func (this *HTTPServer) ServeHTTP(responseStream http.ResponseWriter, requestStr
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- err = json.Unmarshal(buffer, &handler.Data)
|
|
|
|
|
|
|
+ err = json.Unmarshal(buffer, handler.Data)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
this.log.Error("malformed request body", LogValue("path", requestStream.URL.Path), LogError(err))
|
|
this.log.Error("malformed request body", LogValue("path", requestStream.URL.Path), LogError(err))
|
|
|
responseStream.WriteHeader(http.StatusInternalServerError)
|
|
responseStream.WriteHeader(http.StatusInternalServerError)
|
|
@@ -176,7 +174,7 @@ func (this *HTTPServer) ServeHTTP(responseStream http.ResponseWriter, requestStr
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- err = json.Unmarshal(buffer[:n], &handler.Data)
|
|
|
|
|
|
|
+ err = json.Unmarshal(buffer[:n], handler.Data)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
this.log.Error("malformed request body", LogValue("path", requestStream.URL.Path), LogError(err))
|
|
this.log.Error("malformed request body", LogValue("path", requestStream.URL.Path), LogError(err))
|
|
|
responseStream.WriteHeader(http.StatusInternalServerError)
|
|
responseStream.WriteHeader(http.StatusInternalServerError)
|