X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=PowerDns.hs;h=0b05386f13058a992a827553566f0e99665a379e;hp=0e8be9fe0d20a2522c747e5d8c845b3848aefc9f;hb=ac3600bf0b71ef29110e644f79812a117a9480b2;hpb=16e20fe34fe4a0e43423c94640ed50469689dce0

diff --git a/PowerDns.hs b/PowerDns.hs
index 0e8be9f..0b05386 100644
--- a/PowerDns.hs
+++ b/PowerDns.hs
@@ -3,11 +3,12 @@ module PowerDns ( RRType(..)
                 , PdnsRequest(..)
                 , pdnsParse
                 , pdnsReport
-                , pdnsOut
+                , pdnsOutQ
                 , pdnsOutXfr
                 ) where
 
 import Data.Text.Lazy (splitOn, pack)
+import Data.Map.Lazy (foldrWithKey)
 
 import NmcDom
 
@@ -64,7 +65,7 @@ pdnsParse ver s =
   let
     getInt s = case reads s :: [(Int, String)] of
       [(x, _)] -> x
-      _        -> -1
+      _        -> (-1)
     getLIp ver xs
       | ver >= 2  = case xs of
                       x:_       -> Just x
@@ -81,7 +82,7 @@ pdnsParse ver s =
       "AXFR":x:[]               -> Right (PdnsRequestAXFR (getInt x))
       "Q":qn:"IN":qt:id:rip:xs  -> case rrType qt of
                                      RRTypeError e ->
-                                       Left $ "PDNS Request: " ++ e
+                                       Left $ "Unrecognized RR type: " ++ e
                                      rt ->
                                        Right (PdnsRequestQ
                                             { qName = qn
@@ -98,24 +99,48 @@ pdnsReport :: String -> String
 pdnsReport err = "LOG\tError: " ++ err ++ "\nFAIL\n"
 
 -- | Produce answer to the Q request
-pdnsOut :: Int -> Int -> String -> RRType -> Either String NmcDom -> String
-pdnsOut ver id name rrtype edom = case edom of
-  Left  err ->
-    pdnsReport $ err ++ " in a " ++ (show rrtype) ++ "query for " ++ name
-  Right dom ->
-    case rrtype of
-      RRTypeANY -> foldr (\x a -> (formatRR ver id name dom x) ++ a) "END\n"
-          [RRTypeSRV, RRTypeA, RRTypeAAAA, RRTypeCNAME, RRTypeDNAME,
-           RRTypeRP, RRTypeLOC, RRTypeNS, RRTypeDS, RRTypeMX]
-      _         -> (formatRR ver id name dom rrtype) ++ "END\n"
+pdnsOutQ :: Int -> Int -> String -> RRType -> Either String NmcDom -> String
+pdnsOutQ ver id name rrt edom =
+  let
+    rrl = case rrt of
+      RRTypeANY -> [ RRTypeSRV, RRTypeA, RRTypeAAAA, RRTypeCNAME
+                   , RRTypeDNAME, RRTypeRP, RRTypeLOC, RRTypeNS
+                   , RRTypeDS, RRTypeMX -- SOA not included
+                   ]
+      x         -> [x]
+  in
+    case edom of
+      Left  err ->
+        pdnsReport $ err ++ " in the " ++ (show rrt) ++ " query for " ++ name
+      Right dom ->
+        formatDom ver id rrl name dom "END\n"
 
 -- | Produce answer to the AXFR request
 pdnsOutXfr :: Int -> Int -> String -> Either String NmcDom -> String
-pdnsOutXfr ver id name edom = "" -- FIXME
+pdnsOutXfr ver id name edom =
+  let
+    allrrs = [ RRTypeSRV, RRTypeA, RRTypeAAAA, RRTypeCNAME
+             , RRTypeDNAME, RRTypeRP, RRTypeLOC, RRTypeNS
+             , RRTypeDS, RRTypeMX, RRTypeSOA
+             ]
+    walkDom f acc name dom =
+      f name dom $ case domMap dom of
+        Nothing -> acc
+        Just dm ->
+          foldrWithKey (\n d a -> walkDom f a (n ++ "." ++ name) d) acc dm
+  in
+    case edom of
+      Left  err ->
+        pdnsReport $ err ++ " in the AXFR request for " ++ name
+      Right dom ->
+        walkDom (formatDom ver id allrrs) "END\n" name dom
+
+formatDom ver id rrl name dom acc =
+  foldr (\x a -> (formatRR ver id name dom x) ++ a) acc rrl
 
 formatRR ver id name dom rrtype =
   foldr (\x a -> "DATA\t" ++ v3ext ++ name ++ "\tIN\t" ++ (show rrtype)
-            ++ "\t" ++ ttl ++ "\t" ++ (show id) ++ "\t" ++ x ++ "\n" ++ a)
+              ++ "\t" ++ ttl ++ "\t" ++ (show id) ++ "\t" ++ x ++ "\n" ++ a)
         "" $ dataRR rrtype name dom
     where
       v3ext = case ver of
@@ -160,7 +185,7 @@ dataRR RRTypeSOA   = \ name dom -> -- FIXME make realistic version field
     -- Alternative would be to carry "top-ness" as a parameter through
     -- all the calls from the very top where we split the fqdn.
       case splitOn (pack ".") (pack name) of
-        [_,_] -> [ns ++ " " ++ email ++ " 99999 10800 3600 604800 86400"]
+        [_,_] -> [ns ++ " " ++ email ++ " 0 10800 3600 604800 86400"]
         _     -> []
 dataRR RRTypeRP    = \ _ dom ->
   case domEmail dom of