CA-381119: use JsonRPC V2 for error replies

edwintorok · lindig · commit 7d4c00c3e222 · 2024-06-26T10:42:18.000+01:00
For regular replies we look at the request and reply with a matching version.
However when we fail to parse the JsonRPC request itself then we don't know what version to use.

XenCenter uses JsonRPC v2 by default, and JsonRPC v2 has been supported in XAPI for a long time.

Signed-off-by: Edwin Török &lt;edwin.torok@cloud.com&gt;
diff --git a/ocaml/xapi/api_server.ml b/ocaml/xapi/api_server.ml
@@ -346,7 +346,7 @@ let jsoncallback req bio _ =
     Http_svr.response_str req
       ~hdrs:[(Http.Hdr.content_type, "application/json")]
       fd
-      (Jsonrpc.string_of_response
+      (Jsonrpc.string_of_response ~version:Jsonrpc.V2
          (Rpc.failure
             (Rpc.Enum (List.map (fun s -> Rpc.String s) (err :: params)))
          )

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ let jsoncallback req bio _ =`
`346`	`346`	`Http_svr.response_str req`
`347`	`347`	`~hdrs:[(Http.Hdr.content_type, "application/json")]`
`348`	`348`	`fd`
`349`		`- (Jsonrpc.string_of_response`
	`349`	`+ (Jsonrpc.string_of_response ~version:Jsonrpc.V2`
`350`	`350`	`(Rpc.failure`
`351`	`351`	`(Rpc.Enum (List.map (fun s -> Rpc.String s) (err :: params)))`
`352`	`352`	`)`