Changeset 30 in code for trunk

Timestamp:

Nov 17, 2022, 8:53:00 PM (2 years ago)

Author:

fox

Message:

Check index ID characters before making a dir with them

File:

• trunk/cli/pull.ml (modified) (2 diffs)

trunk/cli/pull.ml

@@ -87 +87 @@
                 then pull_text url dir id
 
+let validate_id_length s = String.length s <= 32
+
+let validate_id_chars s = try
+        String.iter (function 'a'..'z'|'A'..'Z'|'0'..'9'-> () | _ -> raise (Invalid_argument "")) s;
+        true
+        with Invalid_argument _ -> false
+
 let pull_index url authors_opt topics_opt =
         let index_url = url ^ "/index.pck" in
@@ -96 +103 @@
                 | Ok pk when pk.info.id = "" ->
                         Printf.printf "Empty ID index.pck, skipping %s\n" url; false
+                | Ok pk when not (validate_id_length pk.info.id) ->
+                        Printf.printf "Index pack ID longer than 32 characters, skipping %s\n" url; false
+                | Ok pk when not (validate_id_chars pk.info.id) ->
+                        Printf.printf "Index pack contains invalid ID characters, skipping %s\n" url; false
                 | Ok pk ->
                         let dir = Filename.concat Logarion.Peers.text_dir pk.info.id in