propagate forced TLSA onto subdomains

[pdns-pipe-nmc.git] / NmcTransform.hs

diff --git a/NmcTransform.hs b/NmcTransform.hs
index cc89abeda14e60ffab546c029d2636a9f4973f96..4a3e66714777d5cfebb81e80a67949e190050753 100644 (file)
--- a/NmcTransform.hs
+++ b/NmcTransform.hs
@@ -2,12 +2,12 @@ module NmcTransform ( seedNmcDom
                     , descendNmcDom
                     ) where
 
                     , descendNmcDom
                     ) where
 

-import Prelude hiding (lookup)
+import Prelude hiding (lookup, null)

 import Data.ByteString.Lazy (ByteString)
 import Data.ByteString.Lazy (ByteString)

-import Data.Text.Lazy (splitOn, pack, unpack)
-import Data.Map.Lazy (empty, lookup, delete, size, singleton
+import Data.Map.Lazy (Map, empty, lookup, delete, null, singleton

                      , foldrWithKey, insert, insertWith)
 import Control.Monad (foldM)
                      , foldrWithKey, insert, insertWith)
 import Control.Monad (foldM)

+import Data.Maybe (fromMaybe)

 import Data.Aeson (decode)
 import Data.Default.Class (def)
 
 import Data.Aeson (decode)
 import Data.Default.Class (def)
 


@@ -39,7 +39,7 @@ mergeIncl ::
   -> IO (Either String NmcDom)              -- ^ result with merged import
 mergeIncl queryOp depth base = do
   let
   -> IO (Either String NmcDom)              -- ^ result with merged import
 mergeIncl queryOp depth base = do
   let

-    mbase = (expandSrv . splitSubdoms . mergeSelf) base
+    mbase = mergeSelf base

     base' = mbase {domDelegate = Nothing, domImport = Nothing}
   -- print base
   if depth <= 0 then return $ Left "Nesting of imports is too deep"
     base' = mbase {domDelegate = Nothing, domImport = Nothing}
   -- print base
   if depth <= 0 then return $ Left "Nesting of imports is too deep"


@@ -53,17 +53,17 @@ mergeIncl queryOp depth base = do
       sub <- queryNmcDom queryOp key
       case sub of
         Left  err  -> return $ Left err
       sub <- queryNmcDom queryOp key
       case sub of
         Left  err  -> return $ Left err

-        Right sub' -> mergeIncl queryOp (depth - 1) $ sub' `mergeNmcDom` acc
+        Right sub' -> mergeIncl queryOp (depth - 1) $ sub' `merge` acc

 
 -- | If there is an element in the map with key "", merge the contents
 --   and remove this element. Do this recursively.
 mergeSelf :: NmcDom -> NmcDom
 mergeSelf base =
   let
 
 -- | If there is an element in the map with key "", merge the contents
 --   and remove this element. Do this recursively.
 mergeSelf :: NmcDom -> NmcDom
 mergeSelf base =
   let

-    map   = domMap base
-    base' = base {domMap = removeSelf map}
+    map   = domSubmap base
+    base' = base {domSubmap = removeSelf map}

     removeSelf Nothing    = Nothing
     removeSelf Nothing    = Nothing

-    removeSelf (Just map) = if size map' == 0 then Nothing else Just map'
+    removeSelf (Just map) = if null map' then Nothing else Just map'

       where map' = delete "" map
   in
     case map of
       where map' = delete "" map
   in
     case map of


@@ -71,84 +71,29 @@ mergeSelf base =
       Just map' ->
         case lookup "" map' of
           Nothing  -> base'
       Just map' ->
         case lookup "" map' of
           Nothing  -> base'

-          Just sub -> (mergeSelf sub) `mergeNmcDom` base'
+          Just sub -> (mergeSelf sub) `merge` base'

         -- recursion depth limited by the size of the record
 
         -- recursion depth limited by the size of the record
 

