src/server/command_socket.rs: switch to async
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
parent
3c0facc787
commit
160fc8147f
@ -1,12 +1,8 @@
|
||||
use failure::*;
|
||||
|
||||
use futures::*;
|
||||
use futures::stream::Stream;
|
||||
|
||||
use tokio::net::unix::UnixListener;
|
||||
use tokio::io::AsyncRead;
|
||||
|
||||
use std::io::Write;
|
||||
|
||||
use std::path::PathBuf;
|
||||
use serde_json::Value;
|
||||
@ -14,12 +10,11 @@ use std::sync::Arc;
|
||||
use std::os::unix::io::AsRawFd;
|
||||
use nix::sys::socket;
|
||||
|
||||
use proxmox::tools::try_block;
|
||||
|
||||
/// Listens on a Unix Socket to handle simple command asynchronously
|
||||
pub fn create_control_socket<P, F>(path: P, f: F) -> Result<impl Future<Item=(), Error=()>, Error>
|
||||
where P: Into<PathBuf>,
|
||||
F: Send + Sync +'static + Fn(Value) -> Result<Value, Error>,
|
||||
pub fn create_control_socket<P, F>(path: P, f: F) -> Result<impl Future<Output = ()>, Error>
|
||||
where
|
||||
P: Into<PathBuf>,
|
||||
F: Fn(Value) -> Result<Value, Error> + Send + Sync + 'static,
|
||||
{
|
||||
let path: PathBuf = path.into();
|
||||
|
||||
@ -32,60 +27,75 @@ pub fn create_control_socket<P, F>(path: P, f: F) -> Result<impl Future<Item=(),
|
||||
let control_future = socket.incoming()
|
||||
.map_err(Error::from)
|
||||
.and_then(|conn| {
|
||||
use futures::future::{err, ok};
|
||||
|
||||
// check permissions (same gid, or root user)
|
||||
let opt = socket::sockopt::PeerCredentials {};
|
||||
match socket::getsockopt(conn.as_raw_fd(), opt) {
|
||||
Ok(cred) => {
|
||||
let mygid = unsafe { libc::getgid() };
|
||||
if !(cred.uid() == 0 || cred.gid() == mygid) {
|
||||
bail!("no permissions for {:?}", cred);
|
||||
return err(format_err!("no permissions for {:?}", cred));
|
||||
}
|
||||
}
|
||||
Err(err) => bail!("no permissions - unable to read peer credential - {}", err),
|
||||
Err(e) => {
|
||||
return err(format_err!(
|
||||
"no permissions - unable to read peer credential - {}",
|
||||
e,
|
||||
));
|
||||
}
|
||||
Ok(conn)
|
||||
}
|
||||
ok(conn)
|
||||
})
|
||||
.map_err(move |err| { eprintln!("failed to accept on control socket {:?}: {}", path2, err); })
|
||||
.for_each(move |conn| {
|
||||
let f1 = f.clone();
|
||||
.try_for_each(move |conn| {
|
||||
let f = Arc::clone(&f);
|
||||
|
||||
let (rx, mut tx) = conn.split();
|
||||
let path = path3.clone();
|
||||
let path2 = path3.clone();
|
||||
|
||||
let abort_future = super::last_worker_future().map_err(|_| {});
|
||||
let abort_future = super::last_worker_future().map(|_| ());
|
||||
|
||||
tokio::spawn(
|
||||
tokio::io::lines(std::io::BufReader::new(rx))
|
||||
.map_err(move |err| { eprintln!("control socket {:?} read error: {}", path, err); })
|
||||
.and_then(move |cmd| {
|
||||
let res = try_block!({
|
||||
let param = match cmd.parse::<Value>() {
|
||||
Ok(p) => p,
|
||||
Err(err) => bail!("unable to parse json value - {}", err),
|
||||
};
|
||||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt};
|
||||
tokio::spawn(futures::future::select(
|
||||
async move {
|
||||
let mut rx = tokio::io::BufReader::new(rx);
|
||||
let mut line = String::new();
|
||||
loop {
|
||||
line.clear();
|
||||
match rx.read_line({ line.clear(); &mut line }).await {
|
||||
Ok(0) => break,
|
||||
Ok(_) => (),
|
||||
Err(err) => {
|
||||
eprintln!("control socket {:?} read error: {}", path, err);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
f1(param)
|
||||
});
|
||||
|
||||
let resp = match res {
|
||||
Ok(v) => format!("OK: {}\n", v),
|
||||
let response = match line.parse::<Value>() {
|
||||
Ok(param) => match f(param) {
|
||||
Ok(res) => format!("OK: {}\n", res),
|
||||
Err(err) => format!("ERROR: {}\n", err),
|
||||
}
|
||||
Err(err) => format!("ERROR: {}\n", err),
|
||||
};
|
||||
Ok(resp)
|
||||
})
|
||||
.for_each(move |resp| {
|
||||
tx.write_all(resp.as_bytes())
|
||||
.map_err(|err| { eprintln!("control socket {:?} write response error: {}", path2, err); })
|
||||
})
|
||||
.select(abort_future)
|
||||
.then(move |_| { Ok(()) })
|
||||
)
|
||||
|
||||
if let Err(err) = tx.write_all(response.as_bytes()).await {
|
||||
eprintln!("control socket {:?} write response error: {}", path, err);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}.boxed(),
|
||||
abort_future,
|
||||
).map(|_| ()));
|
||||
futures::future::ok(())
|
||||
});
|
||||
|
||||
let abort_future = super::last_worker_future().map_err(|_| {});
|
||||
let task = control_future.select(abort_future)
|
||||
.then(move |_| { Ok(()) });
|
||||
let task = futures::future::select(
|
||||
control_future,
|
||||
abort_future,
|
||||
).map(|_| ());
|
||||
|
||||
Ok(task)
|
||||
}
|
||||
@ -94,7 +104,7 @@ pub fn create_control_socket<P, F>(path: P, f: F) -> Result<impl Future<Item=(),
|
||||
pub fn send_command<P>(
|
||||
path: P,
|
||||
params: Value
|
||||
) -> impl Future<Item=Value, Error=Error>
|
||||
) -> impl Future<Output = Result<Value, Error>>
|
||||
where P: Into<PathBuf>,
|
||||
|
||||
{
|
||||
@ -104,20 +114,21 @@ pub fn send_command<P>(
|
||||
.map_err(move |err| format_err!("control socket connect failed - {}", err))
|
||||
.and_then(move |conn| {
|
||||
|
||||
let (rx, tx) = conn.split();
|
||||
let (rx, mut tx) = conn.split();
|
||||
|
||||
let mut command_string = params.to_string();
|
||||
command_string.push('\n');
|
||||
|
||||
tokio::io::write_all(tx, command_string)
|
||||
.and_then(|(tx,_)| tokio::io::shutdown(tx))
|
||||
.map_err(|err| format_err!("control socket write error - {}", err))
|
||||
.and_then(move |_| {
|
||||
tokio::io::lines(std::io::BufReader::new(rx))
|
||||
.into_future()
|
||||
.then(|test| {
|
||||
match test {
|
||||
Ok((Some(data), _)) => {
|
||||
async move {
|
||||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt};
|
||||
|
||||
tx.write_all(command_string.as_bytes()).await?;
|
||||
tx.shutdown().await?;
|
||||
let mut rx = tokio::io::BufReader::new(rx);
|
||||
let mut data = String::new();
|
||||
if rx.read_line(&mut data).await? == 0 {
|
||||
bail!("no response");
|
||||
}
|
||||
if data.starts_with("OK: ") {
|
||||
match data[4..].parse::<Value>() {
|
||||
Ok(v) => Ok(v),
|
||||
@ -129,12 +140,5 @@ pub fn send_command<P>(
|
||||
bail!("unable to parse response: {}", data);
|
||||
}
|
||||
}
|
||||
Ok((None, _)) => {
|
||||
bail!("no response");
|
||||
}
|
||||
Err((err, _)) => Err(Error::from(err)),
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user