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

Update lox-distributor to handle gone resources more correctly

This commit is contained in:
onyinyang 2023-06-16 13:56:30 -04:00
parent 2e4090e21c
commit 221f490d26
No known key found for this signature in database
GPG Key ID: 156A6435430C2036
5 changed files with 125 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/lox-distributor/src/lox_context.rs
View File

@ -66,15 +66,17 @@ impl LoxServerContext {
ba_obj.add_spare_bucket(bucket);
}
pub fn replace_with_new(&self, bridgeline: BridgeLine) -> bool {
pub fn replace_with_new(&self, bridgeline: BridgeLine) -> lox::ReplaceSuccess {
let mut ba_obj = self.ba.lock().unwrap();
let eb_obj = self.extra_bridges.lock().unwrap();
let available_bridge = eb_obj.last();
// .last() doesn't actually remove the object so we still have to do that
if eb_obj.len() > 0 {
let result = ba_obj.bridge_replace(&bridgeline, available_bridge);
// .last() doesn't actually remove the object so we still have to do that if the bridge was
// replaced with an available bridge
if result == lox::ReplaceSuccess::Replaced && eb_obj.len() > 0 {
self.remove_single_bridge();
}
ba_obj.bridge_replace(&bridgeline, available_bridge)
result
}
pub fn add_unreachable(&self, bridgeline: BridgeLine) -> bool {

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

@ -135,9 +135,15 @@ async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
if context.unreplaced_bridges.lock().unwrap().len() > 0 {
println!("BridgeLine to be replaced: {:?}", bridgeline);
let res = context.replace_with_new(bridgeline);
if res {
if res == lox::ReplaceSuccess::NotFound {
println!(
"BridgeLine not found in bridge_table, already updated {:?}",
bridgeline
);
} else if res == lox::ReplaceSuccess::Replaced {
println!("BridgeLine successfully replaced: {:?}", bridgeline);
} else {
assert!(res == lox::ReplaceSuccess::NotReplaced, "ReplaceSuccess incorrectly set somehow");
// Add the bridge to the list of unreplaced bridges in the Lox context and try
// again to replace at the next update (nothing changes in the Lox Authority)
println!("'Gone' BridgeLine NOT replaced, saved for next update! : {:?}", bridgeline);
@ -210,9 +216,9 @@ async fn context_manager(mut context_rx: mpsc::Receiver<Command>) {
let bridgeline = parse_resource(resource);
println!("BridgeLine to be replaced: {:?}", bridgeline);
let res = context.replace_with_new(bridgeline);
if res {
if res == lox::ReplaceSuccess::Replaced {
println!("BridgeLine successfully replaced: {:?}", bridgeline);
} else {
} else if res == lox::ReplaceSuccess::NotReplaced {
// Add the bridge to the list of unreplaced bridges in the Lox context and try
// again to replace at the next update (nothing changes in the Lox Authority)
println!(

15
crates/lox-distributor/src/request_handler.rs
View File

@ -322,7 +322,7 @@ mod tests {
}
#[tokio::test]
async fn test_handle_not_found(){
async fn test_handle_not_found() {
let th = TestHarness::new();
// Test Random page
let four_oh_four_req = Request::builder()
@ -336,7 +336,7 @@ mod tests {
}
#[tokio::test]
async fn test_handle_bad_request(){
async fn test_handle_bad_request() {
let th = TestHarness::new();
// Test that empty request to a credential issuing endpoint fails
let req = Request::builder()
@ -349,7 +349,7 @@ mod tests {
}
#[tokio::test]
async fn test_handle_invite(){
async fn test_handle_invite() {
let th = TestHarness::new();
let lc = LoxClientMock {};
@ -360,7 +360,7 @@ mod tests {
}
#[tokio::test]
async fn test_handle_reachability(){
async fn test_handle_reachability() {
let th = TestHarness::new();
let lc = LoxClientMock {};
// Test Reachability
@ -372,7 +372,7 @@ mod tests {
}
#[tokio::test]
async fn test_handle_pubkeys(){
async fn test_handle_pubkeys() {
let th = TestHarness::new();
let lc = LoxClientMock {};
// Test Pubkeys
@ -382,7 +382,7 @@ mod tests {
}
#[tokio::test]
async fn test_handle_lox_protocols(){
async fn test_handle_lox_protocols() {
let mut th = TestHarness::new();
let lc = LoxClientMock {};
// Request Invite and pubkeys required for protocol tests
@ -416,7 +416,8 @@ mod tests {
state,
open_response_obj,
&pubkeys_obj.lox_pub,
).unwrap();
)
.unwrap();
let lox_cred: lox_utils::LoxCredential = lox_utils::LoxCredential {
lox_credential: lox_cred.0,
bridgeline: Some(lox_cred.1),

29
crates/lox-library/src/lib.rs
View File

@ -58,6 +58,13 @@ lazy_static! {
dalek_constants::RISTRETTO_BASEPOINT_TABLE;
}
#[derive(PartialEq, Eq)]
pub enum ReplaceSuccess {
NotFound = 0,
NotReplaced = 1,
Replaced = 2,
}
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct IssuerPrivKey {
x0tilde: Scalar,
@ -406,10 +413,12 @@ impl BridgeAuth {
&mut self,
bridge: &BridgeLine,
available_bridge: Option<&BridgeLine>,
) -> bool {
let mut res: bool = false;
) -> ReplaceSuccess {
let mut res = ReplaceSuccess::NotFound;
let reachable_bridges = &self.bridge_table.reachable.clone();
if let Some(positions) = reachable_bridges.get(bridge) {
match reachable_bridges.get(bridge) {
Some(positions) => {
println!("Should not get here");
if let Some(replacement) = available_bridge {
for (bucketnum, offset) in positions.iter() {
assert!(self.bridge_table.buckets[*bucketnum as usize][*offset] == *bridge);
@ -420,7 +429,7 @@ impl BridgeAuth {
.insert(*replacement, positions.clone());
// Remove the bridge from the bucket
self.bridge_table.reachable.remove(bridge);
res = true
res = ReplaceSuccess::Replaced
}
} else if !self.bridge_table.unallocated_bridges.is_empty() {
let replacement = &self.bridge_table.unallocated_bridges.pop().unwrap();
@ -432,7 +441,7 @@ impl BridgeAuth {
// Remove the bridge from the bucket
self.bridge_table.reachable.remove(bridge);
}
res = true
res = ReplaceSuccess::Replaced
} else if !self.bridge_table.spares.is_empty() {
// Get the first spare and remove it from the spares set.
let spare = *self.bridge_table.spares.iter().next().unwrap();
@ -461,15 +470,19 @@ impl BridgeAuth {
// Remove the bridge from the bucket
self.bridge_table.reachable.remove(bridge);
}
res = true
}
res = ReplaceSuccess::Replaced
} else {
// If there are no available bridges that can be assigned here, the only thing
// that can be done is return an indication that updating the gone bridge
// didn't work.
// In this case, we do not mark the bridge as unreachable or remove it from the
// reachable bridges so that we can still find it when a new bridge does become available
res = ReplaceSuccess::NotReplaced
}
res
}
None => return res,
};
return res;
}
/// Mark a bridge as unreachable

29
crates/lox-library/src/tests.rs
View File

@ -727,7 +727,7 @@ fn test_update_bridge() {
#[test]
fn test_bridge_replace() {
// Create 3 open invitation buckets and 3 spare buckets
let cases = vec!["available", "unallocated", "spare", "failed"];
let cases = vec!["not found", "available", "unallocated", "spare", "failed"];
for case in cases {
let mut th: TestHarness;
if case != "failed" {
@ -735,6 +735,7 @@ fn test_bridge_replace() {
} else {
th = TestHarness::new_buckets(5, 0);
}
// Randomly select a bridge to replace
let table_size = th.ba.bridge_table.buckets.len();
let num = rand::thread_rng().gen_range(0, table_size - 1);
@ -747,7 +748,22 @@ fn test_bridge_replace() {
.contains_key(replacement_bridge),
"Random bridge to replace not in reachable bridges"
);
match case {
"not found" => {
// Case zero: bridge to be replaced is not in the bridgetable
let random_bridgeline = &BridgeLine::random();
assert!(
!th.ba.bridge_table.reachable.contains_key(random_bridgeline),
"Random bridgeline happens to be in the bridge_table (and should not be)"
);
assert!(
th.ba
.bridge_replace(random_bridgeline, Some(random_bridgeline))
== ReplaceSuccess::NotFound,
"Bridge should be marked as NotFound"
);
}
"available" => {
// Case one: available_bridge != null
let random_bridgeline = &BridgeLine::random();
@ -766,7 +782,8 @@ fn test_bridge_replace() {
);
assert!(
th.ba
.bridge_replace(replacement_bridge, Some(random_bridgeline)),
.bridge_replace(replacement_bridge, Some(random_bridgeline))
== ReplaceSuccess::Replaced,
"Bridge was not replaced with available bridge"
);
assert!(
@ -807,7 +824,7 @@ fn test_bridge_replace() {
"Unallocated bridge already marked as reachable"
);
assert!(
th.ba.bridge_replace(replacement_bridge, None),
th.ba.bridge_replace(replacement_bridge, None) == ReplaceSuccess::Replaced,
"Bridge was not replaced with available bridge"
);
assert!(
@ -830,13 +847,13 @@ fn test_bridge_replace() {
println!("Successfully added unallocated bridgeline");
}
"spare" => {
// Case three: available_bridge == null and unallocated_bridges ==null
// Case three: available_bridge == null and unallocated_bridges == null
assert!(
th.ba.bridge_table.unallocated_bridges.len() == 0,
"Unallocated bridges should have a length of 0"
);
assert!(
th.ba.bridge_replace(replacement_bridge, None),
th.ba.bridge_replace(replacement_bridge, None) == ReplaceSuccess::Replaced,
"Bridge was not replaced with available spare bridge"
);
assert!(
@ -865,7 +882,7 @@ fn test_bridge_replace() {
"Unallocated bridges should have a length of 0"
);
assert!(
!th.ba.bridge_replace(replacement_bridge, None),
th.ba.bridge_replace(replacement_bridge, None) == ReplaceSuccess::NotReplaced,
"Bridge was somehow marked as replaced despite no replaceable bridges"
);
assert!(