github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 07:22:20 +00:00
Code Issues Projects Releases Wiki Activity

agent: Fix crasher if UpdateRoutes request empty

Browse Source 
Check if the routes specified in the `UpdateRoutes` API is set before
using it to avoid crashing the agent.

Fixes: #949.

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:03:13 +01:00
parent 5615e5a7fe
commit 3d084c7d23
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/agent/src/rpc.rs
View File

@ -954,6 +954,13 @@ impl protocols::agent_ttrpc::AgentService for agentService {
req: protocols::agent::UpdateRoutesRequest, req: protocols::agent::UpdateRoutesRequest,
) -> ttrpc::Result<Routes> { ) -> ttrpc::Result<Routes> {
let mut routes = protocols::agent::Routes::new(); let mut routes = protocols::agent::Routes::new();
if req.routes.is_none() {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INVALID_ARGUMENT,
format!("empty update routes request"),
)));
}
let rs = req.routes.clone().unwrap().Routes.into_vec(); let rs = req.routes.clone().unwrap().Routes.into_vec();
let s = Arc::clone(&self.sandbox); let s = Arc::clone(&self.sandbox);
@ -1839,4 +1846,21 @@ mod tests {
assert!(result.is_err(), "expected update interface to fail"); assert!(result.is_err(), "expected update interface to fail");
} }
#[test]
fn test_update_routes() {
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::UpdateRoutesRequest::default();
let (ctx, _) = mk_ttrpc_context();
let result = agent_service.update_routes(&ctx, req);
assert!(result.is_err(), "expected update routes to fail");
}
} }