Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat secure #101

Merged
merged 6 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/examples/benchmark_pubsub.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ enum ImplSdkEvent {
async fn run_node(node_id: NodeId, seeds: Vec<NodeAddr>) -> (PubsubSdk, NodeAddr) {
log::info!("Run node {} connect to {:?}", node_id, seeds);
let mut node_addr_builder = NodeAddrBuilder::new(node_id);
let secure = Arc::new(atm0s_sdn::StaticKeySecure::new("secure-token"));
let socket = UdpTransport::prepare(0, &mut node_addr_builder).await;
let transport = Box::new(UdpTransport::new(node_addr_builder.addr(), socket));
let transport = Box::new(UdpTransport::new(node_addr_builder.addr(), socket, secure));
let timer = Arc::new(SystemTimer());

let router = SharedRouter::new(node_id);
Expand Down
3 changes: 2 additions & 1 deletion examples/examples/benchmark_pubsub_local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ enum ImplSdkEvent {

async fn run_node(node_id: NodeId, seeds: Vec<NodeAddr>) -> (PubsubSdk, NodeAddr) {
log::info!("Run node {} connect to {:?}", node_id, seeds);
let secure = Arc::new(atm0s_sdn::StaticKeySecure::new("secure-token"));
let mut node_addr_builder = NodeAddrBuilder::new(node_id);
let socket = UdpTransport::prepare(0, &mut node_addr_builder).await;
let transport = Box::new(UdpTransport::new(node_addr_builder.addr(), socket));
let transport = Box::new(UdpTransport::new(node_addr_builder.addr(), socket, secure));
let timer = Arc::new(SystemTimer());

let router = SharedRouter::new(node_id);
Expand Down
6 changes: 4 additions & 2 deletions examples/examples/benchmark_transport.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::sync::Arc;
use std::time::Duration;

use atm0s_sdn::RouteRule;
Expand All @@ -7,13 +8,14 @@ use atm0s_sdn::{NodeAddrBuilder, UdpTransport};
#[async_std::main]
async fn main() {
env_logger::builder().format_timestamp_millis().filter_level(log::LevelFilter::Info).init();
let secure = Arc::new(atm0s_sdn::StaticKeySecure::new("secure-token"));
let mut node_addr_builder1 = NodeAddrBuilder::new(1);
let socket1 = UdpTransport::prepare(0, &mut node_addr_builder1).await;
let mut transport1 = Box::new(UdpTransport::new(node_addr_builder1.addr(), socket1));
let mut transport1 = Box::new(UdpTransport::new(node_addr_builder1.addr(), socket1, secure.clone()));

let mut node_addr_builder2 = NodeAddrBuilder::new(2);
let socket2 = UdpTransport::prepare(0, &mut node_addr_builder2).await;
let mut transport2 = Box::new(UdpTransport::new(node_addr_builder2.addr(), socket2));
let mut transport2 = Box::new(UdpTransport::new(node_addr_builder2.addr(), socket2, secure));

let task = async_std::task::spawn(async move {
loop {
Expand Down
3 changes: 2 additions & 1 deletion examples/examples/chat_example.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ async fn main() {
// In this example, we use the UDP transport layer.
// There are also other transport layers, such as TCP and VNET, others are still in progress.
// The port number is 50000 + node_id.
let secure = Arc::new(atm0s_sdn::StaticKeySecure::new("secure-token"));
let socket = UdpTransport::prepare(50000 + args.node_id as u16, &mut node_addr_builder).await;
let transport = UdpTransport::new(node_addr_builder.addr(), socket);
let transport = UdpTransport::new(node_addr_builder.addr(), socket, secure);
let node_addr = node_addr_builder.addr();
println!("Listening on addr {}", node_addr);

Expand Down
3 changes: 2 additions & 1 deletion examples/examples/discovery_manual_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ async fn main() {
let args: Args = Args::parse();
let mut node_addr_builder = NodeAddrBuilder::new(args.node_id);
let socket = UdpTransport::prepare(0, &mut node_addr_builder).await;
let transport = Box::new(UdpTransport::new(node_addr_builder.addr(), socket));
let secure = Arc::new(atm0s_sdn::StaticKeySecure::new("secure-token"));
let transport = Box::new(UdpTransport::new(node_addr_builder.addr(), socket, secure));
let node_addr = node_addr_builder.addr();
log::info!("Listen on addr {}", node_addr);

Expand Down
5 changes: 3 additions & 2 deletions examples/examples/manual_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ async fn main() {
let udp_socket = UdpTransport::prepare(50000 + args.node_id as u16, &mut node_addr_builder).await;
let tcp_listener = TcpTransport::prepare(50000 + args.node_id as u16, &mut node_addr_builder).await;

let udp = UdpTransport::new(node_addr_builder.addr(), udp_socket);
let tcp = TcpTransport::new(node_addr_builder.addr(), tcp_listener);
let secure = Arc::new(atm0s_sdn::StaticKeySecure::new("secure-token"));
let udp = UdpTransport::new(node_addr_builder.addr(), udp_socket, secure.clone());
let tcp = TcpTransport::new(node_addr_builder.addr(), tcp_listener, secure);

let transport = UdpTcpTransport::new(udp, tcp);

Expand Down
1 change: 1 addition & 0 deletions packages/network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ thiserror = { workspace = true }
serde = { workspace = true }
bytes = "1.5.0"
bincode = "1.3.3"
sha1 = "0.10.6"

[dev-dependencies]
env_logger = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions packages/network/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
pub mod behaviour;
pub mod msg;
pub mod plane;
pub mod secure;
pub mod transport;
pub mod transport_tests;

Expand Down
Loading
Loading