X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcTransform.hs;h=64210eb288f72ec1681cec5757ac7fe8035d8489;hp=c30bc1f8efe525ffb3f2c8950b14476153449756;hb=ee17ef7aa871f74fe486a8cd2ad7e34533819a8c;hpb=38ae85a344eb50f748eb2a2f1df305e82d41b212

diff --git a/NmcTransform.hs b/NmcTransform.hs
index c30bc1f..64210eb 100644
--- a/NmcTransform.hs
+++ b/NmcTransform.hs
@@ -9,6 +9,7 @@ import Data.Map.Lazy (empty, lookup, delete, size, singleton
                      , foldrWithKey, insert, insertWith)
 import Control.Monad (foldM)
 import Data.Aeson (decode)
+import Data.Default.Class (def)
 
 import NmcDom
 
@@ -45,7 +46,7 @@ mergeIncl queryOp depth base = do
     else case ((domDelegate mbase), (domImport mbase)) of
       (Nothing,  Nothing  ) -> return $ Right base'
       (Nothing,  Just keys) -> foldM mergeIncl1 (Right base') keys
-      (Just key, _        ) -> mergeIncl1 (Right emptyNmcDom) key
+      (Just key, _        ) -> mergeIncl1 (Right def) key
   where
     mergeIncl1 (Left  err) _   = return $ Left err -- can never happen
     mergeIncl1 (Right acc) key = do
@@ -85,10 +86,10 @@ expandSrv base =
         where
           addSrvMx sr acc = sub1 `mergeNmcDom` acc
             where
-              sub1 = emptyNmcDom { domMap = Just (singleton proto sub2)
+              sub1 = def { domMap = Just (singleton proto sub2)
                                  , domMx = maybemx}
-              sub2 = emptyNmcDom { domMap = Just (singleton srvid sub3) }
-              sub3 = emptyNmcDom { domSrv = Just [srvStr] }
+              sub2 = def { domMap = Just (singleton srvid sub3) }
+              sub3 = def { domSrv = Just [srvStr] }
               proto = "_" ++ (srvProto sr)
               srvid = "_" ++ (srvName sr)
               srvStr =  (show (srvPrio sr)) ++ "\t"
@@ -101,6 +102,30 @@ expandSrv base =
                    && srvPort sr == 25
                 then Just [(show (srvPrio sr)) ++ "\t" ++ (srvHost sr)]
                 else Nothing
+{-
+-- | replace Tls with Tlsa down in the Map
+--   This function is almost, but not quite, entirely unlike expandSrv.
+expandTls :: NmcDom -> NmcDom
+expandTls base =
+  let
+    base' = base { domTls = Nothing }
+  in
+    case domTls base of
+      Nothing -> base'
+      Just sl -> foldr addTlsa base' sl
+        where
+          addTlsa sr acc = sub1 `mergeNmcDom` acc
+            where
+              sub1 = def { domMap = Just (singleton proto sub2) }
+              sub2 = def { domMap = Just (singleton port sub3) }
+              sub3 = def { domTlsa = Just [tlsStr] }
+              proto = "_" ++ (tlsProto sr)
+              port = "_" ++ (tlsName sr)
+              tlsStr =  (show (tlsPrio sr)) ++ "\t"
+                     ++ (show (tlsWeight sr)) ++ " "
+                     ++ (show (tlsPort sr)) ++ " "
+                     ++ (tlsHost sr)
+-}
 
 -- | Convert map elements of the form "subN...sub2.sub1.dom.bit"
 --   into nested map and merge it
@@ -111,7 +136,7 @@ splitSubdoms base =
   in
     case domMap base of
       Nothing -> base'
-      Just sdmap -> (emptyNmcDom { domMap = Just sdmap' }) `mergeNmcDom` base'
+      Just sdmap -> (def { domMap = Just sdmap' }) `mergeNmcDom` base'
         where
           sdmap' = foldrWithKey stow empty sdmap
           stow fqdn sdom acc = insertWith mergeNmcDom fqdn' sdom' acc
@@ -122,7 +147,11 @@ splitSubdoms base =
               nest ([], v)   = (fqdn, v) -- can split result be empty?
               nest ([k], v)  = (k, v)
               nest (k:ks, v) =
-                nest (ks, emptyNmcDom { domMap = Just (singleton k v) })
+                nest (ks, def { domMap = Just (singleton k v) })
+
+-- | transfer some elements of `base` into `sub`, notably TLSA
+propagate :: NmcDom -> NmcDom -> NmcDom
+propagate base sub = sub -- FIXME implement it
  
 -- | Presence of some elements require removal of some others
 normalizeDom :: NmcDom -> NmcDom
@@ -132,7 +161,7 @@ normalizeDom dom = foldr id dom [ translateNormalizer
   where
     nsNormalizer dom = case domNs dom of
       Nothing  -> dom
-      Just ns  -> emptyNmcDom { domNs = domNs dom, domEmail = domEmail dom }
+      Just ns  -> def { domNs = domNs dom, domEmail = domEmail dom }
     translateNormalizer dom = case domTranslate dom of
       Nothing  -> dom
       Just tr  -> dom { domMap = Nothing }
@@ -152,14 +181,14 @@ descendNmcDom queryOp subdom base = do
         Left err     -> return base'
         Right base'' ->
           case domMap base'' of
-            Nothing  -> return $ Right emptyNmcDom
+            Nothing  -> return $ Right def
             Just map ->
               case lookup d map of
-                Nothing  -> return $ Right emptyNmcDom
-                Just sub -> descendNmcDom queryOp ds sub
+                Nothing  -> return $ Right def
+                Just sub -> descendNmcDom queryOp ds $ propagate base'' sub
 
 -- | Initial NmcDom populated with "import" only, suitable for "descend"
 seedNmcDom ::
   String        -- ^ domain key (without namespace prefix)
   -> NmcDom     -- ^ resulting seed domain
-seedNmcDom dn = emptyNmcDom { domImport = Just (["d/" ++ dn])}
+seedNmcDom dn = def { domImport = Just (["d/" ++ dn])}