balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Data_encoding: enforce fixed-size strings in JSON.

Browse Source
This commit is contained in:
Grégoire Henry 2018-05-13 20:21:48 +02:00 committed by Benjamin Canou
parent 1bc7b45fdb
commit a0cae2af57
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib_data_encoding/json.ml
View File

@ -159,8 +159,28 @@ let rec json : type a. a Encoding.desc -> a Json_encoding.encoding =
| Bool -> bool | Bool -> bool
| Float -> float | Float -> float
| RangedFloat { minimum; maximum } -> ranged_float ~minimum ~maximum "rangedFloat" | RangedFloat { minimum; maximum } -> ranged_float ~minimum ~maximum "rangedFloat"
| String _ -> string (* TODO: check length *) | String (`Fixed expected) ->
| Bytes _ -> bytes_jsont (* TODO check length *) let check s =
let found = String.length s in
if found <> expected then
raise (Cannot_destruct
([] ,
Unexpected (Format.asprintf "string (len %d)" found,
Format.asprintf "string (len %d)" expected))) ;
s in
conv check check string
| String _ -> string
| Bytes (`Fixed expected) ->
let check s =
let found = MBytes.length s in
if found <> expected then
raise (Cannot_destruct
([] ,
Unexpected (Format.asprintf "string (len %d)" found,
Format.asprintf "string (len %d)" expected))) ;
s in
conv check check bytes_jsont
| Bytes _ -> bytes_jsont
| String_enum (tbl, _) -> string_enum (Hashtbl.fold (fun a (str, _) acc -> (str, a) :: acc) tbl []) | String_enum (tbl, _) -> string_enum (Hashtbl.fold (fun a (str, _) acc -> (str, a) :: acc) tbl [])
| Array e -> array (get_json e) | Array e -> array (get_json e)
| List e -> list (get_json e) | List e -> list (get_json e)