config: Substitutions prefer %{...} to %(...)s, document, etc.

[hippotat.git] / src / config.rs

diff --git a/src/config.rs b/src/config.rs
index 34b9a0c838343a19cf1f3985345d08a3f58afbc9..4b94b3ed73357db4659e2c3fde777e4e67b13e66 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -6,6 +6,42 @@ use crate::prelude::*;
 
 use configparser::ini::Ini;
 
+#[derive(hippotat_macros::ResolveConfig)]
+#[derive(Debug,Clone)]
+pub struct InstanceConfig {
+  // Exceptional settings
+  #[special(special_link, SKL::ServerName)]   pub link:   LinkName,
+  pub                                             secret: Secret,
+  #[special(special_ipif, SKL::Ordinary)]     pub ipif:   String,
+
+  // Capped settings:
+  #[limited]    pub max_batch_down:               u32,
+  #[limited]    pub max_queue_time:               Duration,
+  #[limited]    pub http_timeout:                 Duration,
+  #[limited]    pub target_requests_outstanding:  u32,
+
+  // Ordinary settings:
+  pub addrs:                        Vec<IpAddr>,
+  pub vnetwork:                     Vec<IpNet>,
+  pub vaddr:                        IpAddr,
+  pub vrelay:                       IpAddr,
+  pub port:                         u16,
+  pub mtu:                          u32,
+  pub ifname_server:                String,
+  pub ifname_client:                String,
+
+  // Ordinary settings, used by server only:
+  #[server]  pub max_clock_skew:               Duration,
+
+  // Ordinary settings, used by client only:
+  #[client]  pub http_timeout_grace:           Duration,
+  #[client]  pub max_requests_outstanding:     u32,
+  #[client]  pub max_batch_up:                 u32,
+  #[client]  pub http_retry:                   Duration,
+  #[client]  pub url:                          Uri,
+  #[client]  pub vroutes:                      Vec<IpNet>,
+}
+
 static DEFAULT_CONFIG: &str = r#"
 [COMMON]
 max_batch_down = 65536
@@ -18,11 +54,11 @@ max_batch_up = 4000
 http_retry = 5
 port = 80
 vroutes = ''
-ifname_client = hippo%%d
-ifname_server = shippo%%d
+ifname_client = hippo%d
+ifname_server = shippo%d
 max_clock_skew = 300
 
-ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip,%(ifname)s %(rnets)s
+ipif = userv root ipif %{local},%{peer},%{mtu},slip,%{ifname} '%{rnets}'
 
 mtu = 1500
 
@@ -75,42 +111,6 @@ impl Debug for Secret {
   fn fmt(&self, f: &mut fmt::Formatter) { write!(f, "Secret(***)")? }
 }
 
-#[derive(hippotat_macros::ResolveConfig)]
-#[derive(Debug,Clone)]
-pub struct InstanceConfig {
-  // Exceptional settings
-  #[special(special_server, SKL::ServerName)] pub server: ServerName,
-  pub                                             secret: Secret,
-  #[special(special_ipif, SKL::Ordinary)]     pub ipif:   String,
-
-  // Capped settings:
-  #[limited]    pub max_batch_down:               u32,
-  #[limited]    pub max_queue_time:               Duration,
-  #[limited]    pub http_timeout:                 Duration,
-  #[limited]    pub target_requests_outstanding:  u32,
-
-  // Ordinary settings:
-  pub addrs:                        Vec<IpAddr>,
-  pub vnetwork:                     Vec<IpNet>,
-  pub vaddr:                        IpAddr,
-  pub vrelay:                       IpAddr,
-  pub port:                         u16,
-  pub mtu:                          u32,
-  pub ifname_server:                String,
-  pub ifname_client:                String,
-
-  // Ordinary settings, used by server only:
-  #[server]  pub max_clock_skew:               Duration,
-
-  // Ordinary settings, used by client only:
-  #[client]  pub http_timeout_grace:           Duration,
-  #[client]  pub max_requests_outstanding:     u32,
-  #[client]  pub max_batch_up:                 u32,
-  #[client]  pub http_retry:                   Duration,
-  #[client]  pub url:                          Uri,
-  #[client]  pub vroutes:                      Vec<IpNet>,
-}
-
 #[derive(Debug,Clone,Hash,Eq,PartialEq)]
 pub enum SectionName {
   Link(LinkName),
@@ -145,7 +145,7 @@ impl<'v> RawValRef<'v,'_,'_> {
 }
 
 pub struct Config {
-  opts: Opts,
+  pub opts: Opts,
 }
 
 static OUTSIDE_SECTION: &str = "[";
@@ -191,6 +191,11 @@ impl FromStr for SectionName {
     SN::Link(LinkName { server, client })
   }
 }
