agent: Fix crasher if AddARPNeighbors request empty

Check if the ARP neighbours specified in the `AddARPNeighbors` API is
set before using it to avoid crashing the agent.

Fixes: #955.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2020-10-15 10:05:27 +01:00
parent 3d084c7d23
commit 8495306641

View File

@ -1156,6 +1156,13 @@ impl protocols::agent_ttrpc::AgentService for agentService {
_ctx: &ttrpc::TtrpcContext,
req: protocols::agent::AddARPNeighborsRequest,
) -> ttrpc::Result<Empty> {
if req.neighbors.is_none() {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INVALID_ARGUMENT,
format!("empty add arp neighbours request"),
)));
}
let neighs = req.neighbors.clone().unwrap().ARPNeighbors.into_vec();
let s = Arc::clone(&self.sandbox);
@ -1863,4 +1870,21 @@ mod tests {
assert!(result.is_err(), "expected update routes to fail");
}
#[test]
fn test_add_arp_neighbors() {
let logger = slog::Logger::root(slog::Discard, o!());
let sandbox = Sandbox::new(&logger).unwrap();
let agent_service = Box::new(agentService {
sandbox: Arc::new(Mutex::new(sandbox)),
});
let req = protocols::agent::AddARPNeighborsRequest::default();
let (ctx, _) = mk_ttrpc_context();
let result = agent_service.add_arp_neighbors(&ctx, req);
assert!(result.is_err(), "expected add arp neighbors to fail");
}
}