some modifications

Reviewed-on: #2

client-gui/src/gui_app.rs

@@ -1,5 +1,5 @@
 use client_network::{
-    MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash, filename_to_string,
+    ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash, filename_to_string,
     node_hash_to_hex_string,
 };
 use crossbeam_channel::{Receiver, Sender};
@@ -27,7 +27,7 @@ pub struct P2PClientApp {
 
     // GUI State
     status_message: String,
-    known_peers: Vec<String>,
+    known_peers: Vec<(String, bool)>,
     connect_address_input: String,
     connected_address: String,
     connect_name_input: String,
@@ -62,7 +62,7 @@ impl P2PClientApp {
             network_cmd_tx: cmd_tx,
             network_event_rx: event_rx,
             status_message: "Client Initialized. Awaiting network status...".to_string(),
-            known_peers: vec!["bob".to_string()],
+            known_peers: vec![("bob".to_string(), true)],
             connect_address_input: "https://jch.irif.fr:8443".to_string(),
             connected_address: "".to_string(),
             loaded_fs,
@@ -111,8 +111,8 @@ impl eframe::App for P2PClientApp {
                     todo!();
 
                     self.status_message = format!("✅ Peer connected: {}", addr);
-                    if !self.known_peers.contains(&addr) {
+                    if !self.known_peers.contains(&(addr, true)) {
-                        self.known_peers.push(addr);
+                        self.known_peers.push((addr, true));
                     }
                 }
                 NetworkEvent::PeerListUpdated(peers) => {
@@ -129,11 +129,28 @@ impl eframe::App for P2PClientApp {
                 NetworkEvent::FileTreeRootReceived(peer_id, root_hash) => {
                     // todo!();
 
-                    self.status_message = format!(
+                    /*self.status_message = format!(
                         "🔄 Received Merkle Root from {}: {}",
                         peer_id,
                         &root_hash[..8]
-                    );
+                    );*/
+
+                    if let Ok(chunknode) = ChunkNode::new(Vec::new()) {
+                        let mut data_map: HashMap<NodeHash, MerkleNode> = HashMap::new();
+                        data_map.insert(root_hash, MerkleNode::Chunk(chunknode));
+                        let tree = MerkleTree {
+                            data: data_map,
+                            root: root_hash,
+                        };
+                        match &self.active_peer {
+                            Some(activepeer) => {
+                                self.loaded_fs.insert(activepeer.clone(), tree);
+                            }
+                            None => {}
+                        }
+
+                        println!("tree created");
+                    }
 
                     //self.active_peer_id = Some(peer_id.clone());
 
@@ -344,18 +361,18 @@ impl eframe::App for P2PClientApp {
                     } else {
                         for peer in &self.known_peers {
                             let is_active =
-                                self.active_peer.as_ref().map_or(false, |id| id == peer); // if peer.id == self.active_peer_id
+                                self.active_peer.as_ref().map_or(false, |id| id == &peer.0); // if peer.id == self.active_peer_id
 
                             let selectable;
-                            if &self.active_server == peer {
+                            if &self.active_server == &peer.0 {
                                 selectable =
-                                    ui.selectable_label(is_active, format!("{} 📡 🌀", peer))
+                                    ui.selectable_label(is_active, format!("{} 📡 🌀", peer.0))
                             } else {
-                                selectable = ui.selectable_label(is_active, format!("{}", peer));
+                                selectable = ui.selectable_label(is_active, format!("{}", peer.0));
                             }
                             if selectable.clicked() {
                                 // switch to displaying this peer's tree
-                                self.active_peer = Some(peer.clone());
+                                self.active_peer = Some(peer.0.clone());
                                 // Request root content if not loaded
                                 if !self
                                     .loaded_fs
@@ -363,8 +380,9 @@ impl eframe::App for P2PClientApp {
                                 {
                                     //todo!();
                                     let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
-                                        peer.clone(),
+                                        peer.0.clone(),
                                         "root".to_string(),
+                                        self.connected_address.clone(),
                                     ));
                                 }
                             }
@@ -376,10 +394,10 @@ impl eframe::App for P2PClientApp {
                                             .button("Utiliser le peer en tant que serveur")
                                             .clicked()
                                         {
-                                            self.active_server = peer.to_string();
+                                            self.active_server = peer.0.to_string();
                                             let res = self.network_cmd_tx.send(
                                                 NetworkCommand::ServerHandshake(
-                                                    peer.to_string(),
+                                                    peer.0.to_string(),
                                                     self.connected_address.clone(),
                                                 ),
                                             );
@@ -387,10 +405,29 @@ impl eframe::App for P2PClientApp {
                                     }
                                     _ => {}
                                 }
+                                if ui.button("Send Ping").clicked() {
+                                    let res = self
+                                        .network_cmd_tx
+                                        .send(NetworkCommand::Ping(peer.0.to_string()));
+                                }
+                                if ui.button("Send Nat Traversal Request").clicked() {
+                                    match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
+                                        peer.0.to_string(),
+                                        self.connected_address.clone(),
+                                    )) {
+                                        Ok(_) => {
+                                            print!("[+] successfully sent nat traversal request")
+                                        }
+                                        Err(_) => {
+                                            print!("[-] failed to send nat traversal request")
+                                        }
+                                    }
+                                }
                                 if ui.button("Infos").clicked() {
                                     // action 3
                                     ui.close();
                                 }
+
                                 // ... autres boutons
                             });
                         }

client-network/src/cryptographic_signature.rs

@@ -7,6 +7,7 @@ use p256::ecdsa::{
     signature::{Signer, Verifier},
 };
 use rand_core::OsRng;
+use reqwest::Error;
 use sha2::{Digest, Sha256};
 
 ///
@@ -50,20 +51,25 @@ pub async fn get_peer_key(username: &String) -> Result<VerifyingKey, reqwest::Er
     let client = reqwest::Client::new();
     let uri = format!("https://jch.irif.fr:8443/peers/{}/key", username);
     let res = client.get(uri).send().await?;
-    if res.status().is_success() {
+
+    match res.error_for_status_ref() {
+        Ok(_) => {
             println!("Successfully retreived the peers key.");
-    } else {
-        eprintln!(
-            "Failed to get the peers key from the server. Status: {}",
-            res.status()
-        );
-    }
             let body: Bytes = res.bytes().await?;
             let slice: &[u8] = body.as_ref();
             let body_bytes: &[u8; 64] = slice.try_into().expect("size error");
             let received_key = convert_verifyingkey(body_bytes);
             Ok(received_key)
         }
+        Err(e) => {
+            eprintln!(
+                "Failed to get the peers key from the server. Status: {}",
+                res.status()
+            );
+            Err(e)
+        }
+    }
+}
 
 fn convert_verifyingkey(raw_xy: &[u8; 64]) -> VerifyingKey {
     let mut sec1 = [0u8; 65];

client-network/src/lib.rs

@@ -12,21 +12,20 @@ use crate::{
     cryptographic_signature::CryptographicSignature,
     message_handling::EventType,
     messages_channels::{MultipleSenders, start_receving_thread},
-    messages_structure::construct_message,
+    messages_structure::{
-    peers_refresh::HandshakeHistory,
+        NATTRAVERSALREQUEST, NATTRAVERSALREQUEST2, ROOTREQUEST, construct_message,
-    registration::{
-        get_socket_address, parse_addresses, perform_handshake, register_with_the_server,
     },
+    peers_refresh::HandshakeHistory,
+    registration::{parse_addresses, perform_handshake, register_with_the_server},
     server_communication::{generate_id, get_peer_list},
 };
 use std::{
-    fmt,
+    io::Error,
-    sync::{Arc, Mutex},
+    net::{IpAddr, Ipv4Addr, UdpSocket},
 };
 use std::{
-    io::Error,
+    net::SocketAddr,
-    net::{SocketAddr, UdpSocket},
+    sync::{Arc, Mutex},
-    str::FromStr,
 };
 
 pub struct P2PSharedData {
@@ -38,6 +37,9 @@ pub struct P2PSharedData {
     handshake_peers: Arc<HandshakeHistory>,
 }
 
+use bytes::Bytes;
+use p256::pkcs8::der::pem::Base64Encoder;
+
 impl P2PSharedData {
     pub fn new(
         username: String,
@@ -116,14 +118,15 @@ pub enum NetworkCommand {
     ServerHandshake(String, String),    // ServerName
     FetchPeerList(String),              // ServerIP
     RegisterAsPeer(String),
-    Ping(),
+    Ping(String),
-    ConnectPeer(String),     // IP:PORT
+    NatTraversal(String, String),
+    ConnectPeer((String, bool)), // IP:PORT
     RequestFileTree(String),     // peer_id
     RequestDirectoryContent(String, String),
     RequestChunk(String, String),
     Disconnect(),
     ResetServerPeer(),
-    Discover(String, String),
+    Discover(String, String, String),
     GetChildren(String, String),
     // ...
 }
@@ -135,10 +138,10 @@ pub enum NetworkEvent {
     Disconnected(),
     Error(String),
     PeerConnected(String),
-    PeerListUpdated(Vec<String>),
+    PeerListUpdated(Vec<(String, bool)>),
     FileTreeReceived(String, Vec<MerkleNode>), // peer_id, content
     DataReceived(String, MerkleNode),
-    FileTreeRootReceived(String, String),
+    FileTreeRootReceived(String, NodeHash),
     HandshakeFailed(),
     ServerHandshakeFailed(String),
     // ...
@@ -173,6 +176,8 @@ pub fn start_p2p_executor(
     // Use tokio to spawn the asynchronous networking logic
     tokio::task::spawn(async move {
         // P2P/Networking Setup goes here
+        let handshake_history = Arc::new(Mutex::new(HandshakeHistory::new()));
+        let handshake_clone = handshake_history.clone();
 
         println!("Network executor started.");
 
@@ -182,17 +187,18 @@ pub fn start_p2p_executor(
             if let Ok(cmd) = cmd_rx.try_recv() {
                 match cmd {
                     NetworkCommand::ServerHandshake(username, ip) => {
+                        println!("server handshake called");
                         if let Some(sd) = shared_data.as_ref() {
-                            start_receving_thread(
+                            start_receving_thread(sd, event_tx.clone(), &handshake_clone);
-                                sd,
+                            let res =
-                                event_tx.clone(), //
+                                perform_handshake(&sd, username, ip, event_tx.clone(), true).await;
-                            );
+                        } else {
-                            perform_handshake(&sd, username, ip, event_tx.clone());
+                            println!("no shared data");
                         }
                     }
-                    NetworkCommand::ConnectPeer(addr) => {
+                    NetworkCommand::ConnectPeer((username, connected)) => {
                         println!("[Network] ConnectPeer() called");
-                        println!("[Network] Attempting to connect to: {}", addr);
+                        println!("[Network] Attempting to connect to: {}", username);
                         // Network logic to connect...
                         // If successful, send an event back:
                         // event_tx.send(NetworkEvent::PeerConnected(addr)).unwrap();
@@ -200,8 +206,52 @@ pub fn start_p2p_executor(
                     NetworkCommand::RequestFileTree(_) => {
                         println!("[Network] RequestFileTree() called");
                     }
-                    NetworkCommand::Discover(username, hash) => {
+                    NetworkCommand::Discover(username, hash, ip) => {
                         // envoie un handshake au peer, puis un root request
+                        if let Some(sd) = shared_data.as_ref() {
+                            let res = {
+                                let m = handshake_clone.lock().unwrap();
+                                m.get_peer_info_username(username.clone()).cloned()
+                            };
+                            match res {
+                                Some(peerinfo) => {
+                                    // envoyer un root request
+                                    let rootrequest = construct_message(
+                                        ROOTREQUEST,
+                                        Vec::new(),
+                                        generate_id(),
+                                        sd.cryptopair_ref(),
+                                    );
+
+                                    match rootrequest {
+                                        None => {}
+                                        Some(resp_msg) => {
+                                            println!("msg_sent:{:?}", resp_msg);
+                                            sd.senders_ref().send_via(
+                                                0,
+                                                resp_msg,
+                                                peerinfo.ip.to_string(),
+                                                false,
+                                                sd.messages_list_ref(),
+                                            );
+                                        }
+                                    }
+                                }
+                                None => {
+                                    // envoyer un handshake
+                                    let res = perform_handshake(
+                                        &sd,
+                                        username,
+                                        ip,
+                                        event_tx.clone(),
+                                        false,
+                                    )
+                                    .await;
+                                }
+                            }
+                        } else {
+                            println!("no shared data");
+                        }
                     }
                     NetworkCommand::GetChildren(username, hash) => {
                         // envoie un datum request au peer
@@ -261,11 +311,11 @@ pub fn start_p2p_executor(
                             match get_peer_list(ip).await {
                                 Ok(body) => match String::from_utf8(body.to_vec()) {
                                     Ok(peers_list) => {
-                                        let mut peers: Vec<String> = Vec::new();
+                                        let mut peers: Vec<(String, bool)> = Vec::new();
                                         let mut current = String::new();
                                         for i in peers_list.chars() {
                                             if i == '\n' {
-                                                peers.push(current.clone());
+                                                peers.push((current.clone(), false));
                                                 current.clear();
                                             } else {
                                                 current.push(i);
@@ -286,7 +336,7 @@ pub fn start_p2p_executor(
                     NetworkCommand::RegisterAsPeer(_) => {
                         println!("[Network] RegisterAsPeer() called");
                     }
-                    NetworkCommand::Ping() => {
+                    NetworkCommand::Ping(String) => {
                         println!("[Network] Ping() called");
                     }
                     NetworkCommand::Disconnect() => {
@@ -305,6 +355,52 @@ pub fn start_p2p_executor(
                             println!("no p2p data");
                         }
                     }
+                    NetworkCommand::NatTraversal(username, ip) => {
+                        if let Some(sd) = shared_data.as_ref() {
+                            println!("username:{}, ip:{}", username, ip);
+                            // user server to send nattraversal request
+                            let server_addr_query =
+                                get_socket_address(sd.servername().clone(), ip.clone());
+                            let peer_addr_query = get_socket_address(username.clone(), ip.clone());
+
+                            match server_addr_query.await {
+                                Some(server_addr) => match peer_addr_query.await {
+                                    Some(peer_addr) => {
+                                        let payload = socket_addr_to_vec(server_addr);
+
+                                        print!("{:?}", payload.clone());
+
+                                        let natreq = construct_message(
+                                            NATTRAVERSALREQUEST,
+                                            server_addr.to_string().into_bytes(),
+                                            generate_id(),
+                                            &sd.cryptopair(),
+                                        );
+
+                                        sd.senders_ref().send_via(
+                                            0,
+                                            natreq.expect(
+                                                "couldnt construct message nattraversalrequest2",
+                                            ),
+                                            server_addr.to_string(),
+                                            false,
+                                            sd.messages_list_ref(),
+                                        );
+                                    }
+                                    None => {
+                                        let err_msg = format!("failed to retreive socket address")
+                                            .to_string();
+                                        let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                    }
+                                },
+                                None => {
+                                    let err_msg =
+                                        format!("failed to retreive socket address").to_string();
+                                    let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                }
+                            }
+                        }
+                    }
                 }
             }
 
@@ -318,3 +414,78 @@ pub fn start_p2p_executor(
         }
     })
 }
+
+fn socket_addr_to_vec(addr: SocketAddr) -> Vec<u8> {
+    let mut v = match addr.ip() {
+        IpAddr::V4(v4) => v4.octets().to_vec(),
+        IpAddr::V6(v6) => v6.octets().to_vec(),
+    };
+    v.extend(&addr.port().to_be_bytes());
+    v
+}
+
+fn parse_pack(s: &str) -> Option<[u8; 6]> {
+    // split into "ip" and "port"
+    let mut parts = s.rsplitn(2, ':');
+    let port_str = parts.next()?;
+    let ip_str = parts.next()?; // if missing, invalid
+
+    let ip: Ipv4Addr = ip_str.parse().ok()?;
+    let port: u16 = port_str.parse().ok()?;
+
+    let octets = ip.octets();
+    let port_be = port.to_be_bytes();
+    Some([
+        octets[0], octets[1], octets[2], octets[3], port_be[0], port_be[1],
+    ])
+}
+
+///
+/// sends a get request to the server to get the socket address of the given peer
+///
+
+pub async fn get_socket_address(username: String, ip: String) -> Option<SocketAddr> {
+    let client = reqwest::Client::new();
+    let uri = format!("{}/peers/{}/addresses", ip, username);
+    let res = client.get(uri).send().await.expect("couldnt get response");
+    if res.status().is_success() {
+        println!("Successfully retreived the addresses.");
+    } else {
+        eprintln!(
+            "Failed to get the peers addresses from the server. Status: {}",
+            res.status()
+        );
+    }
+    let body: Bytes = res.bytes().await.expect("couldnt get bytes");
+
+    match String::from_utf8(body.to_vec()) {
+        Ok(s) => {
+            let addresses = parse_addresses(&s);
+            addresses.iter().copied().find(|a| a.is_ipv4())
+        }
+        Err(_) => None,
+    }
+}
+
+pub async fn get_possible_socket_address(username: String, ip: String) -> Vec<SocketAddr> {
+    let client = reqwest::Client::new();
+    let uri = format!("{}/peers/{}/addresses", ip, username);
+    let res = client.get(uri).send().await.expect("couldnt get response");
+    if res.status().is_success() {
+        println!("Successfully retreived the addresses.");
+    } else {
+        eprintln!(
+            "Failed to get the peers addresses from the server. Status: {}",
+            res.status()
+        );
+    }
+    let body: Bytes = res.bytes().await.expect("couldnt get bytes");
+
+    match String::from_utf8(body.to_vec()) {
+        Ok(s) => {
+            let addresses = parse_addresses(&s);
+            addresses.iter().copied().filter(|a| a.is_ipv4()).collect()
+        }
+        Err(_) => Vec::new(),
+    }
+}

client-network/src/message_handling.rs

@@ -1,5 +1,5 @@
 use crate::{
-    NetworkEvent,
+    NetworkEvent, NodeHash,
     cryptographic_signature::{
         CryptographicSignature, get_peer_key, sign_message, verify_signature,
     },
@@ -47,7 +47,7 @@ pub fn handle_recevied_message(
     server_name: &String,
     cmd_tx: crossbeam_channel::Sender<NetworkEvent>,
     ip: SocketAddr,
-    handshake_history: HandshakeHistory,
+    handhsake_history: &Arc<Mutex<HandshakeHistory>>,
 ) {
     if recevied_message.len() < 4 {
         return;
@@ -78,7 +78,8 @@ pub fn handle_recevied_message(
         cmd_tx,
         ip,
         messages_list,
-        handshake_history,
+        handhsake_history,
+        senders,
     );
 
     match resp {
@@ -168,8 +169,10 @@ pub fn parse_message(
     cmd_tx: crossbeam_channel::Sender<NetworkEvent>,
     ip: SocketAddr,
     messages_list: &Arc<Mutex<HashMap<i32, EventType>>>,
-    handhsake_history: HandshakeHistory,
+    handhsake_history_mutex: &Arc<Mutex<HandshakeHistory>>,
+    senders: &MultipleSenders,
 ) -> Option<Vec<u8>> {
+    let mut handhsake_history = handhsake_history_mutex.lock().unwrap();
     let cmd_tx_clone = cmd_tx.clone();
 
     let id_bytes: [u8; 4] = received_message[0..ID]
@@ -185,20 +188,27 @@ pub fn parse_message(
     let msg_length = u16::from_be_bytes(length_bytes) as usize;
     // verify signature
     match msgtype {
-        HELLO | HELLOREPLY | ROOTREPLY | NODATUM | NATTRAVERSALREQUEST | NATTRAVERSALREQUEST2 => {
+        HELLO | HELLOREPLY | NODATUM | NATTRAVERSALREQUEST | NATTRAVERSALREQUEST2 => {
             let ilength = u16::from_be_bytes(length_bytes);
             println!("name received length: {}", ilength);
             let received_name = &received_message[LENGTH + EXTENSIONS..LENGTH + ilength as usize];
             let received_username = String::from_utf8(received_name.to_vec());
             match received_username {
                 Ok(username) => {
-                    let peer_pubkey = match handhsake_history.get_peer_info_username(username) {
+                    let peer_pubkey =
+                        match handhsake_history.get_peer_info_username(username.clone()) {
                             Some(peerinfo) => peerinfo.pubkey,
                             _ => tokio::runtime::Runtime::new()
                                 .unwrap()
                                 .block_on(get_peer_key(&username))
                                 .expect("failed to retrieve public key"),
                         };
+                    match msgtype {
+                        HELLOREPLY => {
+                            handhsake_history.add_new_handshake(peer_pubkey, "".to_string(), ip);
+                        }
+                        _ => {}
+                    }
                     let signature: [u8; SIGNATURE] = received_message
                         [LENGTH + msg_length..LENGTH + msg_length + SIGNATURE]
                         .try_into()
@@ -217,6 +227,22 @@ pub fn parse_message(
                 }
             }
         }
+        ROOTREPLY => {
+            let ilength = u16::from_be_bytes(length_bytes);
+            println!("name received length: {}", ilength);
+            if let Some(peerinfo) = handhsake_history.get_peer_info_ip(ip.to_string()) {
+                if !verify_signature(peerinfo.pubkey, &received_message) {
+                    println!(
+                        "incorrect signature from given peer: {}, ignoring message of type {} with id {}",
+                        &peerinfo.username, received_message[ID], id
+                    );
+                    return None;
+                } else {
+                    println!("signature verified");
+                }
+            }
+        }
+
         _ => {}
     }
 
@@ -234,6 +260,49 @@ pub fn parse_message(
         //
         // rien ?
         // si NATTRAVERSALREQUEST alors
+        NATTRAVERSALREQUEST => {
+            // send ok & send nattraversalrequest2 to peer
+            constructed_message = construct_message(OK, Vec::new(), id, crypto_pair);
+
+            let ilength = u16::from_be_bytes(length_bytes);
+            let received_address =
+                &received_message[LENGTH + EXTENSIONS..LENGTH + ilength as usize];
+            let address = String::from_utf8(received_address.to_vec()).expect("wrong name");
+
+            let natreq2 = construct_message(
+                NATTRAVERSALREQUEST2,
+                ip.to_string().into_bytes(),
+                id,
+                crypto_pair,
+            );
+
+            senders.send_via(
+                0,
+                natreq2.expect("couldnt construct message nattraversalrequest2"),
+                address,
+                false,
+                &messages_list,
+            );
+        }
+
+        NATTRAVERSALREQUEST2 => {
+            // send ok & send ping to peer
+            constructed_message = construct_message(OK, Vec::new(), id, crypto_pair);
+
+            let ilength = u16::from_be_bytes(length_bytes);
+            let received_address = &received_message[LENGTH..LENGTH + ilength as usize];
+            let address = String::from_utf8(received_address.to_vec()).expect("wrong name");
+
+            let pingreq = construct_message(PING, Vec::new(), id, crypto_pair);
+
+            senders.send_via(
+                0,
+                pingreq.expect("couldnt construct message ping request"),
+                address,
+                false,
+                &messages_list,
+            );
+        }
         //
         // ERROR
         //
@@ -268,8 +337,18 @@ pub fn parse_message(
         //
         // ajoute a la liste des peers handshake
         HELLOREPLY => {
-            // ajoute a la liste des peers handshake
+            // ajoute l'username a la liste des peers handshake
-            handhsake_history.add_new_handshake(hash, username, ip);
+            let received_length = u16::from_be_bytes(
+                received_message[TYPE..LENGTH]
+                    .try_into()
+                    .expect("incorrect size"),
+            );
+            let received_username =
+                &received_message[LENGTH + EXTENSIONS..LENGTH + received_length as usize];
+            handhsake_history.update_peer_info(
+                ip.to_string(),
+                String::from_utf8(received_username.to_vec()).expect("invalid conversion"),
+            );
             // verifie s'il faut renvoyer un root request
             let guard = messages_list.lock().expect("Échec du verrouillage");
             let res = guard.get(&id);
@@ -300,15 +379,21 @@ pub fn parse_message(
         //
         ROOTREPLY => {
             // recuperer le pseudo du peers ayant repondu
-
+            let peers_exist = handhsake_history.get_peer_info_ip(ip.to_string());
+            match peers_exist {
+                Some(peerinfo) => {
                     // envoyer le hash a la gui
-            let received_hash = String::from_utf8(received_message[LENGTH..(32 + LENGTH)].to_vec());
+                    let received_hash: NodeHash = received_message[LENGTH..(32 + LENGTH)]
-            match received_hash {
+                        .try_into()
-                Ok(hash) => {
+                        .expect("incorrect size");
-                    cmd_tx_clone.send(NetworkEvent::FileTreeRootReceived());
+                    let res = cmd_tx_clone.send(NetworkEvent::FileTreeRootReceived(
+                        peerinfo.username.clone(),
+                        received_hash,
+                    ));
+                    println!("file tree sent")
                 }
-                Err(e) => {
+                None => {
-                    println!("{}", e);
+                    eprintln!("no peers found");
                 }
             }
         }

client-network/src/messages_channels.rs

@@ -219,8 +219,11 @@ impl MultipleSenders {
         };
         if let Some(sender) = self.senders.get(channel_idx) {
             let _ = sender.send(msg_to_send);
-            let mut guard = messages_list.lock().expect("Échec du verrouillage");
+        }
-            let id = i32::from_be_bytes(data[..4].try_into().unwrap());
+        if !is_resp_to_server_handshake {
+            let mut guard = messages_list.lock().unwrap();
+            let message_id: [u8; 4] = data[0..4].try_into().expect("size error");
+            let id = i32::from_be_bytes(message_id);
             guard.insert(id, EventType::SendRootRequest);
         }
     }
@@ -257,17 +260,20 @@ impl MultipleSenders {
             }
         });
     }*/
+}
 
 pub fn start_receving_thread(
     shared_data: &P2PSharedData,
     cmd_tx: crossbeam_channel::Sender<NetworkEvent>,
+    handshake_history: &Arc<Mutex<HandshakeHistory>>,
 ) {
     let sock_clone = shared_data.socket();
     let cryptopair_clone = shared_data.cryptopair();
     let senders_clone = shared_data.senders();
     let messages_clone = shared_data.messages_list();
     let servername_clone = shared_data.servername();
-        let handshake_history = HandshakeHistory::new();
+
+    let handshake_clone = handshake_history.clone();
     thread::spawn(move || {
         let mut buf = [0u8; 1024];
         loop {
@@ -284,7 +290,7 @@ impl MultipleSenders {
                         &servername_clone,
                         cmd_tx.clone(),
                         src,
-                            handshake_history,
+                        &handshake_clone,
                     );
                 }
                 Err(e) => eprintln!("Erreur de réception: {}", e),
@@ -292,4 +298,3 @@ impl MultipleSenders {
         }
     });
 }
-}

client-network/src/messages_structure.rs

@@ -1,7 +1,4 @@
-use crate::{
+use crate::cryptographic_signature::{CryptographicSignature, sign_message};
-    cryptographic_signature::{CryptographicSignature, sign_message},
-    server_communication::generate_id,
-};
 
 const ID: usize = 4;
 const TYPE: usize = 5;
@@ -9,18 +6,18 @@ const LENGTH: usize = 7;
 const EXTENSIONS: usize = 4;
 const SIGNATURE: usize = 64;
 
-const PING: u8 = 0;
+pub(crate) const PING: u8 = 0;
-const OK: u8 = 128;
+pub(crate) const OK: u8 = 128;
-const ERROR: u8 = 129;
+pub(crate) const ERROR: u8 = 129;
-const HELLO: u8 = 1;
+pub(crate) const HELLO: u8 = 1;
-const HELLOREPLY: u8 = 130;
+pub(crate) const HELLOREPLY: u8 = 130;
-pub const ROOTREQUEST: u8 = 2;
+pub(crate) const ROOTREQUEST: u8 = 2;
-const ROOTREPLY: u8 = 131;
+pub(crate) const ROOTREPLY: u8 = 131;
-const DATUMREQUEST: u8 = 3;
+pub(crate) const DATUMREQUEST: u8 = 3;
-const NODATUM: u8 = 133;
+pub(crate) const NODATUM: u8 = 133;
-const DATUM: u8 = 132;
+pub(crate) const DATUM: u8 = 132;
-const NATTRAVERSALREQUEST: u8 = 4;
+pub(crate) const NATTRAVERSALREQUEST: u8 = 4;
-const NATTRAVERSALREQUEST2: u8 = 5;
+pub(crate) const NATTRAVERSALREQUEST2: u8 = 5;
 
 pub fn construct_message(
     msgtype: u8,
@@ -56,8 +53,10 @@ pub fn construct_message(
             return Some(message);
         }
         ROOTREPLY | NODATUM | DATUM | NATTRAVERSALREQUEST => {
-            message.extend_from_slice(&payload.len().to_be_bytes());
+            println!("payload:{:?}", &payload);
+            message.extend_from_slice(&(payload.len() as u16).to_be_bytes());
             message.extend_from_slice(&payload);
+            println!("payload:{:?}", &message);
             let signature = sign_message(crypto_pair, &message);
             message.extend_from_slice(&signature);
             return Some(message);
@@ -67,3 +66,176 @@ pub fn construct_message(
     }
     None
 }
+
+pub struct UDPMessage {
+    id: u32,
+    msg_type: u8,
+    length: u16,
+    body: Vec<u8>,
+    signature: Vec<u8>,
+}
+
+pub struct HandshakeMessage {
+    pub id: u32,
+    msg_type: u8,
+    length: u16,
+    extensions: u32,
+    pub name: Vec<u8>,
+    pub signature: Vec<u8>,
+}
+
+pub struct NatTraversal {}
+
+impl UDPMessage {
+    pub fn ping(id: u32) -> UDPMessage {
+        UDPMessage {
+            id: id,
+            msg_type: 0,
+            length: 0,
+            body: vec![0; 985],
+            signature: vec![0; 32],
+        }
+    }
+
+    pub fn error(id: u32) -> UDPMessage {
+        UDPMessage {
+            id: id,
+            msg_type: 129,
+            length: 0,
+            body: vec![0; 985],
+            signature: vec![0; 32],
+        }
+    }
+
+    pub fn parse(received_message: Vec<u8>) -> UDPMessage {
+        let id_bytes: [u8; 4] = received_message[0..4]
+            .try_into()
+            .expect("Taille incorrecte");
+        let length_bytes: [u8; 2] = received_message[5..7]
+            .try_into()
+            .expect("Taille incorrecte");
+        let msg_length = u16::from_be_bytes(length_bytes);
+        let name_bytes = &received_message[7..msg_length as usize + 8];
+        let signature_bytes =
+            &received_message[msg_length as usize + 8..msg_length as usize + 9 + 32];
+        UDPMessage {
+            id: u32::from_be_bytes(id_bytes),
+            msg_type: received_message[4],
+            length: u16::from_be_bytes(length_bytes),
+            body: name_bytes.to_vec(),
+            signature: signature_bytes.to_vec(),
+        }
+    }
+
+    pub fn display(&self) {
+        println!("ID: {:?}", self.id);
+        println!("Message Type: {}", self.msg_type);
+        println!("Length: {:?}", self.length);
+        let good_length = usize::min(self.length as usize, 985);
+        println!("name: {:?}", &self.body[..good_length]);
+        println!("Signature: {:?}", self.signature);
+    }
+}
+
+impl HandshakeMessage {
+    pub fn display(&self) {
+        println!("ID: {:?}", self.id);
+        println!("Message Type: {}", self.msg_type);
+        println!("Length: {:?}", self.length);
+        println!("extensions: {:?}", self.extensions);
+        println!("name: {:?}", &self.name[..(self.length - 4) as usize]);
+        println!("Signature: {:?}", self.signature);
+    }
+    pub fn hello(id: u32, length: u16, username: String) -> HandshakeMessage {
+        let name_vec = username.trim_end_matches(char::from(0)).as_bytes().to_vec();
+        HandshakeMessage {
+            id: id,
+            msg_type: 1,
+            length: length,
+            extensions: 0,
+            name: name_vec,
+            signature: vec![0; 64],
+        }
+    }
+
+    pub fn helloReply(id: u32, length: u16, username: String) -> HandshakeMessage {
+        let name_vec = username.trim_end_matches(char::from(0)).as_bytes().to_vec();
+        HandshakeMessage {
+            id: id,
+            msg_type: 130,
+            length: length,
+            extensions: 0,
+            name: name_vec,
+            signature: vec![0; 64],
+        }
+    }
+
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::with_capacity(4 + 1 + 2 + 4 + self.name.len() + self.signature.len());
+
+        // id: u32 little-endian
+        out.extend_from_slice(&self.id.to_be_bytes());
+
+        // msg_type: u8
+        out.push(self.msg_type);
+
+        out.extend_from_slice(&self.length.to_be_bytes());
+
+        out.extend_from_slice(&self.extensions.to_be_bytes());
+
+        out.extend_from_slice(&self.name);
+
+        out.extend_from_slice(&self.signature);
+
+        out
+    }
+
+    pub fn parse(received_message: Vec<u8>) -> HandshakeMessage {
+        let id_bytes: [u8; 4] = received_message[0..4]
+            .try_into()
+            .expect("Taille incorrecte");
+        let length_bytes: [u8; 2] = received_message[5..7]
+            .try_into()
+            .expect("Taille incorrecte");
+        let msg_length = u16::from_be_bytes(length_bytes);
+        let extensions_bytes: [u8; 4] = received_message[7..11]
+            .try_into()
+            .expect("Taille incorrecte");
+        let name_bytes = &received_message[11..(11 + msg_length - 4) as usize];
+        let signature_bytes =
+            &received_message[(11 + msg_length - 4) as usize..(11 + msg_length - 4 + 64) as usize];
+        HandshakeMessage {
+            id: u32::from_be_bytes(id_bytes),
+            msg_type: received_message[4],
+            length: u16::from_be_bytes(length_bytes),
+            extensions: u32::from_be_bytes(extensions_bytes),
+            name: name_bytes.to_vec(),
+            signature: signature_bytes.to_vec(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    // Note this useful idiom: importing names from outer (for mod tests) scope.
+    use super::*;
+
+    /// creates an handshake message
+    #[tokio::test]
+    async fn creating_handshake_msg() {
+        let username = String::from("charlie_kirk");
+        let handshake = HandshakeMessage::hello(0, 12, username);
+        handshake.display();
+    }
+
+    /// parses an handshake message
+    #[tokio::test]
+    async fn parse_handshakemessage() {
+        let username = String::from("charlie_kirk");
+        let handshake = HandshakeMessage::hello(0, 12, username);
+        let ser = handshake.serialize();
+        let parsed = HandshakeMessage::parse(ser);
+        handshake.display();
+        parsed.display();
+    }
+}

client-network/src/peers_refresh.rs

@@ -3,7 +3,7 @@
 
 use std::{
     collections::{HashMap, VecDeque},
-    net::{AddrParseError, SocketAddr},
+    net::{AddrParseError, Ipv4Addr, SocketAddr},
     ops::Add,
     process::Command,
     sync::{Arc, Mutex},
@@ -21,7 +21,7 @@ use p256::ecdsa::VerifyingKey;
 
 #[derive(Debug, Clone)]
 pub struct PeerInfo {
-    username: String,
+    pub username: String,
     pub pubkey: VerifyingKey,
     pub ip: SocketAddr,
 }
@@ -82,6 +82,27 @@ impl HandshakeHistory {
         });
     }
 
+    pub fn update_peer_info(&mut self, ip: String, username: String) {
+        let peerinfo = self.get_peer_info_ip(ip.clone());
+        match peerinfo {
+            Some(peer_info) => match ip.parse::<SocketAddr>() {
+                Ok(addr) => {
+                    let new_peer_info = PeerInfo {
+                        username: username.clone(),
+                        pubkey: peer_info.pubkey,
+                        ip: addr,
+                    };
+                    self.ip_k_peerinfo_v.insert(ip, new_peer_info.clone());
+                    self.username_k_peerinfo_v.insert(username, new_peer_info);
+                }
+                Err(e) => eprintln!("parse error: {}", e),
+            },
+            None => {
+                eprintln!("no peer info found in hashmap")
+            }
+        }
+    }
+
     pub fn add_new_handshake(&mut self, hash: VerifyingKey, username: String, ip: SocketAddr) {
         let peerinfo = PeerInfo {
             username: username.clone(),
@@ -104,8 +125,8 @@ pub fn perform_discover(
 ) {
     // first, sends handshake
     if hash == "root" {
-        perform_handshake(sd, username, server_ip, event_tx);
+        perform_handshake(sd, username, server_ip, event_tx, false);
-        if let Some(data) = construct_message(
+        /*if let Some(data) = construct_message(
             messages_structure::ROOTREQUEST,
             Vec::new(),
             generate_id(),
@@ -115,7 +136,7 @@ pub fn perform_discover(
                 sd.senders_ref()
                     .send_via(0, data, peerinfo.ip.to_string(), false);
             }
-        }
+        }*/
     } else {
         // envoyer un datum request
     }

client-network/src/registration.rs

@@ -1,11 +1,11 @@
 use bytes::Bytes;
-use getrandom::Error;
 
 use crate::NetworkEvent;
 use crate::P2PSharedData;
 use crate::cryptographic_signature::{CryptographicSignature, formatPubKey, sign_message};
+use crate::get_socket_address;
 use crate::message_handling::EventType;
-use crate::messages_channels::{Message, MultipleSenders};
+use crate::messages_channels::MultipleSenders;
 use crate::messages_structure::construct_message;
 use crate::server_communication::generate_id;
 use crossbeam_channel::{Receiver, Sender};
@@ -33,26 +33,6 @@ pub async fn register_with_the_server(
     Ok(())
 }
 
-///
-/// sends a get request to the server to get the socket address of the given peer
-///
-
-pub async fn get_socket_address(username: String, ip: String) -> Result<Bytes, reqwest::Error> {
-    let client = reqwest::Client::new();
-    let uri = format!("{}/peers/{}/addresses", ip, username);
-    let res = client.get(uri).send().await?;
-    if res.status().is_success() {
-        println!("Successfully retreived the addresses.");
-    } else {
-        eprintln!(
-            "Failed to get the peers addresses from the server. Status: {}",
-            res.status()
-        );
-    }
-    let body: Bytes = res.bytes().await?;
-    Ok(body)
-}
-
 pub fn parse_addresses(input: &String) -> Vec<SocketAddr> {
     let mut addrs = Vec::new();
     for line in input.lines() {
@@ -75,19 +55,16 @@ pub async fn perform_handshake(
     username: String,
     ip: String,
     event_tx: Sender<NetworkEvent>,
+    is_server_handshake: bool,
 ) {
+    println!("username: {}, ip: {}", username.clone(), ip.clone());
     let crypto_pair = sd.cryptopair_ref();
     let senders = sd.senders_ref();
     let messages_list = sd.messages_list_ref();
     let id = generate_id();
     let server_addr_query = get_socket_address(username.clone(), ip.clone());
-
     match server_addr_query.await {
-        Ok(sockaddr_bytes) => {
+        Some(sockaddr_bytes) => {
-            match String::from_utf8(sockaddr_bytes.to_vec()) {
-                Ok(s) => {
-                    let addresses = parse_addresses(&s);
-                    if let Some(first) = addresses.first() {
             sd.set_servername(username);
             // first: &SocketAddr
             let mut payload = Vec::new();
@@ -99,33 +76,16 @@ pub async fn perform_handshake(
                     senders.send_via(
                         0,
                         handshake_message,
-                                    first.to_string(),
+                        sockaddr_bytes.to_string(),
-                                    false,
+                        is_server_handshake,
                         messages_list,
                     );
                 }
                 None => {}
             }
-
-                        //let res = event_tx
-                        //    .send(NetworkEvent::());
-                    } else {
-                        //let res = event_tx.send(NetworkEvent::Error());
-                        let err_msg =
-                            format!("no valid socket addresses found in: {}", s).to_string();
-                        let res = event_tx.send(NetworkEvent::Error(err_msg));
         }
-                }
+        None => {
-                Err(e) => {
+            let err_msg = format!("failed to retreive socket address:").to_string();
-                    //let res = event_tx.send(NetworkEvent::Error());
-                    let err_msg =
-                        format!("invalid UTF-8 in socket address bytes: {}", e).to_string();
-                    let res = event_tx.send(NetworkEvent::Error(err_msg));
-                }
-            }
-        }
-        Err(e) => {
-            let err_msg = format!("failed to retreive socket address: {}", e).to_string();
             let res = event_tx.send(NetworkEvent::Error(err_msg));
         }
     }

todo.md

@@ -1,13 +1,32 @@
-# Todo : 
+# Todo
-
 
 ## peer discovery
 
 ## handshake
+
+# Todo
+
+## peer discovery
+
+- get rsquest to the uri /peers/
+
+## registration with the server
+
+- generation of the cryptographic key OK
+- put request to the uri (check if the peer is already connected) OK
+- udp handshakes OK
+- get request to the uri /peers/key to get the public key of a peer OK
+- get request to the uri /peers/key/addresses OK
+
+## handshake
+
+- handshake structure OK
+
 - 5min timeout after handshake
 - matain connection every 4 min
 
 ## data transfer
+
 - request structure
 - root/root reply structure
 - datum/nodatum and datum structures
@@ -15,7 +34,16 @@
 - setting in gui to act as a relay
 - chunk, directory, big, bigdirectory structures
 
-## fonctionnalités application :
+## fonctionnalités application
+
+## nat traversal
+
+- make hello and helloreply messages set the first extension bit to announce that peer is available for nat traversal
+- implement actual nat traversal requests
+- implement nat traversal :
+  - if hello/helloreply doesnt work with a peer, find a peer that supports nat traversal (server in priority) then begin protocol
+
+fonctionnalités :
 
 rechercher les fichiers d'un pair
 telechargement des fichiers
@@ -25,13 +53,11 @@ choisir le nombre de canaux
 handshake server DOING
 se deconnecter du réseau DOING
 
-
+## autre
-## autre :
 
 socket ipv6
 
-
+# FAIT
-# FAIT : 
 
 - choisir un pseudo OK
 - get rsquest to the uri /peers/ OK
@@ -45,4 +71,3 @@ socket ipv6
 - generer une clé publique OK
 - verifier signature OK
 - 2 channels -> un pour envoyer et un pour recevoir OK
-