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

include a public key in peer record type

Browse Source 
* include a public key in peer record type
* include public key in `Connect` packet
* receive/send public keys in `Connect` packet
* include public key in `connect_to_peer`
* json encode/decode public key
* include public key in peer file encode/decode
* include public key in bootstrapping
This commit is contained in:
Eitan Chatav 2016-11-04 12:07:03 -07:00
parent dc0061c5d9
commit 438281f1e1
3 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/node/net/p2p.ml
View File

@ -66,7 +66,7 @@ type point = addr * port
not a real kind of packet, it means that something indecypherable not a real kind of packet, it means that something indecypherable
was transmitted. *) was transmitted. *)
type packet = type packet =
| Connect of gid * int option * version list | Connect of gid * Crypto_box.public_key * int option * version list
| Disconnect | Disconnect
| Advertise of (addr * port) list | Advertise of (addr * port) list
| Message of Netbits.frame | Message of Netbits.frame
@ -96,12 +96,12 @@ let recv_packet
| [ S 2 ] -> return Ping | [ S 2 ] -> return Ping
| [ S 12 ] -> return Pong | [ S 12 ] -> return Pong
| [ S 3 ] -> return Bootstrap | [ S 3 ] -> return Bootstrap
| [ S 4 ; B gid ; S port ; F rest ] as msg -> | [ S 4 ; B gid ; B public_key ; S port ; F rest ] as msg ->
decode_versions msg rest @@ fun versions -> decode_versions msg rest @@ fun versions ->
return (Connect (MBytes.to_string gid, Some port, versions)) return (Connect (MBytes.to_string gid, Crypto_box.to_public_key public_key, Some port, versions))
| [ S 4 ; B gid ; F rest ] as msg -> | [ S 4 ; B gid ; B public_key ; F rest ] as msg ->
decode_versions msg rest @@ fun versions -> decode_versions msg rest @@ fun versions ->
return (Connect (MBytes.to_string gid, None, versions)) return (Connect (MBytes.to_string gid, Crypto_box.to_public_key public_key, None, versions))
| [ S 5 ; F rest ] as msg -> | [ S 5 ; F rest ] as msg ->
let rec decode_peers acc = function let rec decode_peers acc = function
| F [ B addr ; S port ] :: rest -> begin | F [ B addr ; S port ] :: rest -> begin
@ -127,14 +127,14 @@ let send_packet
| Ping -> [ S 2 ] | Ping -> [ S 2 ]
| Pong -> [ S 12 ] | Pong -> [ S 12 ]
| Bootstrap -> [ S 3 ] | Bootstrap -> [ S 3 ]
| Connect (gid, port, versions) -> | Connect (gid, public_key, port, versions) ->
let rec encode = function let rec encode = function
| (name, maj, min) :: tl -> | (name, maj, min) :: tl ->
let rest = encode tl in let rest = encode tl in
F [ B (MBytes.of_string name) ; S maj ; S min ] :: rest F [ B (MBytes.of_string name) ; S maj ; S min ] :: rest
| [] -> [] | [] -> []
in in
[ S 4 ; B (MBytes.of_string gid) ] [ S 4 ; B (MBytes.of_string gid) ; B (Crypto_box.of_public_key public_key) ]
@ (match port with | Some port -> [ S port ] | None -> []) @ (match port with | Some port -> [ S port ] | None -> [])
@ [ F (encode versions) ] @ [ F (encode versions) ]
| Advertise peers -> | Advertise peers ->
@ -170,6 +170,7 @@ type net = {
workers (on shutdown of during maintenance). *) workers (on shutdown of during maintenance). *)
and peer = { and peer = {
gid : gid ; gid : gid ;
public_key : Crypto_box.public_key ;
point : point ; point : point ;
listening_port : port option ; listening_port : port option ;
version : version ; version : version ;
@ -282,7 +283,7 @@ end
function for communicating with the main worker using events function for communicating with the main worker using events
(including the one sent when the connection is alive). Returns a (including the one sent when the connection is alive). Returns a
canceler. *) canceler. *)
let connect_to_peer config limits my_gid socket (addr, port) push white_listed = let connect_to_peer config limits my_gid my_public_key socket (addr, port) push white_listed =
(* a non exception-based cancelation mechanism *) (* a non exception-based cancelation mechanism *)
let cancelation, cancel, on_cancel = canceler () in let cancelation, cancel, on_cancel = canceler () in
(* a cancelable reception *) (* a cancelable reception *)
@ -294,11 +295,12 @@ let connect_to_peer config limits my_gid socket (addr, port) push white_listed =
connection, both parties must first present themselves. *) connection, both parties must first present themselves. *)
let rec connect () = let rec connect () =
send_packet socket (Connect (my_gid, send_packet socket (Connect (my_gid,
my_public_key,
config.incoming_port, config.incoming_port,
config.supported_versions)) >>= fun _ -> config.supported_versions)) >>= fun _ ->
pick [ (LU.sleep limits.peer_answer_timeout >>= fun () -> return Disconnect) ; pick [ (LU.sleep limits.peer_answer_timeout >>= fun () -> return Disconnect) ;
recv () ] >>= function recv () ] >>= function
| Connect (gid, listening_port, versions) -> | Connect (gid, public_key , listening_port, versions) ->
debug "(%a) connection requested from %a @ %a:%d" debug "(%a) connection requested from %a @ %a:%d"
pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ; pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ;
begin match common_version config.supported_versions versions with begin match common_version config.supported_versions versions with
@ -310,7 +312,7 @@ let connect_to_peer config limits my_gid socket (addr, port) push white_listed =
if config.closed_network then if config.closed_network then
match listening_port with match listening_port with
| Some port when white_listed (addr, port) -> | Some port when white_listed (addr, port) ->
connected version gid listening_port connected version gid public_key listening_port
| Some port -> | Some port ->
debug "(%a) connection rejected (out of the closed network) from %a:%d" debug "(%a) connection rejected (out of the closed network) from %a:%d"
pp_gid my_gid Ipaddr.pp_hum addr port ; pp_gid my_gid Ipaddr.pp_hum addr port ;
@ -320,7 +322,7 @@ let connect_to_peer config limits my_gid socket (addr, port) push white_listed =
pp_gid my_gid Ipaddr.pp_hum addr ; pp_gid my_gid Ipaddr.pp_hum addr ;
cancel () cancel ()
else else
connected version gid listening_port connected version gid public_key listening_port
end end
| Advertise peers -> | Advertise peers ->
(* alternatively, one can refuse a connection but reply with (* alternatively, one can refuse a connection but reply with
@ -338,7 +340,7 @@ let connect_to_peer config limits my_gid socket (addr, port) push white_listed =
pp_gid my_gid Ipaddr.pp_hum addr port ; pp_gid my_gid Ipaddr.pp_hum addr port ;
cancel () cancel ()
(* Them we can build the net object and launch the worker. *) (* Them we can build the net object and launch the worker. *)
and connected version gid listening_port = and connected version gid public_key listening_port =
(* net object state *) (* net object state *)
let last = ref (Unix.gettimeofday ()) in let last = ref (Unix.gettimeofday ()) in
(* net object callbaks *) (* net object callbaks *)
@ -346,7 +348,7 @@ let connect_to_peer config limits my_gid socket (addr, port) push white_listed =
let disconnect () = cancel () in let disconnect () = cancel () in
let send p = send_packet socket p >>= fun _ -> return () in let send p = send_packet socket p >>= fun _ -> return () in
(* net object construction *) (* net object construction *)
let peer = { gid ; point = (addr, port) ; listening_port ; let peer = { gid ; public_key ; point = (addr, port) ; listening_port ;
version ; last_seen ; disconnect ; send } in version ; last_seen ; disconnect ; send } in
(* The packet reception loop. *) (* The packet reception loop. *)
let rec receiver () = let rec receiver () =
@ -429,10 +431,18 @@ let addr_encoding =
(fun b -> Ipaddr.(V6 (V6.of_bytes_exn b))) ; (fun b -> Ipaddr.(V6 (V6.of_bytes_exn b))) ;
]) ])
let public_key_encoding =
let open Data_encoding in
conv
(fun public_key -> MBytes.to_string (Crypto_box.of_public_key public_key))
(fun str -> Crypto_box.to_public_key (MBytes.of_string str))
string
let peers_file_encoding = let peers_file_encoding =
let open Data_encoding in let open Data_encoding in
obj2 obj3
(req "gid" string) (req "gid" string)
(req "public_key" public_key_encoding)
(req "peers" (req "peers"
(obj3 (obj3
(req "known" (req "known"
@ -591,10 +601,12 @@ let bootstrap config limits =
on_cancel (fun () -> close_msg_queue () ; return ()) ; on_cancel (fun () -> close_msg_queue () ; return ()) ;
(* fill the known peers pools from last time *) (* fill the known peers pools from last time *)
Data_encoding.Json.read_file config.peers_file >>= fun res -> Data_encoding.Json.read_file config.peers_file >>= fun res ->
let known_peers, black_list, my_gid = let known_peers, black_list, my_gid, my_public_key =
let init_peers () = let init_peers () =
let my_gid = let my_gid =
fresh_gid () in fresh_gid () in
let (my_secret_key, my_public_key) =
Crypto_box.random_keypair () in
let known_peers = let known_peers =
let source = let source =
{ unreachable_since = None ; { unreachable_since = None ;
@ -605,19 +617,19 @@ let bootstrap config limits =
PeerMap.empty config.known_peers in PeerMap.empty config.known_peers in
let black_list = let black_list =
BlackList.empty in BlackList.empty in
known_peers, black_list, my_gid in known_peers, black_list, my_gid, my_public_key in
match res with match res with
| None -> | None ->
let known_peers, black_list, my_gid = init_peers () in let known_peers, black_list, my_gid, my_public_key = init_peers () in
debug "(%a) peer cache initiated" pp_gid my_gid ; debug "(%a) peer cache initiated" pp_gid my_gid ;
ref known_peers, ref black_list, my_gid ref known_peers, ref black_list, my_gid, my_public_key
| Some json -> | Some json ->
match Data_encoding.Json.destruct peers_file_encoding json with match Data_encoding.Json.destruct peers_file_encoding json with
| exception _ -> | exception _ ->
let known_peers, black_list, my_gid = init_peers () in let known_peers, black_list, my_gid, my_public_key = init_peers () in
debug "(%a) peer cache reset" pp_gid my_gid ; debug "(%a) peer cache reset" pp_gid my_gid ;
ref known_peers, ref black_list, my_gid ref known_peers, ref black_list, my_gid, my_public_key
| (my_gid, (k, b, w)) -> | (my_gid, my_public_key, (k, b, w)) ->
let white_list = let white_list =
List.fold_right PointSet.add w PointSet.empty in List.fold_right PointSet.add w PointSet.empty in
let known_peers = let known_peers =
@ -642,7 +654,7 @@ let bootstrap config limits =
(fun r (a, d) -> BlackList.add a d r) (fun r (a, d) -> BlackList.add a d r)
BlackList.empty b in BlackList.empty b in
debug "(%a) peer cache loaded" pp_gid my_gid ; debug "(%a) peer cache loaded" pp_gid my_gid ;
ref known_peers, ref black_list, my_gid ref known_peers, ref black_list, my_gid, my_public_key
in in
(* some peer reachability predicates *) (* some peer reachability predicates *)
let black_listed (addr, _) = let black_listed (addr, _) =
@ -660,6 +672,7 @@ let bootstrap config limits =
let json = let json =
Data_encoding.Json.construct peers_file_encoding @@ Data_encoding.Json.construct peers_file_encoding @@
(my_gid, (my_gid,
my_public_key,
PeerMap.fold PeerMap.fold
(fun (addr, port) gid source (k, b, w) -> (fun (addr, port) gid source (k, b, w) ->
let infos = match gid, source.connections with let infos = match gid, source.connections with
@ -919,7 +932,7 @@ let bootstrap config limits =
main () main ()
else else
let canceler = let canceler =
connect_to_peer config limits my_gid socket (addr, port) enqueue_event white_listed in connect_to_peer config limits my_gid my_public_key socket (addr, port) enqueue_event white_listed in
debug "(%a) incoming peer at %a:%d" debug "(%a) incoming peer at %a:%d"
pp_gid my_gid Ipaddr.pp_hum addr port ; pp_gid my_gid Ipaddr.pp_hum addr port ;
incoming := PointMap.add (addr, port) canceler !incoming ; incoming := PointMap.add (addr, port) canceler !incoming ;

2
src/utils/crypto_box.ml
View File

@ -19,3 +19,5 @@ let random_nonce = Sodium.Box.random_nonce
let increment_nonce = Sodium.Box.increment_nonce let increment_nonce = Sodium.Box.increment_nonce
let box = Sodium.Box.Bigbytes.box let box = Sodium.Box.Bigbytes.box
let box_open = Sodium.Box.Bigbytes.box_open let box_open = Sodium.Box.Bigbytes.box_open
let to_public_key = Sodium.Box.Bigbytes.to_public_key
let of_public_key = Sodium.Box.Bigbytes.of_public_key

2
src/utils/crypto_box.mli
View File

@ -18,3 +18,5 @@ val random_nonce : unit -> nonce
val increment_nonce : ?step:int -> nonce -> nonce val increment_nonce : ?step:int -> nonce -> nonce
val box : secret_key -> public_key -> MBytes.t -> nonce -> MBytes.t val box : secret_key -> public_key -> MBytes.t -> nonce -> MBytes.t
val box_open : secret_key -> public_key -> MBytes.t -> nonce -> MBytes.t val box_open : secret_key -> public_key -> MBytes.t -> nonce -> MBytes.t
val to_public_key : MBytes.t -> public_key
val of_public_key : public_key -> MBytes.t