import Data.Text.Lazy (splitOn, pack)
import Data.Map.Lazy (foldrWithKey)
+import Data.Default.Class (def)
import NmcDom
data RRType = RRTypeSRV | RRTypeA | RRTypeAAAA | RRTypeCNAME
| RRTypeDNAME | RRTypeSOA | RRTypeRP | RRTypeLOC
- | RRTypeNS | RRTypeDS | RRTypeMX
+ | RRTypeNS | RRTypeDS | RRTypeMX | RRTypeTLSA
| RRTypeANY | RRTypeError String
instance Show RRType where
show RRTypeNS = "NS"
show RRTypeDS = "DS"
show RRTypeMX = "MX"
+ show RRTypeTLSA = "TLSA"
show RRTypeANY = "ANY"
show (RRTypeError s) = "Unknown RR type: " ++ (show s)
"NS" -> RRTypeNS
"DS" -> RRTypeDS
"MX" -> RRTypeMX
+ "TLSA" -> RRTypeTLSA
"ANY" -> RRTypeANY
_ -> RRTypeError qt
, localIpAddress :: Maybe String
, ednsSubnetAddress :: Maybe String
}
- | PdnsRequestAXFR Int
+ | PdnsRequestAXFR Int (Maybe String)
| PdnsRequestPing
deriving (Show)
in
case words s of
"PING":[] -> Right PdnsRequestPing
- "AXFR":x:[] -> Right (PdnsRequestAXFR (getInt x))
+ "AXFR":x:xs ->
+ if ver < 4 then
+ case xs of
+ [] -> Right $ (PdnsRequestAXFR (getInt x)) Nothing
+ _ -> Left $ "Extra arguments in AXFR (v 1-3): " ++ s
+ else
+ case xs of
+ [z] -> Right $ (PdnsRequestAXFR (getInt x)) (Just z)
+ _ -> Left $ "Wrong arguments in AXFR (v 4+): " ++ s
"Q":qn:"IN":qt:id:rip:xs -> case rrType qt of
RRTypeError e ->
Left $ "Unrecognized RR type: " ++ e
pdnsReport err = "LOG\tError: " ++ err ++ "\nFAIL\n"
-- | Produce answer to the Q request
-pdnsOutQ :: Int -> Int -> String -> RRType -> Either String NmcDom -> String
-pdnsOutQ ver id name rrt edom =
+pdnsOutQ :: Int -> Int -> Int -> String -> RRType -> Either String NmcDom -> String
+pdnsOutQ ver id gen name rrt edom =
let
rrl = case rrt of
RRTypeANY -> [ RRTypeSRV, RRTypeA, RRTypeAAAA, RRTypeCNAME
, RRTypeDNAME, RRTypeRP, RRTypeLOC, RRTypeNS
- , RRTypeDS, RRTypeMX -- SOA not included
+ , RRTypeDS, RRTypeMX, RRTypeTLSA -- SOA not included
]
x -> [x]
in
Left err ->
pdnsReport $ err ++ " in the " ++ (show rrt) ++ " query for " ++ name
Right dom ->
- formatDom ver id rrl name dom "END\n"
+ formatDom ver id gen rrl name dom "END\n"
-- | Produce answer to the AXFR request
-pdnsOutXfr :: Int -> Int -> String -> Either String NmcDom -> String
-pdnsOutXfr ver id name edom =
+pdnsOutXfr :: Int -> Int -> Int -> String -> Either String NmcDom -> String
+pdnsOutXfr ver id gen name edom =
let
allrrs = [ RRTypeSRV, RRTypeA, RRTypeAAAA, RRTypeCNAME
, RRTypeDNAME, RRTypeRP, RRTypeLOC, RRTypeNS
- , RRTypeDS, RRTypeMX, RRTypeSOA
+ , RRTypeDS, RRTypeMX, RRTypeTLSA, RRTypeSOA
]
walkDom f acc name dom =
- f name dom $ case domMap dom of
+ f name dom $ case domSubmap dom of
Nothing -> acc
Just dm ->
foldrWithKey (\n d a -> walkDom f a (n ++ "." ++ name) d) acc dm
Left err ->
pdnsReport $ err ++ " in the AXFR request for " ++ name
Right dom ->
- walkDom (formatDom ver id allrrs) "END\n" name dom
+ walkDom (formatDom ver id gen allrrs) "END\n" name dom
-formatDom ver id rrl name dom acc =
- foldr (\x a -> (formatRR ver id name dom x) ++ a) acc rrl
+formatDom ver id gen rrl name dom acc =
+ foldr (\x a -> (formatRR ver id gen name dom x) ++ a) acc rrl
-formatRR ver id name dom rrtype =
+formatRR ver id gen name dom rrtype =
foldr (\x a -> "DATA\t" ++ v3ext ++ name ++ "\tIN\t" ++ (show rrtype)
++ "\t" ++ ttl ++ "\t" ++ (show id) ++ "\t" ++ x ++ "\n" ++ a)
- "" $ dataRR rrtype name dom
+ "" $ dataRR rrtype gen name dom
where
- v3ext = case ver of
- 3 -> "0\t1\t"
- _ -> ""
+ v3ext = if ver >= 3 then "0\t1\t" else ""
ttl = show 3600
-justl accessor _ dom = case accessor dom of
+justl accessor _ _ dom = case accessor dom of
Nothing -> []
Just xs -> xs
-justv accessor _ dom = case accessor dom of
+justv accessor _ _ dom = case accessor dom of
Nothing -> []
Just x -> [x]
"" -> aname ++ "."
_ -> aname ++ "." ++ (tail adom) ++ "."
-dataRR RRTypeSRV = justl domSrv
+dataRR RRTypeSRV = \ _ _ dom ->
+ case domSrv dom of
+ Nothing -> []
+ Just srvs -> map srvStr srvs
+ where
+ srvStr x = (show (srvPrio x)) ++ "\t"
+ ++ (show (srvWeight x)) ++ " "
+ ++ (show (srvPort x)) ++ " "
+ ++ (srvHost x)
+
dataRR RRTypeMX = justl domMx
+dataRR RRTypeTLSA = \ _ _ dom ->
+ case domTlsa dom of
+ Nothing -> []
+ Just tlsas -> map tlsaStr tlsas
+ where
+ tlsaStr x = "(3 0 "
+ ++ (show (tlsMatchType x)) ++ " "
+ ++ (tlsMatchValue x) ++ ")"
+ -- tlsIncSubdoms is not displayed, it is used for `propagate`.
+
dataRR RRTypeA = justl domIp
dataRR RRTypeAAAA = justl domIp6
dataRR RRTypeCNAME = justv domAlias
dataRR RRTypeDNAME = justv domTranslate
-dataRR RRTypeSOA = \ name dom -> -- FIXME make realistic version field
+dataRR RRTypeSOA = \ gen name dom ->
let
ns = case domNs dom of
- Just (x:_) -> x -- FIXME Terminate with a dot?
+ Just (x:_) -> x
_ -> "."
email = case domEmail dom of
Nothing -> "hostmaster." ++ name ++ "."
Just addr -> dotmail addr
in
- if dom == emptyNmcDom then []
+ if dom == def then []
else
-- Follows a relatively ugly hack to figure if we are at the top
-- level domain ("something.bit"). Only in such case we provide
-- 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 ++ " 0 10800 3600 604800 86400"]
+ [_,_] -> [ns ++ " " ++ email ++ " " ++ (show gen)
+ ++ " 10800 3600 604800 86400"]
_ -> []
-dataRR RRTypeRP = \ _ dom ->
+dataRR RRTypeRP = \ _ _ dom ->
case domEmail dom of
Nothing -> []
Just addr -> [(dotmail addr) ++ " ."]
dataRR RRTypeLOC = justv domLoc
-dataRR RRTypeNS = justl domNs -- FIXME Terminate with a dot?
-dataRR RRTypeDS = \ _ dom ->
+dataRR RRTypeNS = justl domNs
+dataRR RRTypeDS = \ _ _ dom ->
case domDs dom of
Nothing -> []
Just dss -> map dsStr dss
++ (show (dsHashType x)) ++ " "
++ (dsHashValue x)
-- This only comes into play when data arrived _not_ from a PDNS request:
-dataRR (RRTypeError e) = \ _ _ ->
+dataRR (RRTypeError e) = \ _ _ _ ->
["; No data for bad request type " ++ e]
projects / pdns-pipe-nmc.git / blobdiff