Added proper tests (but more should be addedgit add --all :/)

This commit is contained in:
Francesco Cogno 2019-05-17 11:00:53 +02:00
parent 792a821de0
commit 70178cb8d6
No known key found for this signature in database
GPG key ID: 20883E192428EA7A

View file

@ -1,4 +1,5 @@
use crate::exporter_error::PeerEntryParseError;
use log::debug;
use std::collections::HashMap;
use std::convert::TryFrom;
@ -22,7 +23,10 @@ fn after_char(s: &str, c_split: char) -> &str {
s
}
fn parse_peer_entry<'a>(lines: &[&'a str]) -> Result<PeerEntry<'a>, PeerEntryParseError> {
impl<'a> TryFrom<&[&'a str]> for PeerEntry<'a> {
type Error = PeerEntryParseError;
fn try_from(lines: &[&'a str]) -> Result<PeerEntry<'a>, Self::Error> {
let mut public_key = "";
let mut allowed_ips = "";
let mut name = None;
@ -33,12 +37,17 @@ fn parse_peer_entry<'a>(lines: &[&'a str]) -> Result<PeerEntry<'a>, PeerEntryPar
} else if line.starts_with("AllowedIPs") {
allowed_ips = after_char(line, '=').trim();
} else if line.starts_with("#") {
// since the pound sign is 1 byte the below slice will work
name = Some(line[1..].trim());
}
}
// Sanity checks
// If there are more than one PublicKey or AllowedIPs we won't catch it. But
// WireGuard won't be working either so we can live with this simplification.
if public_key == "" {
// we return a owned String for ergonomics. This will allocate but it's ok since it's not supposed
// to happen :)
let lines_owned: Vec<String> = lines.into_iter().map(|line| line.to_string()).collect();
Err(PeerEntryParseError::PublicKeyNotFound { lines: lines_owned })
} else if allowed_ips == "" {
@ -51,12 +60,17 @@ fn parse_peer_entry<'a>(lines: &[&'a str]) -> Result<PeerEntry<'a>, PeerEntryPar
name, // name can be None
})
}
}
}
pub(crate) fn parse<'a>(
txt: &'a str,
) -> Result<HashMap<&'a str, PeerEntry<'a>>, PeerEntryParseError> {
let mut ht = HashMap::new();
#[derive(Debug, Default, Clone)]
pub(crate) struct PeerEntryHashMap<'a>(HashMap<&'a str, PeerEntry<'a>>);
impl<'a> TryFrom<&'a str> for PeerEntryHashMap<'a> {
type Error = PeerEntryParseError;
fn try_from(txt: &'a str) -> Result<PeerEntryHashMap, Self::Error> {
let mut hm = HashMap::new();
let mut v_blocks = Vec::new();
let mut cur_block: Option<Vec<&str>> = None;
@ -88,16 +102,17 @@ pub(crate) fn parse<'a>(
v_blocks.push(cur_block);
}
println!("v_blocks == {:?}", v_blocks);
debug!("v_blocks == {:?}", v_blocks);
for block in &v_blocks {
let p = parse_peer_entry(block)?;
ht.insert(p.public_key, p);
let p: PeerEntry = PeerEntry::try_from(&block as &[&str])?;
hm.insert(p.public_key, p);
}
println!("ht == {:?}", ht);
debug!("hm == {:?}", hm);
Ok(ht)
Ok(PeerEntryHashMap(hm))
}
}
#[cfg(test)]
@ -139,14 +154,69 @@ AllowedIPs = 10.70.0.40/32
# OnePlus 5T
PublicKey = 928vO9Lf4+Mo84cWu4k1oRyzf0AR7FTGoPKHGoTMSHk=
AllowedIPs = 10.70.0.80/32
";
const TEXT_NOPK: &'static str = "
ListenPort = 51820
PrivateKey = my_super_secret_private_key
# PreUp = iptables -t nat -A POSTROUTING -s 10.70.0.0/24 -o enp7s0 -j MASQUERADE
# PostDown = iptables -t nat -D POSTROUTING -s 10.70.0.0/24 -o enp7s0 -j MASQUERADE
[Peer]
# OnePlus 6T
PublicKey = 2S7mA0vEMethCNQrJpJKE81/JmhgtB+tHHLYQhgM6kk=
AllowedIPs = 10.70.0.2/32
[Peer]
# varch.local (laptop)
AllowedIPs = 10.70.0.3/32
[Peer]
# cantarch
PublicKey = L2UoJZN7RmEKsMmqaJgKG0m1S2Zs2wd2ptAf+kb3008=
AllowedIPs = 10.70.0.4/32
";
const TEXT_AIP: &'static str = "
ListenPort = 51820
PrivateKey = my_super_secret_private_key
# PreUp = iptables -t nat -A POSTROUTING -s 10.70.0.0/24 -o enp7s0 -j MASQUERADE
# PostDown = iptables -t nat -D POSTROUTING -s 10.70.0.0/24 -o enp7s0 -j MASQUERADE
[Peer]
# OnePlus 6T
PublicKey = 2S7mA0vEMethCNQrJpJKE81/JmhgtB+tHHLYQhgM6kk=
AllowedIPs = 10.70.0.2/32
[Peer]
# varch.local (laptop)
AllowedIPs = 10.70.0.3/32
PublicKey = 6S7mA0vEMethCNQrJpJKE81/JmhgtB+tHHLYQhgM6kk=
[Peer]
# cantarch
PublicKey = L2UoJZN7RmEKsMmqaJgKG0m1S2Zs2wd2ptAf+kb3008=
";
#[test]
fn test_parse() {
let a = parse(TEXT);
fn test_parse_ok() {
let a: PeerEntryHashMap = PeerEntryHashMap::try_from(TEXT).unwrap();
println!("{:?}", a);
}
#[test]
fn test_parse_and_serialize() {}
#[should_panic(
expected = "PublicKeyNotFound { lines: [\"# varch.local (laptop)\", \"AllowedIPs = 10.70.0.3/32\"] }"
)]
fn test_parse_no_public_key() {
let _: PeerEntryHashMap = PeerEntryHashMap::try_from(TEXT_NOPK).unwrap();
}
#[test]
#[should_panic(
expected = "AllowedIPsEntryNotFound { lines: [\"# cantarch\", \"PublicKey = L2UoJZN7RmEKsMmqaJgKG0m1S2Zs2wd2ptAf+kb3008=\"] }"
)]
fn test_parse_no_allowed_ips() {
let _: PeerEntryHashMap = PeerEntryHashMap::try_from(TEXT_AIP).unwrap();
}
}