--- | replace Service with Srv down in the Map
-expandSrv :: NmcDom -> NmcDom
-expandSrv base =
-  let
-    base' = base { domService = Nothing }
-  in
-    case domService base of
-      Nothing -> base'
-      Just sl -> foldr addSrvMx base' sl
-        where
-          addSrvMx sr acc = sub1 `mergeNmcDom` acc
-            where
-              sub1 = def { domMap = Just (singleton proto sub2)
-                                 , domMx = maybemx}
-              sub2 = def { domMap = Just (singleton srvid sub3) }
-              sub3 = def { domSrv = Just [srvStr] }
-              proto = "_" ++ (srvProto sr)
-              srvid = "_" ++ (srvName sr)
-              srvStr =  (show (srvPrio sr)) ++ "\t"
-                     ++ (show (srvWeight sr)) ++ " "
-                     ++ (show (srvPort sr)) ++ " "
-                     ++ (srvHost sr)
-              maybemx =
-                if srvName sr == "smtp"
-                   && srvProto sr == "tcp"
-                   && 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)
--}
+-- | transfer some elements of `base` into `sub`, notably TLSA
+propagate :: NmcDom -> NmcDom -> NmcDom
+propagate base sub = sub `merge` (pickglobals base)
+  where
+    pickglobals dom = fromMaybe def (siftsubmap (siftsubmap taketlsa) dom)
+    siftsubmap f dom =
+      let
+        sdmap = fromMaybe empty (domSubmap dom)
+        sdmap' = foldrWithKey (\k x -> addifjust k (f x)) empty sdmap
+        addifjust k mdom acc = case mdom of
+          Nothing  -> acc
+          Just dom -> insert k dom acc -- dups are impossible here
+      in
+        if null sdmap' then Nothing else Just $ def { domSubmap = Just sdmap'}
+    taketlsa dom = case domTlsa dom of
+      Nothing   -> Nothing
+      Just tlsa -> case filter (\x -> tlsIncSubdoms x) tlsa of
+        []    -> Nothing
+        tlsa' -> Just $ def { domTlsa = Just tlsa' }

 
 

--- | Convert map elements of the form "subN...sub2.sub1.dom.bit"
---   into nested map and merge it
-splitSubdoms :: NmcDom -> NmcDom
-splitSubdoms base =
-  let
-    base' = base { domMap = Nothing }
-  in
-    case domMap base of
-      Nothing -> base'
-      Just sdmap -> (def { domMap = Just sdmap' }) `mergeNmcDom` base'
-        where
-          sdmap' = foldrWithKey stow empty sdmap
-          stow fqdn sdom acc = insertWith mergeNmcDom fqdn' sdom' acc
-            where
-              (fqdn', sdom') =
-                nest (filter (/= "") (splitOnDots fqdn), sdom)
-              splitOnDots s = map unpack (splitOn (pack ".") (pack s))
-              nest ([], v)   = (fqdn, v) -- can split result be empty?
-              nest ([k], v)  = (k, v)
-              nest (k:ks, v) =
-                nest (ks, def { domMap = Just (singleton k v) })
- 

 -- | Presence of some elements require removal of some others
 normalizeDom :: NmcDom -> NmcDom
 normalizeDom dom = foldr id dom [ translateNormalizer
 -- | Presence of some elements require removal of some others
 normalizeDom :: NmcDom -> NmcDom
 normalizeDom dom = foldr id dom [ translateNormalizer


@@ -160,7 +105,7 @@ normalizeDom dom = foldr id dom [ translateNormalizer
       Just ns  -> def { domNs = domNs dom, domEmail = domEmail dom }
     translateNormalizer dom = case domTranslate dom of
       Nothing  -> dom
       Just ns  -> def { domNs = domNs dom, domEmail = domEmail dom }
     translateNormalizer dom = case domTranslate dom of
       Nothing  -> dom

-      Just tr  -> dom { domMap = Nothing }
+      Just tr  -> dom { domSubmap = Nothing }

 
 -- | Merge imports and Selfs and follow the maps tree to get dom
 descendNmcDom ::
 
 -- | Merge imports and Selfs and follow the maps tree to get dom
 descendNmcDom ::


@@ -176,12 +121,12 @@ descendNmcDom queryOp subdom base = do
       case base' of
         Left err     -> return base'
         Right base'' ->
       case base' of
         Left err     -> return base'
         Right base'' ->

-          case domMap base'' of
+          case domSubmap base'' of

             Nothing  -> return $ Right def
             Just map ->
               case lookup d map of
                 Nothing  -> return $ Right def
             Nothing  -> return $ Right def
             Just map ->
               case lookup d map of
                 Nothing  -> return $ Right def

-                Just sub -> descendNmcDom queryOp ds sub
+                Just sub -> descendNmcDom queryOp ds $ propagate base'' sub

 
 -- | Initial NmcDom populated with "import" only, suitable for "descend"
 seedNmcDom ::
 
 -- | Initial NmcDom populated with "import" only, suitable for "descend"
 seedNmcDom ::