+impl Display for InstanceConfig {
+  #[throws(fmt::Error)]
+  fn fmt(&self, f: &mut fmt::Formatter) { Display::fmt(&self.link, f)? }
+}
+
 impl Display for SectionName {
   #[throws(fmt::Error)]
   fn fmt(&self, f: &mut fmt::Formatter) {
@@ -630,8 +635,8 @@ impl<'c> ResolveContext<'c> {
   }
 
   #[throws(AE)]
-  pub fn special_server(&self, key: &'static str) -> ServerName {
-    self.link.server.clone()
+  pub fn special_link(&self, _key: &'static str) -> LinkName {
+    self.link.clone()
   }
 }
 
@@ -679,6 +684,63 @@ impl InstanceConfig {
         }
       },
     }
+
+    #[throws(AE)]
+    fn subst(var: &mut String,
+             kv: &mut dyn Iterator<Item=(&'static str, &dyn Display)>
+    ) {
+      let substs = kv
+        .map(|(k,v)| (k.to_string(), v.to_string()))
+        .collect::<HashMap<String, String>>();
+      let bad = parking_lot::Mutex::new(vec![]);
+      *var = regex_replace_all!(
+        r#"%(?:%|\((\w+)\)s|\{(\w+)\}|.)"#,
+        &var,
+        |whole, k1, k2| (|| Ok::<_,String>({
+          if whole == "%%" { "%" }
+          else if let Some(&k) = [k1,k2].iter().find(|&&s| s != "") {
+            substs.get(k).ok_or_else(
+              || format!("unknown key %({})s", k)
+            )?
+          } else {
+            throw!(format!("bad percent escape {:?}", &whole));
+          }
+        }))().unwrap_or_else(|e| { bad.lock().push(e); "" })
+      ).into_owned();
+      let bad = bad.into_inner();
+      if ! bad.is_empty() {
+        throw!(anyhow!("substitution failed: {}", bad.iter().format("; ")));
+      }
+    }
+
+    {
+      use LinkEnd::*;
+      type DD<'d> = &'d dyn Display;
+      fn dv<T:Display>(v: &[T]) -> String {
+        format!("{}", v.iter().format(" "))
+      }
+      let mut ipif = mem::take(&mut self.ipif); // lets us borrow all of self
+      let s = &self; // just for abbreviation, below
+      let vnetwork = dv(&s.vnetwork);
+      let vroutes  = dv(&s.vroutes);
+
+      let keys = &["local",       "peer",    "rnets",   "ifname"];
+      let values = match end {
+ Server => [&s.vaddr as DD      , &s.vrelay, &vnetwork, &s.ifname_server],
+ Client => [&s.link.client as DD, &s.vaddr,  &vroutes,  &s.ifname_client],
+      };
+      let always = [
+        ( "mtu",     &s.mtu as DD ),
+      ];
+
+      subst(
+        &mut ipif,
+        &mut keys.iter().cloned()
+          .zip_eq(values)
+          .chain(always.iter().cloned()),
+      ).context("ipif")?;
+      self.ipif = ipif;
+    }
   }
 }
 
@@ -700,7 +762,7 @@ pub fn read(end: LinkEnd) -> Vec<InstanceConfig> {
       agg.read_extra(extra).context("extra config")?;
     }
 
-    eprintln!("GOT {:#?}", agg);
+    //eprintln!("GOT {:#?}", agg);
 
     Ok::<_,AE>(agg)
   })().context("read configuration")?;