liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

xfer

Browse Source
This commit is contained in:
John Smith 2022-11-13 11:56:27 -05:00
parent 662ed03d19
commit fd26acec16
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
veilid-core/src/rpc_processor/rpc_route.rs
View File

@ -73,7 +73,7 @@ impl RPCProcessor {
async fn process_route_private_route_hop( async fn process_route_private_route_hop(
&self, &self,
mut route: RPCOperationRoute, mut route: RPCOperationRoute,
next_private_route: PrivateRoute, mut next_private_route: PrivateRoute,
) -> Result<(), RPCError> { ) -> Result<(), RPCError> {
// Make sure hop count makes sense // Make sure hop count makes sense
if route.safety_route.hop_count != 0 { if route.safety_route.hop_count != 0 {
@ -116,14 +116,17 @@ impl RPCProcessor {
} }
}?; }?;
// Sign the operation if this is not our last hop if first_hop.next_hop.is_some() {
// as the last hop is already signed by the envelope // Sign the operation if this is not our last hop
if next_private_route.hop_count != 0 { // as the last hop is already signed by the envelope
let node_id = self.routing_table.node_id(); let node_id = self.routing_table.node_id();
let node_id_secret = self.routing_table.node_id_secret(); let node_id_secret = self.routing_table.node_id_secret();
let sig = sign(&node_id, &node_id_secret, &route.operation.data) let sig = sign(&node_id, &node_id_secret, &route.operation.data)
.map_err(RPCError::internal)?; .map_err(RPCError::internal)?;
route.operation.signatures.push(sig); route.operation.signatures.push(sig);
} else {
// If this is our last hop, then we drop the 'first_hop' from private route
next_private_route.first_hop = None;
} }
// Pass along the route // Pass along the route
@ -398,6 +401,11 @@ impl RPCProcessor {
None None
}; };
// Ensure hop count > 0
if private_route.hop_count == 0 {
return Err(RPCError::protocol("route should not be at the end"));
}
// Make next PrivateRoute and pass it on // Make next PrivateRoute and pass it on
let next_private_route = PrivateRoute { let next_private_route = PrivateRoute {
public_key: private_route.public_key, public_key: private_route.public_key,
@ -407,6 +415,11 @@ impl RPCProcessor {
self.process_route_private_route_hop(route, next_private_route) self.process_route_private_route_hop(route, next_private_route)
.await?; .await?;
} else { } else {
// Ensure hop count == 0
if private_route.hop_count != 0 {
return Err(RPCError::protocol("route should be at the end"));
}
// No hops left, time to process the routed operation // No hops left, time to process the routed operation
self.process_routed_operation( self.process_routed_operation(
detail, detail,