diff --git a/client-gui/src/gui_app.rs b/client-gui/src/gui_app.rs index 09d3797..34b95fb 100644 --- a/client-gui/src/gui_app.rs +++ b/client-gui/src/gui_app.rs @@ -1,6 +1,7 @@ use client_network::{ - ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash, filename_to_string, - node_hash_to_hex_string, + ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash, + big_or_chunk_to_file, filename_to_string, generate_base_tree, node_hash_to_hex_string, + remove_null_bytes, }; use crossbeam_channel::{Receiver, Sender}; use egui::{ @@ -8,7 +9,9 @@ use egui::{ Popup, ScrollArea, SidePanel, TextStyle, TopBottomPanel, Ui, ViewportCommand, debug_text::print, }; -use std::{collections::HashMap, fmt::format}; +use std::{collections::HashMap, fmt::format, io::Seek}; + +use std::fs::{File, OpenOptions, create_dir}; enum ServerStatus { Loading, @@ -35,6 +38,7 @@ pub struct P2PClientApp { // Key: Parent Directory Hash (String), Value: List of children FileNode loaded_fs: HashMap, + shared_tree: MerkleTree, // Current peer tree displayed active_peer: Option, @@ -73,6 +77,7 @@ impl P2PClientApp { error_message: None, connect_name_input: "bob".to_string(), active_server: "".to_string(), + shared_tree: generate_base_tree(), } } pub fn show_error(&mut self, msg: impl Into) { @@ -116,6 +121,30 @@ impl eframe::App for P2PClientApp { self.known_peers.push((addr, true)); } } + NetworkEvent::RootRequest(addr) => { + let root = self.shared_tree.root; + let _ = self + .network_cmd_tx + .send(NetworkCommand::SendRootReply(root.to_vec(), addr)); + } + NetworkEvent::DatumRequest(node_hash, addr) => { + let hash: NodeHash = node_hash.try_into().expect("incorrect size"); + let asked_datum = self.shared_tree.data.get(&hash); + match asked_datum { + Some(datum_found) => { + let _ = self.network_cmd_tx.send(NetworkCommand::SendDatum( + datum_found.clone(), + node_hash, + addr, + )); + } + None => { + let _ = self + .network_cmd_tx + .send(NetworkCommand::SendNoDatum(node_hash.to_vec(), addr)); + } + } + } NetworkEvent::PeerListUpdated(peers) => { //todo!(); @@ -501,11 +530,30 @@ impl P2PClientApp { .on_hover_text("Click to request file chunks...") .clicked() { - todo!(); + match create_dir("../Download/") { + Ok(_) => println!("Directory created successfully!"), + Err(e) => println!("Failed to create directory: {}", e), + } + + let new_name = format!("./Download/{}", name); + + let sani = remove_null_bytes(&new_name); + + println!("sani:{}", sani); + + let mut file = OpenOptions::new() + .append(true) + .create(true) + .open(sani) + .unwrap(); + + big_or_chunk_to_file(tree, &MerkleNode::Chunk(node.clone()), &mut file); + // if let Some(peer_id) = active_peer_id.clone() { // let _ = self.network_cmd_tx.send(NetworkCommand::RequestChunk(peer_id, entry_hash.clone())); // // self.status_message = format!("Requested file chunks for: {}...", &entry_hash[..8]); // } + // todo!(); } } MerkleNode::Directory(node) => { @@ -525,14 +573,26 @@ impl P2PClientApp { }); } MerkleNode::Big(node) => { - CollapsingHeader::new(format!("📄 (B) {}", name)) - .default_open(false) - .enabled(true) - .show(ui, |ui| { - for child in &node.children_hashes { - self.draw_file_node(ui, child.clone(), tree, depth + 1, None); - } - }); + /*CollapsingHeader::new(format!("📄 (B) {}", name)) + .default_open(false) + .enabled(true) + .show(ui, |ui| { + for child in &node.children_hashes { + self.draw_file_node(ui, child.clone(), tree, depth + 1, None); + } + });*/ + if ui + .selectable_label(false, format!("📄 (B) {}", name)) + .on_hover_text("Click to request file chunks...") + .clicked() + { + /*self.network_cmd_tx.send(NetworkCommand::GetChildren(node.children_hashes, ))*/ + todo!(); + // if let Some(peer_id) = active_peer_id.clone() { + // let _ = self.network_cmd_tx.send(NetworkCommand::RequestChunk(peer_id, entry_hash.clone())); + // // self.status_message = format!("Requested file chunks for: {}...", &entry_hash[..8]); + // } + } } MerkleNode::BigDirectory(node) => { CollapsingHeader::new(format!("📁 (BD) {}", name)) diff --git a/client-network/src/cryptographic_signature.rs b/client-network/src/cryptographic_signature.rs index 542daba..84dec19 100644 --- a/client-network/src/cryptographic_signature.rs +++ b/client-network/src/cryptographic_signature.rs @@ -134,7 +134,7 @@ pub fn sign_message(crypto_pair: &CryptographicSignature, message: &Vec) -> #[cfg(test)] mod tests { use super::*; - + /* /// /// creates a cryptographic signature /// @@ -144,7 +144,7 @@ mod tests { let crypto_pair = CryptographicSignature::new(username); let formatted_pubkey = formatPubKey(crypto_pair); println!("pubkey : {}", formatted_pubkey); - } + }*/ /*#[test] fn signing_message() { diff --git a/client-network/src/data.rs b/client-network/src/data.rs index 04171aa..47c0c68 100644 --- a/client-network/src/data.rs +++ b/client-network/src/data.rs @@ -1,7 +1,13 @@ use rand::{Rng, rng}; +use sha2::{Digest, Sha256}; use std::collections::HashMap; use std::hash::{DefaultHasher, Hash, Hasher}; +use std::fs::{File, OpenOptions, create_dir}; +use std::io::{self, Write}; + +use std::env; + // --- Constants --- pub const MAX_CHUNK_DATA_SIZE: usize = 1024; pub const MAX_DIRECTORY_ENTRIES: usize = 16; @@ -176,3 +182,336 @@ impl MerkleNode { bytes } } + +fn hash(data: &[u8]) -> NodeHash { + let root_hash = Sha256::digest(&data); + println!("root hash: {:?}", root_hash); + let res: NodeHash = root_hash.try_into().expect("incorrect size"); + res + /*let mut hasher = DefaultHasher::new(); + data.hash(&mut hasher); + let hash_u64 = hasher.finish(); + + let mut hash_array = [0u8; FILENAME_HASH_SIZE]; + // Simple way to spread a 64-bit hash across 32 bytes for a unique-ish ID + for i in 0..8 { + hash_array[i] = (hash_u64 >> (i * 8)) as u8; + } + hash_array // The rest remains 0, satisfying the 32-byte requirement + */ +} + +fn generate_random_filename() -> [u8; FILENAME_HASH_SIZE] { + let mut rng = rand::rng(); + let mut filename_bytes = [0; FILENAME_HASH_SIZE]; + + // Generate a random length for the base name + let name_len = rng.random_range(5..21); + + // Generate random alphanumeric characters + for i in 0..name_len { + let char_code = rng.random_range(97..123); // 'a' through 'z' + if i < FILENAME_HASH_SIZE { + filename_bytes[i] = char_code as u8; + } + } + + // Append a common extension + let ext = if rng.random_bool(0.5) { ".txt" } else { ".dat" }; + let ext_bytes = ext.as_bytes(); + let start_index = name_len.min(FILENAME_HASH_SIZE - ext_bytes.len()); + if start_index < FILENAME_HASH_SIZE { + filename_bytes[start_index..(start_index + ext_bytes.len())].copy_from_slice(ext_bytes); + } + + filename_bytes +} + +fn generate_random_file_node( + storage: &mut HashMap, +) -> Result { + let mut rng = rng(); + let is_big = rng.random_bool(0.2); // 20% chance of being a big file + + if !is_big { + // Generate a simple Chunk Node + let node = MerkleNode::Chunk(ChunkNode::new_random()); + let hash = hash(&node.serialize()); + storage.insert(hash, node); + Ok(hash) + } else { + // Generate a Big Node (a file composed of chunks) + let num_children = rng.random_range(MIN_BIG_CHILDREN..=MAX_BIG_CHILDREN.min(8)); // Limit complexity + let mut children_hashes = Vec::with_capacity(num_children); + + for _ in 0..num_children { + // Children must be Chunk or Big; for simplicity, we only generate Chunk children here. + let chunk_node = MerkleNode::Chunk(ChunkNode::new_random()); + let chunk_hash = hash(&chunk_node.serialize()); + storage.insert(chunk_hash, chunk_node); + children_hashes.push(chunk_hash); + } + + let node = MerkleNode::Big(BigNode::new(children_hashes)?); + let hash = hash(&node.serialize()); + storage.insert(hash, node); + Ok(hash) + } +} + +fn generate_random_directory_node( + depth: u32, + max_depth: u32, + storage: &mut HashMap, +) -> Result { + let mut rng = rng(); + let current_depth = depth + 1; + let is_big_dir = rng.random_bool(0.3) && current_depth < max_depth; + + if !is_big_dir || current_depth >= max_depth { + // Generate a simple Directory Node (leaf level directory) + let num_entries = rng.random_range(1..=MAX_DIRECTORY_ENTRIES.min(5)); // Limit directory size for testing + let mut entries = Vec::with_capacity(num_entries); + + for _ in 0..num_entries { + if rng.random_bool(0.7) { + // 70% chance of creating a file (Chunk/Big) + let file_hash = generate_random_file_node(storage)?; + let entry = DirectoryEntry { + filename: generate_random_filename(), + content_hash: file_hash, + }; + entries.push(entry); + } else if current_depth < max_depth { + // 30% chance of creating a subdirectory + let dir_hash = generate_random_directory_node(current_depth, max_depth, storage)?; + + // Create a basic directory entry name + let mut filename_bytes = [0; 32]; + let subdir_name = format!("dir_{}", current_depth); + filename_bytes[..subdir_name.len()].copy_from_slice(subdir_name.as_bytes()); + + let entry = DirectoryEntry { + filename: filename_bytes, + content_hash: dir_hash, + }; + entries.push(entry); + } + } + + let node = MerkleNode::Directory(DirectoryNode::new(entries)?); + let hash = hash(&node.serialize()); + storage.insert(hash, node); + Ok(hash) + } else { + // Generate a BigDirectory Node (internal directory structure) + let num_children = rng.random_range(MIN_BIG_CHILDREN..=MAX_BIG_CHILDREN.min(4)); // Limit children count + let mut children = Vec::with_capacity(num_children); + + for _ in 0..num_children { + // Children must be Directory or BigDirectory + let child_hash = generate_random_directory_node(current_depth, max_depth, storage)?; + children.push(child_hash); + } + + let node = MerkleNode::BigDirectory(BigDirectoryNode::new(children)?); + let hash = hash(&node.serialize()); + storage.insert(hash, node); + Ok(hash) + } +} + +pub fn generate_random_tree( + max_depth: u32, +) -> Result<(NodeHash, HashMap), String> { + let mut storage = HashMap::new(); + + // Start tree generation from the root directory at depth 0 + let root_hash = generate_random_directory_node(0, max_depth, &mut storage)?; + + Ok((root_hash, storage)) +} + +pub fn generate_base_tree() -> MerkleTree { + let mut res = HashMap::new(); + + let bob_content = "where is bob".to_string().into_bytes(); + let alice_content = "alice".to_string().into_bytes(); + let oscar_content = "oscar is the opponent".to_string().into_bytes(); + + let mut children_nodes = Vec::new(); + for i in 0..10 { + let mut i_nodes = Vec::new(); + for j in 0..10 { + let node1 = MerkleNode::Chunk(ChunkNode::new(bob_content.clone()).unwrap()); + let hash = hash(&node1.serialize()); + i_nodes.push(hash); + res.insert(hash, node1); + } + let bignode = MerkleNode::Big(BigNode::new(i_nodes).unwrap()); + let hashbig = hash(&bignode.serialize()); + children_nodes.push(hashbig); + res.insert(hashbig, bignode); + } + + let bignode = MerkleNode::Big(BigNode::new(children_nodes).unwrap()); + let hashbig = hash(&bignode.serialize()); + + let node1 = MerkleNode::Chunk(ChunkNode::new(bob_content).unwrap()); + let hash1 = hash(&node1.serialize()); + + let node2 = MerkleNode::Chunk(ChunkNode::new(alice_content).unwrap()); + let hash2 = hash(&node2.serialize()); + + //res.insert(hash1, node1); + //res.insert(hash2, node2); + res.insert(hashbig, bignode); + + let node3 = MerkleNode::Chunk(ChunkNode::new(oscar_content).unwrap()); + let hash3 = hash(&node3.serialize()); + + //res.insert(hash3, node3); + + let dir1 = MerkleNode::Directory(DirectoryNode { + entries: [DirectoryEntry { + filename: generate_random_filename(), + content_hash: hash3, + }] + .to_vec(), + }); + let hash_dir1 = hash(&dir1.serialize()); + + //res.insert(hash_dir1, dir1); + + let root = MerkleNode::Directory(DirectoryNode { + entries: [ + DirectoryEntry { + filename: generate_random_filename(), + content_hash: hashbig, + }, + /*DirectoryEntry { + filename: generate_random_filename(), + content_hash: hash2, + }, + DirectoryEntry { + filename: generate_random_filename(), + content_hash: hash_dir1, + },*/ + ] + .to_vec(), + }); + + let root_hash = Sha256::digest(&root.serialize()); + println!("root hash: {:?}", root_hash); + res.insert(root_hash.try_into().expect("incorrect size"), root); + + MerkleTree::new(res, root_hash.try_into().expect("incorrect size")) +} + +pub fn node_to_file(tree: &MerkleTree, node: &MerkleNode, path: String, i: u8) { + match node.clone() { + MerkleNode::Directory(dir) => { + if i != 0 { + let new_path = format!("{}/fold_{}", path.clone(), i); + match create_dir(new_path.clone()) { + Ok(_) => println!("Directory created successfully!"), + Err(e) => println!("Failed to create directory: {}", e), + } + } + for entry in dir.entries { + // creer un fichier pour chaque entry + if let Ok(filename_str) = String::from_utf8(entry.filename.to_vec()) { + let new_name = format!("{}{}", path.clone(), remove_null_bytes(&filename_str)); + + println!("new_name: {}", new_name); + let file = OpenOptions::new() + .append(true) + .create(true) + .open(new_name.clone()); + match file { + Ok(mut fileok) => { + if let Some(current) = tree.data.get(&entry.content_hash) { + big_or_chunk_to_file(&tree, ¤t, &mut fileok); + } + } + Err(e) => { + eprintln!("error creaation file: {}", e); + } + } + } + } + } + MerkleNode::BigDirectory(bigdir) => { + for entry in bigdir.children_hashes.iter() { + if let Some(current) = tree.data.get(entry) { + node_to_file(tree, current, path.clone(), i + 1); + } + } + } + _ => { + eprintln!("invalid type of dir"); + } + } +} + +pub fn remove_null_bytes(input: &str) -> String { + input.chars().filter(|&c| c != '\0').collect() +} + +pub fn big_or_chunk_to_file(tree: &MerkleTree, node: &MerkleNode, file: &mut File) { + match node { + MerkleNode::Big(big) => { + for entry in big.children_hashes.iter() { + if let Some(current) = tree.data.get(entry) { + big_or_chunk_to_file(tree, current, file); + } + } + } + MerkleNode::Chunk(chunk) => { + println!("wrote data"); + let _ = file.write_all(&chunk.data); + } + _ => { + println!("invalid type of file"); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + /// + /// creates a cryptographic signature + /// + #[test] + fn test_saving_tree() { + if let Ok(current_dir) = env::current_dir() { + println!("Current working directory: {:?}", current_dir); + } + + println!("--------- tree test starts ------------"); + + match create_dir("../Download/") { + Ok(_) => println!("Directory created successfully!"), + Err(e) => println!("Failed to create directory: {}", e), + } + let tree = generate_base_tree(); + + println!("--------- test tree created ------------"); + if let Some(root_node) = tree.data.get(&tree.root) { + node_to_file(&tree, root_node, "../Download/".to_string(), 0); + } + } + + /*#[test] + fn signing_message() { + let username = String::from("gamixtreize"); + let crypto_pair = CryptographicSignature::new(username.clone()); + let handshake = HandshakeMessage::hello(0, 12, username); + let ser = handshake.serialize(); + let signed_message = sign_message(&crypto_pair, &ser); + println!("unsigned_message: {:?}", ser); + println!("signed_message: {:?}", signed_message); + }*/ +} diff --git a/client-network/src/lib.rs b/client-network/src/lib.rs index 7aa9b45..d897624 100644 --- a/client-network/src/lib.rs +++ b/client-network/src/lib.rs @@ -10,13 +10,14 @@ mod registration; mod server_communication; mod threads_handling; +use crate::messages_structure::ROOTREPLY; use crate::peers_refresh::*; use crate::{ cryptographic_signature::CryptographicSignature, message_handling::EventType, messages_channels::{MultipleSenders, start_receving_thread, start_retry_thread}, messages_structure::{ - DATUMREQUEST, NATTRAVERSALREQUEST, NATTRAVERSALREQUEST2, PING, ROOTREQUEST, + DATUM, DATUMREQUEST, NATTRAVERSALREQUEST, NATTRAVERSALREQUEST2, NODATUM, PING, ROOTREQUEST, construct_message, }, peers_refresh::HandshakeHistory, @@ -149,6 +150,9 @@ pub enum NetworkCommand { ResetServerPeer(), Discover(String, String, String), GetChildren([u8; 32], String), + SendDatum(MerkleNode, [u8; 32], String), + SendNoDatum(Vec, String), + SendRootReply(Vec, String), // ... } @@ -165,6 +169,8 @@ pub enum NetworkEvent { FileTreeRootReceived(String, NodeHash), HandshakeFailed(), ServerHandshakeFailed(String), + DatumRequest([u8; 32], String), + RootRequest(String), // ... } @@ -205,6 +211,73 @@ pub fn start_p2p_executor( // Check for commands from the GUI if let Ok(cmd) = cmd_rx.try_recv() { match cmd { + NetworkCommand::SendRootReply(node_hash, addr) => { + if let Some(sd) = shared_data.as_mut() { + let mut payload = Vec::new(); + payload.extend_from_slice(&node_hash); + let new_id = generate_id(); + let message = + construct_message(ROOTREPLY, payload, new_id, sd.cryptopair_ref()); + + match message { + None => {} + Some(resp_msg) => { + println!("msg_sent:{:?}", resp_msg); + sd.senders_ref().send_dispatch( + resp_msg, + addr.clone(), + false, + sd.messages_list(), + ); + } + } + } + } + NetworkCommand::SendNoDatum(node_hash, addr) => { + if let Some(sd) = shared_data.as_mut() { + let mut payload = Vec::new(); + payload.extend_from_slice(&node_hash); + let new_id = generate_id(); + let message = + construct_message(NODATUM, payload, new_id, sd.cryptopair_ref()); + + match message { + None => {} + Some(resp_msg) => { + println!("msg_sent:{:?}", resp_msg); + sd.senders_ref().send_dispatch( + resp_msg, + addr.clone(), + false, + sd.messages_list(), + ); + } + } + } + } + NetworkCommand::SendDatum(merklennode, node_hash, addr) => { + if let Some(sd) = shared_data.as_mut() { + let mut payload = Vec::new(); + payload.extend_from_slice(&node_hash); + payload.extend_from_slice(&merklennode.serialize()); + let new_id = generate_id(); + let message = + construct_message(DATUM, payload, new_id, sd.cryptopair_ref()); + + match message { + None => {} + Some(resp_msg) => { + println!("msg_sent:{:?}", resp_msg); + sd.senders_ref().send_dispatch( + resp_msg, + addr.clone(), + false, + sd.messages_list(), + ); + } + } + } + } NetworkCommand::ServerHandshake(username, ip) => { println!("server handshake called"); if let Some(sd) = shared_data.as_mut() { diff --git a/client-network/src/message_handling.rs b/client-network/src/message_handling.rs index 4c7a220..376721f 100644 --- a/client-network/src/message_handling.rs +++ b/client-network/src/message_handling.rs @@ -434,6 +434,22 @@ pub fn parse_message( None => {} } } + ROOTREQUEST => { + println!("root request received"); + let _ = cmd_tx.send(NetworkEvent::RootRequest(ip.to_string())); + } + DATUMREQUEST => { + let received_length = u16::from_be_bytes( + received_message[TYPE..LENGTH] + .try_into() + .expect("incorrect size"), + ); + let received_hash = &received_message[LENGTH..LENGTH + received_length as usize]; + let _ = cmd_tx.send(NetworkEvent::DatumRequest( + received_hash.try_into().expect("incorrect size"), + ip.to_string(), + )); + } _ => return None, }; constructed_message diff --git a/client-network/src/messages_structure.rs b/client-network/src/messages_structure.rs index 95b451f..61e3d83 100644 --- a/client-network/src/messages_structure.rs +++ b/client-network/src/messages_structure.rs @@ -224,7 +224,7 @@ impl HandshakeMessage { 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() { @@ -242,5 +242,5 @@ mod tests { let parsed = HandshakeMessage::parse(ser); handshake.display(); parsed.display(); - } + }*/ } diff --git a/todo.md b/todo.md index 6071fbc..4528206 100644 --- a/todo.md +++ b/todo.md @@ -1,24 +1,11 @@ # Todo -## bugfix - -- ajouter hello et nat a l'exp backoff OK -- peers n'ayant pas d'adresse OK -- verifier le refresh des peers - -- setting in gui to act as a relay - -- 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 -choisir un dossier à partager -choisir le nombre de canaux +- proposer des fichiers +- telechargement des fichiers +- receivers threads +- ask for nat traversal ## autre @@ -26,6 +13,7 @@ socket ipv6 # FAIT +rechercher les fichiers d'un pair OK - choisir un pseudo OK - get rsquest to the uri /peers/ OK - generation of the cryptographic key OK @@ -44,3 +32,6 @@ socket ipv6 - datum/nodatum and datum structures - nattraversal 1 and 2 structures - chunk, directory, big, bigdirectory structures +- ajouter hello et nat a l'exp backoff OK +- peers n'ayant pas d'adresse OK +- verifier le refresh des peers OK