vecna
/
lox
mirror of https://gitlab.torproject.org/vecna/lox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add distributor logic for bridge updates from rdsys, handling for unsuccessful removals/updates

This commit is contained in:
onyinyang 2023-03-20 12:42:40 -04:00
parent 85b4d63358
commit 47f645a4f9
No known key found for this signature in database
GPG Key ID: 156A6435430C2036
1 changed files with 174 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
crates/lox-distributor/src/main.rs
View File

@ -19,6 +19,8 @@ use lox::{BridgeAuth, BridgeDb, OPENINV_LENGTH};
use rand::RngCore; use rand::RngCore;
use rdsys_backend::{proto::ResourceDiff, start_stream}; use rdsys_backend::{proto::ResourceDiff, start_stream};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json;
use serde_with::serde_as;
use std::{ use std::{
convert::Infallible, convert::Infallible,
env, env,
@ -28,12 +30,10 @@ use std::{
sync::{Arc, Mutex}, sync::{Arc, Mutex},
time::Duration, time::Duration,
}; };
use serde_json;
use serde_with::serde_as;
use tokio::{ use tokio::{
spawn, signal, spawn,
sync::{broadcast, mpsc, oneshot}, sync::{broadcast, mpsc, oneshot},
time::sleep, signal, time::sleep,
}; };
#[serde_as] #[serde_as]
@ -113,10 +113,16 @@ impl LoxServerContext {
ba_obj.add_openinv_bridges(bucket, &mut db_obj); ba_obj.add_openinv_bridges(bucket, &mut db_obj);
} }
fn add_unreachable(&self, bridgeline: BridgeLine) { fn add_unreachable(&self, bridgeline: BridgeLine) -> bool {
let mut ba_obj = self.ba.lock().unwrap(); let mut ba_obj = self.ba.lock().unwrap();
let mut db_obj = self.db.lock().unwrap(); let mut db_obj = self.db.lock().unwrap();
ba_obj.bridge_unreachable(&bridgeline, &mut db_obj); ba_obj.bridge_unreachable(&bridgeline, &mut db_obj)
}
fn update_bridge(&self, bridgeline: BridgeLine) -> bool {
let mut ba_obj = self.ba.lock().unwrap();
let mut db_obj = self.db.lock().unwrap();
ba_obj.bridge_update(&bridgeline, &mut db_obj)
} }
fn advance_days_TEST(&self, num: u16) { fn advance_days_TEST(&self, num: u16) {
@ -274,7 +280,6 @@ async fn handle(
} }
} }
// Generate and return an open invitation token // Generate and return an open invitation token
fn generate_invite(context: LoxServerContext) -> Response<Body> { fn generate_invite(context: LoxServerContext) -> Response<Body> {
let invite = context.gen_invite(); let invite = context.gen_invite();
@ -378,7 +383,11 @@ async fn shutdown_signal() {
println!("Shut down Lox Server"); println!("Shut down Lox Server");
} }
async fn rdsys_stream(rtype: ResourceInfo, tx: mpsc::Sender<ResourceDiff>, mut kill: broadcast::Receiver<()>) { async fn rdsys_stream(
rtype: ResourceInfo,
tx: mpsc::Sender<ResourceDiff>,
mut kill: broadcast::Receiver<()>,
) {
tokio::select! { tokio::select! {
start_rdsys_stream = rdsys_sender(rtype, tx) => start_rdsys_stream , start_rdsys_stream = rdsys_sender(rtype, tx) => start_rdsys_stream ,
_ = kill.recv() => {println!("Shut down rdsys stream"); return}, _ = kill.recv() => {println!("Shut down rdsys stream"); return},
@ -400,7 +409,11 @@ async fn rdsys_sender(rtype: ResourceInfo, tx: mpsc::Sender<ResourceDiff>) {
} }
} }
async fn rdsys_bridge_parser(rdsys_tx: mpsc::Sender<Command>, rx: mpsc::Receiver<ResourceDiff>, mut kill: broadcast::Receiver<()>) { async fn rdsys_bridge_parser(
rdsys_tx: mpsc::Sender<Command>,
rx: mpsc::Receiver<ResourceDiff>,
mut kill: broadcast::Receiver<()>,
) {
tokio::select! { tokio::select! {
start_bridge_parser = parse_bridges(rdsys_tx, rx) => start_bridge_parser , start_bridge_parser = parse_bridges(rdsys_tx, rx) => start_bridge_parser ,
_ = kill.recv() => {println!("Shut down bridge_parser"); return}, _ = kill.recv() => {println!("Shut down bridge_parser"); return},
@ -420,7 +433,10 @@ async fn parse_bridges(rdsys_tx: mpsc::Sender<Command>, mut rx: mpsc::Receiver<R
} }
} }
async fn create_context_manager(context_rx: mpsc::Receiver<Command>, mut kill: broadcast::Receiver<()>) { async fn create_context_manager(
context_rx: mpsc::Receiver<Command>,
mut kill: broadcast::Receiver<()>,
) {
tokio::select! { tokio::select! {
create_context = context_manager(context_rx) => create_context, create_context = context_manager(context_rx) => create_context,
_ = kill.recv() => {println!("Shut down context_manager"); return}, _ = kill.recv() => {println!("Shut down context_manager"); return},
@ -431,7 +447,6 @@ async fn create_context_manager(context_rx: mpsc::Receiver<Command>, mut kill: b
// that the DB can be updated from the rdsys stream and client requests // that the DB can be updated from the rdsys stream and client requests
// can be responded to with an updated BridgeDB state // can be responded to with an updated BridgeDB state
async fn context_manager(mut context_rx: mpsc::Receiver<Command>) { async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
let bridgedb = BridgeDb::new(); let bridgedb = BridgeDb::new();
let lox_auth = BridgeAuth::new(bridgedb.pubkey); let lox_auth = BridgeAuth::new(bridgedb.pubkey);
@ -469,8 +484,7 @@ async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
resource.flags, resource.flags,
resource.params, resource.params,
); );
let mut info_bytes: [u8; BRIDGE_BYTES - 18] = let mut info_bytes: [u8; BRIDGE_BYTES - 18] = [0; BRIDGE_BYTES - 18];
[0; BRIDGE_BYTES - 18];
info_bytes[..infostr.len()].copy_from_slice(infostr.as_bytes()); info_bytes[..infostr.len()].copy_from_slice(infostr.as_bytes());
let bridgeline = BridgeLine { let bridgeline = BridgeLine {
@ -496,7 +510,42 @@ async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
} }
} }
for changed_resource in resourcediff.changed { for changed_resource in resourcediff.changed {
println!("A NEW CHANGED RESOURCE: {:?}", changed_resource); for pt in changed_resource {
println!("A NEW CHANGED RESOURCE: {:?}", pt);
for resource in pt.1 {
let mut ip_bytes: [u8; 16] = [0; 16];
ip_bytes[..resource.address.len()]
.copy_from_slice(resource.address.as_bytes());
let infostr: String = format!(
"type={} blocked_in={:?} protocol={} fingerprint={} or_addresses={:?} distribution={} flags={:?} params={:?}",
resource.r#type,
resource.blocked_in,
resource.protocol,
resource.fingerprint,
resource.or_addresses,
resource.distribution,
resource.flags,
resource.params,
);
let mut info_bytes: [u8; BRIDGE_BYTES - 18] = [0; BRIDGE_BYTES - 18];
info_bytes[..infostr.len()].copy_from_slice(infostr.as_bytes());
let bridgeline = BridgeLine {
addr: ip_bytes,
port: resource.port,
info: info_bytes,
};
println!("BridgeLine to be changed: {:?}", bridgeline);
let res = context.update_bridge(bridgeline);
if res {
println!("BridgeLine successfully updated: {:?}", bridgeline);
} else {
println!("'Changed' BridgeLine NOT UPDATED!! : {:?}", bridgeline);
//TODO probably do something else here
}
}
}
} }
for gone_resource in resourcediff.gone { for gone_resource in resourcediff.gone {
for pt in gone_resource { for pt in gone_resource {
@ -516,8 +565,7 @@ async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
resource.flags, resource.flags,
resource.params, resource.params,
); );
let mut info_bytes: [u8; BRIDGE_BYTES - 18] = let mut info_bytes: [u8; BRIDGE_BYTES - 18] = [0; BRIDGE_BYTES - 18];
[0; BRIDGE_BYTES - 18];
info_bytes[..infostr.len()].copy_from_slice(infostr.as_bytes()); info_bytes[..infostr.len()].copy_from_slice(infostr.as_bytes());
let bridgeline = BridgeLine { let bridgeline = BridgeLine {
@ -526,8 +574,17 @@ async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
info: info_bytes, info: info_bytes,
}; };
println!("Now it's a bridgeline: {:?}", bridgeline); println!("BridgeLine to be removed: {:?}", bridgeline);
context.add_unreachable(bridgeline); let res = context.add_unreachable(bridgeline);
if res {
println!(
"BridgeLine successfully marked unreachable: {:?}",
bridgeline
);
} else {
println!("'Gone' BridgeLine NOT REMOVED!! : {:?}", bridgeline);
//TODO probably do something else here
}
} }
} }
} }
@ -548,8 +605,6 @@ async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
} }
} }
} }
} }
// Each of the commands that the Context Manager handles // Each of the commands that the Context Manager handles
@ -564,7 +619,7 @@ enum Command {
}, },
Shutdown { Shutdown {
shutdown_sig: broadcast::Sender<()>, shutdown_sig: broadcast::Sender<()>,
} },
} }
#[tokio::main] #[tokio::main]
@ -573,14 +628,13 @@ async fn main() {
let file = File::open(&args[1]).expect("Should have been able to read config.json file"); let file = File::open(&args[1]).expect("Should have been able to read config.json file");
let reader = BufReader::new(file); let reader = BufReader::new(file);
// Read the JSON contents of the file as a ResourceInfo // Read the JSON contents of the file as a ResourceInfo
let rtype: ResourceInfo = serde_json::from_reader(reader).expect("Reading ResourceInfo from JSON failed."); let rtype: ResourceInfo =
serde_json::from_reader(reader).expect("Reading ResourceInfo from JSON failed.");
let (rdsys_tx, context_rx) = mpsc::channel(32); let (rdsys_tx, context_rx) = mpsc::channel(32);
let request_tx = rdsys_tx.clone(); let request_tx = rdsys_tx.clone();
let shutdown_cmd_tx = rdsys_tx.clone(); let shutdown_cmd_tx = rdsys_tx.clone();
// create the shutdown broadcast channel and clone for every thread // create the shutdown broadcast channel and clone for every thread
let (shutdown_tx, mut shutdown_rx) = broadcast::channel(16); let (shutdown_tx, mut shutdown_rx) = broadcast::channel(16);
let kill_stream = shutdown_tx.subscribe(); let kill_stream = shutdown_tx.subscribe();
@ -602,13 +656,14 @@ async fn main() {
} }
}); });
let context_manager =
let context_manager = spawn(async move { create_context_manager(context_rx, kill_context).await }); spawn(async move { create_context_manager(context_rx, kill_context).await });
let (tx, rx) = mpsc::channel(32); let (tx, rx) = mpsc::channel(32);
let rdsys_stream_handler = spawn(async { rdsys_stream(rtype, tx, kill_stream).await }); let rdsys_stream_handler = spawn(async { rdsys_stream(rtype, tx, kill_stream).await });
let rdsys_resource_receiver = spawn(async { rdsys_bridge_parser(rdsys_tx, rx, kill_parser).await }); let rdsys_resource_receiver =
spawn(async { rdsys_bridge_parser(rdsys_tx, rx, kill_parser).await });
let make_service = make_service_fn(move |_conn: &AddrStream| { let make_service = make_service_fn(move |_conn: &AddrStream| {
let request_tx = request_tx.clone(); let request_tx = request_tx.clone();
@ -641,6 +696,4 @@ async fn main() {
shutdown_handler, shutdown_handler,
]) ])
.await; .await;
} }