aboutsummaryrefslogtreecommitdiff
path: root/src/wg.rs
diff options
context:
space:
mode:
authorHristo Venev <hristo@venev.name>2019-09-29 17:14:57 +0300
committerHristo Venev <hristo@venev.name>2019-09-29 18:06:10 +0300
commit1c42c390c0d076d8c25eb9d29767da151dd590d0 (patch)
tree3770fcae4e02c6ddca5e1f2914f61f2530271fce /src/wg.rs
parent56d37f135536c7d17ab98c6671094925dee64a5e (diff)
Create separate files for psks.
Diffstat (limited to 'src/wg.rs')
-rw-r--r--src/wg.rs34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/wg.rs b/src/wg.rs
index 7565a02..004e6d8 100644
--- a/src/wg.rs
+++ b/src/wg.rs
@@ -2,19 +2,21 @@
//
// See COPYING.
-use crate::model;
+use crate::{fileutil, model};
use std::ffi::{OsStr, OsString};
+use std::path::PathBuf;
use std::process::{Command, Stdio};
-use std::{env, io};
+use std::{env, io, mem};
pub struct Device {
ifname: OsString,
+ tmpdir: PathBuf,
}
impl Device {
#[inline]
- pub fn open(ifname: OsString) -> io::Result<Self> {
- let dev = Self { ifname };
+ pub fn open(ifname: OsString, tmpdir: PathBuf) -> io::Result<Self> {
+ let dev = Self { ifname, tmpdir };
let _ = dev.get_public_key()?;
Ok(dev)
}
@@ -55,11 +57,10 @@ impl Device {
pub fn apply_diff(&mut self, old: &model::Config, new: &model::Config) -> io::Result<()> {
let mut proc = Self::wg_command();
- proc.stdin(Stdio::piped());
proc.arg("set");
proc.arg(&self.ifname);
- let mut psks = String::new();
+ let mut tmps = vec![];
for (pubkey, conf) in &new.peers {
let old_endpoint;
@@ -87,11 +88,16 @@ impl Device {
if let Some(psk) = &conf.psk {
proc.arg("preshared-key");
- proc.arg("/dev/stdin");
+ let mut tmp = self.tmpdir.clone();
+ tmp.push(format!("tmp-{}", tmps.len()));
+ let mut tmp = fileutil::Writer::new(tmp)?;
{
- use std::fmt::Write;
- writeln!(&mut psks, "{}", psk).unwrap();
+ use io::Write;
+ writeln!(tmp.file(), "{}", psk)?;
}
+ let tmp = tmp.done();
+ proc.arg(tmp.path());
+ tmps.push(tmp);
}
let mut ips = String::new();
@@ -124,14 +130,8 @@ impl Device {
proc.arg("remove");
}
- let mut proc = proc.spawn()?;
- {
- use std::io::Write;
- let stdin = proc.stdin.as_mut().unwrap();
- write!(stdin, "{}", psks)?;
- }
-
- let r = proc.wait()?;
+ let r = proc.status()?;
+ mem::drop(tmps);
if !r.success() {
return Err(io::Error::new(io::ErrorKind::Other, "Child process failed"));
}