From: Eugene Crosser Date: Sun, 30 Mar 2014 12:06:30 +0000 (+0400) Subject: part of powerdns out formatting X-Git-Tag: 0.9.0.0~107 X-Git-Url: http://average.org/gitweb/?a=commitdiff_plain;h=8c8cc995d35f462dbfdb7279f7e6da9bf27b670b;p=pdns-pipe-nmc.git part of powerdns out formatting --- diff --git a/NmcJson.hs b/NmcJson.hs index 651aa46..e69f4f4 100644 --- a/NmcJson.hs +++ b/NmcJson.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} module NmcJson ( NmcRes(..) - , NmcDom + , NmcDom(..) , emptyNmcDom ) where diff --git a/PowerDns.hs b/PowerDns.hs index 9a2a498..b9c8093 100644 --- a/PowerDns.hs +++ b/PowerDns.hs @@ -68,12 +68,50 @@ pdnsReport :: String -> String pdnsReport err = "LOG\tError: " ++ err ++ "\nFAIL\n" -pdnsOut :: Int -> String -> RRType -> Either String NmcDom -> String -pdnsOut ver id rrtype edom = +pdnsOut :: Int -> String -> String -> RRType -> Either String NmcDom -> String +pdnsOut ver id name rrtype edom = case edom of Left err -> pdnsReport err - Right dom -> pdnsAmend ver id rrtype dom "END\n" + Right dom -> foldr addLine "END\n" $ nmc2pdns name rrtype dom + where + addLine (nm, ty, dt) accum = + "DATA\t" ++ v3ext ++ nm ++ "\tIN\t" ++ ty ++ "\t" ++ ttl ++ + "\t" ++ id ++ "\t" ++ dt ++ "\n" ++ accum + v3ext = case ver of + 3 -> "0\t1\t" + _ -> "" + ttl = show 3600 -pdnsAmend :: Int -> String -> RRType -> NmcDom -> String -> String -pdnsAmend ver id rrtype dom accum = - "DATA\t" ++ (show dom) ++ "\n" ++ accum --FIXME +nmc2pdns :: String -> RRType -> NmcDom -> [(String, String, String)] +nmc2pdns name RRTypeANY dom = + foldr (\r accum -> (nmc2pdns name r dom) ++ accum) [] + [RRTypeA, RRTypeAAAA, RRTypeCNAME, RRTypeDNAME, -- no SRV here! + RRTypeSOA, RRTypeRP, RRTypeLOC, RRTypeNS, RRTypeDS] +nmc2pdns name RRTypeSRV dom = [] -- FIXME +nmc2pdns name RRTypeA dom = mapto name "A" $ domIp dom +nmc2pdns name RRTypeAAAA dom = mapto name "AAAA" $ domIp6 dom +nmc2pdns name RRTypeCNAME dom = takejust name "CNAME" $ domAlias dom +nmc2pdns name RRTypeDNAME dom = takejust name "DNAME" $ domTranslate dom +nmc2pdns name RRTypeSOA dom = + let + email = case domEmail dom of + Nothing -> "hostmaster." ++ name + Just addr -> + let (aname, adom) = break (== '@') addr + in case adom of + "" -> aname + _ -> aname ++ "." ++ (tail adom) + in + [(name, "SOA", email ++ " 99999999 10800 3600 604800 86400")] +nmc2pdns name RRTypeRP dom = [] --FIXME +nmc2pdns name RRTypeLOC dom = takejust name "LOC" $ domLoc dom +nmc2pdns name RRTypeNS dom = mapto name "NS" $ domNs dom +nmc2pdns name RRTypeDS dom = [] --FIXME + +mapto name rrstr maybel = case maybel of + Nothing -> [] + Just l -> map (\x -> (name, rrstr, x)) l + +takejust name rrstr maybestr = case maybestr of + Nothing -> [] + Just str -> [(name, rrstr, str)] diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs index 50d4bd8..82c320d 100644 --- a/pdns-pipe-nmc.hs +++ b/pdns-pipe-nmc.hs @@ -100,7 +100,7 @@ main = do Right preq -> do case preq of PdnsRequestQ qname qtype id _ _ _ -> - queryNmc mgr cfg qname id >>= putStr . (pdnsOut ver id qtype) + queryNmc mgr cfg qname id >>= putStr . (pdnsOut ver id qname qtype) PdnsRequestAXFR xfrreq -> putStr $ pdnsReport ("No support for AXFR " ++ xfrreq) PdnsRequestPing -> putStrLn "END" @@ -110,4 +110,4 @@ main = do ask str = do cfg <- readConfig confFile mgr <- newManager def - queryNmc mgr cfg str "askid" >>= putStr . (pdnsOut 1 "askid" RRTypeANY) + queryNmc mgr cfg str "askid" >>= putStr . (pdnsOut 1 "askid" str RRTypeANY)