X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller.go;h=cef57f951d3a15715b745ec9ffbf1c3d803b78cc;hb=d6d623cc2eda63be912b4e322c25e492abe86a99;hp=49e821d85ac1b6f5b843c821f6dd8af4c46f3cbd;hpb=a07b8597afc9d063a7f37a376a5bcf29ba29b557;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go index 49e821d..cef57f9 100644 --- a/E2Manager/controllers/nodeb_controller.go +++ b/E2Manager/controllers/nodeb_controller.go @@ -103,7 +103,7 @@ func (c *NodebController) SetGeneralConfiguration(writer http.ResponseWriter, r request := models.GeneralConfigurationRequest{} - if !c.extractJsonBody(r, &request, writer){ + if !c.extractJsonBodyDisallowUnknownFields(r, &request, writer){ return } c.handleRequest(writer, &r.Header, httpmsghandlerprovider.SetGeneralConfigurationRequest, request, false) @@ -165,6 +165,21 @@ func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Me return true } +func (c *NodebController) extractJsonBodyDisallowUnknownFields(r *http.Request, request models.Request, writer http.ResponseWriter) bool { + defer r.Body.Close() + + decoder := json.NewDecoder(r.Body) + decoder.DisallowUnknownFields() + + if err := decoder.Decode(&request); err != nil { + c.logger.Errorf("[Client -> E2 Manager] #NodebController.extractJsonBody - unable to extract json body - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) + return false + } + + return true +} + func (c *NodebController) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool { defer r.Body.Close() body, err := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest))