X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=PowerDns.hs;h=61fdc21b307a1ef8c8af959c95ae58d0d64d3fb2;hp=c465a16a3017f7fc3c43876953d81d048b8234b4;hb=6bd856a8ffad4610f3c1632a337ad05e6277c898;hpb=5f990bd3b8df23bc4c304092cb0375625835b132

diff --git a/PowerDns.hs b/PowerDns.hs
index c465a16..61fdc21 100644
--- a/PowerDns.hs
+++ b/PowerDns.hs
@@ -3,6 +3,7 @@ module PowerDns ( RRType(..)
                 , pdnsParse
                 , pdnsReport
                 , pdnsOut
+                , pdnsOutXfr
                 ) where
 
 import NmcDom
@@ -16,17 +17,20 @@ data RRType = RRTypeSRV   | RRTypeA   | RRTypeAAAA | RRTypeCNAME
 data PdnsRequest = PdnsRequestQ
                    { qName              :: String
                    , qType              :: RRType
-                   , iD                 :: String
+                   , iD                 :: Int
                    , remoteIpAddress    :: String
                    , localIpAddress     :: Maybe String
                    , ednsSubnetAddress  :: Maybe String
                    }
-                 | PdnsRequestAXFR String
+                 | PdnsRequestAXFR Int
                  | PdnsRequestPing
         deriving (Show)
 
 pdnsParse ver s =
   let
+    getInt s = case reads s :: [(Int, String)] of
+      [(x, _)] -> x
+      _        -> -1
     getQt qt = case qt of
       "SRV"     -> RRTypeSRV   
       "A"       -> RRTypeA
@@ -54,11 +58,11 @@ pdnsParse ver s =
   in
     case words s of
       "PING":[]                 -> Right PdnsRequestPing
-      "AXFR":x:[]               -> Right (PdnsRequestAXFR x)
+      "AXFR":x:[]               -> Right (PdnsRequestAXFR (getInt x))
       "Q":qn:"IN":qt:id:rip:xs  -> Right (PdnsRequestQ
                                             { qName = qn
                                             , qType = getQt qt
-                                            , iD = id
+                                            , iD = getInt id
                                             , remoteIpAddress = rip
                                             , localIpAddress = getLIp ver xs
                                             , ednsSubnetAddress = getRIp ver xs
@@ -69,14 +73,14 @@ pdnsReport :: String -> String
 pdnsReport err =
   "LOG\tError: " ++ err ++ "\nFAIL\n"
 
-pdnsOut :: Int -> String -> String -> RRType -> Either String NmcDom -> String
+pdnsOut :: Int -> Int -> String -> RRType -> Either String NmcDom -> String
 pdnsOut ver id name rrtype edom = case edom of
   Left  err -> pdnsReport $ err ++ " in a query for " ++ name
   Right dom -> foldr addLine "END\n" $ n2p rrtype
     where
       addLine (nm, ty, dt) accum =
         "DATA\t" ++ v3ext ++ nm ++ "\tIN\t" ++ ty ++ "\t" ++ ttl ++
-            "\t" ++ id ++ "\t" ++ dt ++ "\n" ++ accum
+            "\t" ++ (show id) ++ "\t" ++ dt ++ "\n" ++ accum
       v3ext = case ver of
         3 -> "0\t1\t"
         _ -> ""
@@ -85,29 +89,41 @@ pdnsOut ver id name rrtype edom = case edom of
       n2p RRTypeANY   =
         foldr (\r accum -> (n2p r) ++ accum) []
           [RRTypeSRV, RRTypeA, RRTypeAAAA, RRTypeCNAME, RRTypeDNAME,
-           RRTypeSOA, RRTypeRP, RRTypeLOC, RRTypeNS, RRTypeDS, RRTypeMX]
-      n2p RRTypeSRV   = makesrv  "SRV"   $ domService dom
+           RRTypeRP, RRTypeLOC, RRTypeNS, RRTypeDS, RRTypeMX]
+      n2p RRTypeSRV   = mapto    "SRV"   $ domSrv dom
       n2p RRTypeMX    = mapto    "MX"    $ domMx dom
       n2p RRTypeA     = mapto    "A"     $ domIp dom
       n2p RRTypeAAAA  = mapto    "AAAA"  $ domIp6 dom
       n2p RRTypeCNAME = takejust "CNAME" $ domAlias dom
       n2p RRTypeDNAME = takejust "DNAME" $ domTranslate dom
       n2p RRTypeSOA   = -- FIXME generate only for top domain
+                        -- FIXME make realistic version field
+                        -- FIXME make realistic nameserver field
         if dom == emptyNmcDom then []
-        else
-          let
+        else [(name, "SOA", "ns " ++ email ++ " 99999 10800 3600 604800 86400")]
+          where
             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")]
-      n2p RRTypeRP    = [] --FIXME
+              Just addr -> dotmail addr
+      n2p RRTypeRP    = case domEmail dom of
+        Nothing   -> []
+        Just addr -> [(name, "RP", (dotmail addr) ++ " .")]
       n2p RRTypeLOC   = takejust "LOC"  $ domLoc dom
       n2p RRTypeNS    = mapto    "NS"   $ domNs dom
-      n2p RRTypeDS    = [] --FIXME
+      n2p RRTypeDS    = case domDs dom of
+        Nothing  -> []
+        Just dss -> map (\x -> (name, "DS", dsStr x)) dss
+          where
+            dsStr x = (show (dsKeyTag x)) ++ " "
+                   ++ (show (dsAlgo x)) ++ " "
+                   ++ (show (dsHashType x)) ++ " "
+                   ++ (dsHashValue x)
+
+      dotmail addr = 
+        let (aname, adom) = break (== '@') addr
+        in case adom of
+          "" -> aname
+          _  -> aname ++ "." ++ (tail adom)
       
       mapto    rrstr maybel   = case maybel of
         Nothing  -> []
@@ -115,11 +131,8 @@ pdnsOut ver id name rrtype edom = case edom of
       takejust rrstr maybestr = case maybestr of
         Nothing  -> []
         Just str -> [(name, rrstr, str)]
-      makesrv  rrstr mayberl  = case mayberl of
-        Nothing  -> []
-        Just srl  -> map (\x -> (name, rrstr, fmtsrv x)) srl
-          where
-            fmtsrv rl = (show (srvPrio rl)) ++ " "
-                      ++ (show (srvWeight rl)) ++ " "
-                      ++ (show (srvPort rl)) ++ " "
-                      ++ (srvHost rl)
+
+pdnsOutXfr :: Int -> Int -> String -> Either String NmcDom -> String
+pdnsOutXfr ver id name edom = case edom of
+  Left  err -> pdnsReport $ err ++ " in a query for " ++ name
+  Right dom -> pdnsReport $ "AXFR unsupported in a query for " ++ name