X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcTransform.hs;h=858acf7de0e6c58229ad7a357e8bb273d66386f4;hp=ef4300605d7dbebcbf777f34f2a6ccabab9004c5;hb=3b51a3a5c335293966447ccc5c758c19e9b669c2;hpb=553226e595c2b4ecfcb0ae9f9458c79c6d8d3627 diff --git a/NmcTransform.hs b/NmcTransform.hs index ef43006..858acf7 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 @@ -25,39 +26,42 @@ queryNmcDom queryOp key = do Nothing -> return $ Left $ "Unparseable value: " ++ (show str) Just dom -> return $ Right dom --- | Try to fetch "import" object and merge it into the base domain --- Original "import" element is removed, but new imports from the --- imported objects are processed recursively until there are none. -mergeImport :: +-- | Try to fetch "delegate" or "import" object and merge them into the +-- base domain. Original "import" element is removed, but newly +-- merged data may contain new "import" or "delegate", so the objects +-- that are about to be merged are processed recursively until there +-- are no more "import" and "deletage" attributes (or the depth gauge +-- reaches zero). +mergeIncl :: (String -> IO (Either String ByteString)) -- ^ query operation action -> Int -- ^ recursion counter -> NmcDom -- ^ base domain -> IO (Either String NmcDom) -- ^ result with merged import -mergeImport queryOp depth base = do +mergeIncl queryOp depth base = do let - mbase = (expandSrv . splitSubdoms . mergeSelf) base - base' = mbase {domImport = Nothing} + mbase = ({-expandSrv .-} splitSubdoms . mergeSelf) base + base' = mbase {domDelegate = Nothing, domImport = Nothing} -- print base if depth <= 0 then return $ Left "Nesting of imports is too deep" - else case ((domDelegate mbase), (domImport mbase)) of - (Nothing, Nothing ) -> return $ Right base' - (Nothing, Just keys) -> foldM mergeImport1 (Right base') keys - (Just key, _ ) -> mergeImport1 (Right emptyNmcDom) key + else case ((domDelegate mbase), (domImport mbase)) of + (Nothing, Nothing ) -> return $ Right base' + (Nothing, Just keys) -> foldM mergeIncl1 (Right base') keys + (Just key, _ ) -> mergeIncl1 (Right def) key where - mergeImport1 (Left err) _ = return $ Left err -- can never happen - mergeImport1 (Right acc) key = do + mergeIncl1 (Left err) _ = return $ Left err -- can never happen + mergeIncl1 (Right acc) key = do sub <- queryNmcDom queryOp key case sub of Left err -> return $ Left err - Right sub' -> mergeImport 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 - map = domMap base - base' = base {domMap = removeSelf map} + map = domSubmap base + base' = base {domSubmap = removeSelf map} removeSelf Nothing = Nothing removeSelf (Just map) = if size map' == 0 then Nothing else Just map' where map' = delete "" map @@ -67,9 +71,9 @@ mergeSelf 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 - +{- -- | replace Service with Srv down in the Map expandSrv :: NmcDom -> NmcDom expandSrv base = @@ -80,15 +84,15 @@ expandSrv base = Nothing -> base' Just sl -> foldr addSrvMx base' sl where - addSrvMx sr acc = sub1 `mergeNmcDom` acc + addSrvMx sr acc = sub1 `merge` acc where - sub1 = emptyNmcDom { domMap = Just (singleton proto sub2) + sub1 = def { domSubmap = Just (singleton proto sub2) , domMx = maybemx} - sub2 = emptyNmcDom { domMap = Just (singleton srvid sub3) } - sub3 = emptyNmcDom { domSrv = Just [srvStr] } + sub2 = def { domSubmap = Just (singleton srvid sub3) } + sub3 = def { domSrv = Just [srvStr] } proto = "_" ++ (srvProto sr) srvid = "_" ++ (srvName sr) - srvStr = (show (srvPrio sr)) ++ " " + srvStr = (show (srvPrio sr)) ++ "\t" ++ (show (srvWeight sr)) ++ " " ++ (show (srvPort sr)) ++ " " ++ (srvHost sr) @@ -96,29 +100,34 @@ expandSrv base = if srvName sr == "smtp" && srvProto sr == "tcp" && srvPort sr == 25 - then Just [(show (srvPrio sr)) ++ " " ++ (srvHost sr)] + then Just [(show (srvPrio sr)) ++ "\t" ++ (srvHost sr)] else Nothing - +-} -- | 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 } + base' = base { domSubmap = Nothing } in - case domMap base of + case domSubmap base of Nothing -> base' - Just sdmap -> (emptyNmcDom { domMap = Just sdmap' }) `mergeNmcDom` base' + Just sdmap -> (def { domSubmap = Just sdmap' }) `merge` base' where sdmap' = foldrWithKey stow empty sdmap - stow fqdn sdom acc = insertWith mergeNmcDom fqdn' sdom' acc + stow fqdn sdom acc = insertWith merge fqdn' sdom' acc where (fqdn', sdom') = - nest (map unpack (splitOn (pack ".") (pack 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, emptyNmcDom { domMap = Just (singleton k v) }) + nest (ks, def { domSubmap = 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 @@ -128,10 +137,10 @@ 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 } + Just tr -> dom { domSubmap = Nothing } -- | Merge imports and Selfs and follow the maps tree to get dom descendNmcDom :: @@ -140,22 +149,22 @@ descendNmcDom :: -> NmcDom -- ^ base domain -> IO (Either String NmcDom) -- ^ fully processed result descendNmcDom queryOp subdom base = do - base' <- mergeImport queryOp 10 base + base' <- mergeIncl queryOp 10 base case subdom of [] -> return $ fmap normalizeDom base' d:ds -> case base' of Left err -> return base' Right base'' -> - case domMap base'' of - Nothing -> return $ Right emptyNmcDom + case domSubmap base'' of + 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])}