From f035ac5470c7fbcf791e361cb2d611de7edafb0f Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 2 May 2020 18:45:50 -0400 Subject: check protocol version before agent communication --- src/bin/rbw/commands.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/bin/rbw/commands.rs') diff --git a/src/bin/rbw/commands.rs b/src/bin/rbw/commands.rs index 6c9d18c..b29987d 100644 --- a/src/bin/rbw/commands.rs +++ b/src/bin/rbw/commands.rs @@ -493,6 +493,30 @@ pub fn stop_agent() -> anyhow::Result<()> { } fn ensure_agent() -> anyhow::Result<()> { + ensure_agent_once()?; + let version = crate::actions::version()?; + if version != rbw::protocol::VERSION { + log::debug!( + "client protocol version is {} but agent protocol version is {}", + rbw::protocol::VERSION, + version + ); + crate::actions::quit()?; + ensure_agent_once()?; + let version = crate::actions::version()?; + if version != rbw::protocol::VERSION { + crate::actions::quit()?; + return Err(anyhow::anyhow!( + "incompatible protocol versions: client ({}), agent ({})", + rbw::protocol::VERSION, + version + )); + } + } + Ok(()) +} + +fn ensure_agent_once() -> anyhow::Result<()> { let agent_path = std::env::var("RBW_AGENT"); let agent_path = agent_path .as_ref() -- cgit v1.2.3-54-g00ecf