shimun/wireguard-user
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

closer [CI SKIP]

Browse Source
This commit is contained in:
Drone CI
2019-03-19 15:23:06 +01:00
parent 7491902b34
commit fac5c7c442
2 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
wg-event-gen/src/controller.rs
View File

@@ -1,5 +1,5 @@
use crate::model::{ECCKey, Peer, PeerBuilder, WireguardController};
use std::io::{BufRead, BufReader, Result, Write};
use std::io::{BufRead, BufReader, Error, ErrorKind, Result, Write};
use std::net::{IpAddr, SocketAddr};
use std::os::unix::net::UnixStream;
use std::path::PathBuf;
@@ -18,43 +18,48 @@ impl WireguardController for Userspace {
let mut stream = UnixStream::connect(&self.0)?;
stream.write_all(b"get=1\n")?;
fn build_peer(builder: &mut PeerBuilder, line: io::Result<String>) -> Option<Result<Peer>> {
let line = line?;
fn build_peer(builder: &mut PeerBuilder, line: Result<String>) -> Option<Result<Peer>> {
let line = match line {
Ok(line) => line,
Err(e) => return Some(Err(e)),
};
fn parse_err<O, E>(res: std::error::Result<O, E>) -> Result<O> {
res.map_err(|err: String| Error::new(ErrorKind::InvalidData, err.into()))
}
let mut iter = line.chars();
let key = iter.by_ref().take_while(|c| c != &'=').collect::<String>();
let value = iter.collect::<String>();
let mut ips: Vec<(IpAddr, u8)> = Vec::with_capacity(0);
if builder.allowed_ips.len() > 1 {
ips.append(&builder.allowed_ips);
}
let update_handshake = |d: Duration| {
builder.last_handshake(last_handshake.map(|c| c + d));
};
let value_as_num = || value.parse::<usize>();
let value_as_num = || parse_err(value.parse::<u64>());
let mut peer: Option<Peer> = None;
let add_key = |key| {
if builder.key.is_some() {
//If next entry begins
peer = Some(builder.build().map_err(|err: String| {
io::Error::new(ErrorKind::InvalidData, err.into())
})?);
if builder.is_whole() {
peer = Some(parse_err(builder.build())?);
*builder = PeerBuilder::default();
} else {
peer = None
}
builder.key(key);
Ok(peer)
};
match key.as_ref() {
"public_key" => add_key(ECCKey::from_base64(value)?),
"private_key" => add_key(ECCKey::from_base64(value)?),
"endpoint" => builder.endpoint(value.parse::<SocketAddr>()?),
"public_key" => {
add_key(parse_err(ECCKey::from_base64(value))?)?;
}
/*"private_key" => {
add_key(ECCKey::from_base64(value)?)?;
}
"endpoint" => {
builder.endpoint(Some(parse_err(value.parse::<SocketAddr>())?));
}
"last_handshake_time_sec" => {
update_handshake(Duration::from_secs(value_as_num().into()));
builder.add_last_handshake(Duration::from_secs(value_as_num()?));
}
"last_handshake_time_nsec" => {
update_handshake(Duration::from_nanos(value_as_num().into()));
}
builder.add_last_handshake(Duration::from_nanos(value_as_num()?.into()));
},
"persistent_keepalive" => {
builder.persistent_keepalive(Some(Duration::from_secs(value_as_num().into())));
}
builder.persistent_keepalive(Some(Duration::from_secs(value_as_num()?.into())));
},*/
"allowed_ip" => {
let mut parts = value.split("/").into_iter();
let net = match (
@@ -67,7 +72,7 @@ impl WireguardController for Userspace {
_ => None,
};
if let Some(net) = net {
builder.allowed_ips.map(|ips| ips.push(net));
builder.add_allowed_ip(net);
}
}
}