X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcDom.hs;h=db600304df2a38a55bef100676ee969712bb26fe;hp=9edb79879f0e5cb3f469a27d95ee29ae5563106e;hb=414c9f928e12e0c240d55d79ff8360adc6b4d138;hpb=f0b5926d1268770bbcbcb8af7036238ae066d400 diff --git a/NmcDom.hs b/NmcDom.hs index 9edb798..db60030 100644 --- a/NmcDom.hs +++ b/NmcDom.hs @@ -1,53 +1,182 @@ {-# LANGUAGE OverloadedStrings #-} module NmcDom ( NmcDom(..) - , emptyNmcDom - , descendNmcDom - , mergeImport + , NmcRRSrv(..) + , NmcRRI2p(..) + , NmcRRTlsa(..) + , NmcRRDs(..) + , merge ) where -import Data.ByteString.Lazy (ByteString) -import qualified Data.Text as T (unpack) -import Data.List.Split +import Prelude hiding (length) +import Control.Applicative ((<$>), (<*>), empty, pure) import Data.Char -import Data.Map as M (Map, lookup) -import Control.Applicative ((<$>), (<*>), empty) +import Data.Text (Text, unpack) +import Data.List (union) +import Data.List.Split +import Data.Vector ((!), length) +import qualified Data.Vector as V (singleton) +import Data.Map (Map, unionWith) +import qualified Data.Map as M (singleton, empty) +import qualified Data.HashMap.Strict as H (lookup) import Data.Aeson +import Data.Aeson.Types +import Data.Default.Class + +-- Variant of Aeson's `.:?` that interprets a String as a +-- single-element list, so it is possible to have either +-- "ip":["1.2.3.4"] +-- or +-- "ip":"1.2.3.4" +-- with the same result. +(.:/) :: (FromJSON a) => Object -> Text -> Parser (Maybe a) +obj .:/ key = case H.lookup key obj of + Nothing -> pure Nothing + Just v -> case v of + String s -> parseJSON $ Array (V.singleton v) + _ -> parseJSON v + +data IntRRService = IntRRService { isvName :: String + , isvProto :: String + , isvPrio :: Int + , isvWeight :: Int + , isvPort :: Int + , isvHost :: String + } deriving (Show, Eq) + +instance FromJSON IntRRService where + parseJSON (Array a) = + if length a == 6 then IntRRService + <$> parseJSON (a ! 0) + <*> parseJSON (a ! 1) + <*> parseJSON (a ! 2) + <*> parseJSON (a ! 3) + <*> parseJSON (a ! 4) + <*> parseJSON (a ! 5) + else empty + parseJSON _ = empty + +makeMx :: Object -> Parser (Maybe [String]) +makeMx o = + case H.lookup "service" o of + Nothing -> pure Nothing + Just (Array a) -> do + isvl <- parseJSON (Array a) + return $ Just $ map mxStr $ filter mxMatch isvl + where + mxMatch isv = isvName isv == "smtp" + && isvProto isv == "tcp" + && isvPort isv == 25 + mxStr isv = (show (isvPrio isv)) ++ "\t" ++ (isvHost isv) + Just _ -> empty + +makeSubmap :: Object -> Parser (Maybe (Map String NmcDom)) +makeSubmap o = ((.).(.)) merge merge <$> takeTls o <*> takeSrv o <*> takeMap o + +takeMap :: Object -> Parser (Maybe (Map String NmcDom)) +takeMap o = o .:? "map" + +takeSrv :: Object -> Parser (Maybe (Map String NmcDom)) +takeSrv o = + case H.lookup "service" o of + Nothing -> pure Nothing + Just (Array a) -> do + isvl <- parseJSON (Array a) + return $ foldr addSrv (Just M.empty) isvl + where + addSrv isv acc = subm `merge` acc + where + subm = Just (M.singleton ("_" ++ isvProto isv) sub2) + sub2 = def { domSubmap = + Just (M.singleton ("_" ++ isvName isv) sub3) } + sub3 = def { domSrv = Just [ NmcRRSrv (isvPrio isv) + (isvWeight isv) + (isvPort isv) + (isvHost isv) ] } + Just _ -> empty + +-- takeTls is almost, but not quite, entirely unlike takeSrv +takeTls :: Object -> Parser (Maybe (Map String NmcDom)) +takeTls o = o .:? "map" -- FIXME + +class Mergeable a where + merge :: a -> a -> a -- bias towads second arg + +instance (Ord k, Mergeable a) => Mergeable (Map k a) where + merge mx my = unionWith merge my mx + +-- Alas, the following is not possible in Haskell :-( +-- instance Mergeable String where +-- merge _ b = b -data NmcRRService = NmcRRService -- unused - { srvName :: String - , srvProto :: String - , srvW1 :: Int - , srvW2 :: Int +instance Mergeable Value where + merge _ b = b + +instance Mergeable a => Mergeable (Maybe a) where + merge (Just x) (Just y) = Just (merge x y) + merge Nothing (Just y) = Just y + merge (Just x) Nothing = Just x + merge Nothing Nothing = Nothing + +instance Eq a => Mergeable [a] where + merge xs ys = union xs ys + +data NmcRRSrv = NmcRRSrv + { srvPrio :: Int + , srvWeight :: Int , srvPort :: Int - , srvHost :: [String] + , srvHost :: String } deriving (Show, Eq) -instance FromJSON NmcRRService where - parseJSON (Object o) = NmcRRService - <$> o .: "name" - <*> o .: "proto" - <*> o .: "w1" - <*> o .: "w2" - <*> o .: "port" - <*> o .: "host" - parseJSON _ = empty +instance Mergeable NmcRRSrv where + merge _ b = b data NmcRRI2p = NmcRRI2p - { i2pDestination :: String - , i2pName :: String - , i2pB32 :: String + { i2pDestination :: Maybe String + , i2pName :: Maybe String + , i2pB32 :: Maybe String } deriving (Show, Eq) instance FromJSON NmcRRI2p where parseJSON (Object o) = NmcRRI2p - <$> o .: "destination" - <*> o .: "name" - <*> o .: "b32" + <$> o .:? "destination" + <*> o .:? "name" + <*> o .:? "b32" + parseJSON _ = empty + +instance Mergeable NmcRRI2p where + merge _ b = b + +data NmcRRTlsa = NmcRRTlsa + { tlsMatchType :: Int -- 0:exact 1:sha256 2:sha512 + , tlsMatchValue :: String + , tlsIncSubdoms :: Int -- 1:enforce on subdoms 0:no + } deriving (Show, Eq) + +instance Mergeable NmcRRTlsa where + merge _ b = b + +data NmcRRDs = NmcRRDs + { dsKeyTag :: Int + , dsAlgo :: Int + , dsHashType :: Int + , dsHashValue :: String + } deriving (Show, Eq) + +instance FromJSON NmcRRDs where + parseJSON (Array a) = + if length a == 4 then NmcRRDs + <$> parseJSON (a ! 0) + <*> parseJSON (a ! 1) + <*> parseJSON (a ! 2) + <*> parseJSON (a ! 3) + else empty parseJSON _ = empty -data NmcDom = NmcDom { domService :: Maybe [[String]] -- [NmcRRService] - , domIp :: Maybe [String] +instance Mergeable NmcRRDs where + merge _ b = b + +data NmcDom = NmcDom { domIp :: Maybe [String] , domIp6 :: Maybe [String] , domTor :: Maybe String , domI2p :: Maybe NmcRRI2p @@ -58,33 +187,38 @@ data NmcDom = NmcDom { domService :: Maybe [[String]] -- [NmcRRService] , domLoc :: Maybe String , domInfo :: Maybe Value , domNs :: Maybe [String] - , domDelegate :: Maybe [String] - , domImport :: Maybe String - , domMap :: Maybe (Map String NmcDom) + , domDelegate :: Maybe String + , domImport :: Maybe [String] + , domSubmap :: Maybe (Map String NmcDom) , domFingerprint :: Maybe [String] - , domTls :: Maybe (Map String - (Map String [[String]])) - , domDs :: Maybe [[String]] + , domDs :: Maybe [NmcRRDs] + , domMx :: Maybe [String] -- Synthetic + , domSrv :: Maybe [NmcRRSrv] -- Synthetic + , domTlsa :: Maybe [NmcRRTlsa] -- Synthetic } deriving (Show, Eq) +instance Default NmcDom where + def = NmcDom Nothing Nothing Nothing Nothing Nothing Nothing Nothing + Nothing Nothing Nothing Nothing Nothing Nothing Nothing + Nothing Nothing Nothing Nothing Nothing + instance FromJSON NmcDom where -- Wherever we expect a domain object, there may be a string -- containing IPv4 address. Interpret it as such. -- Question: shall we try to recognize IPv6 addresses too? parseJSON (String s) = return $ if isIPv4 s' - then emptyNmcDom { domIp = Just [s'] } - else emptyNmcDom + then def { domIp = Just [s'] } + else def where - s' = T.unpack s + s' = unpack s isIPv4 x = all isNibble $ splitOn "." x isNibble x = if all isDigit x then (read x :: Int) < 256 else False parseJSON (Object o) = NmcDom - <$> o .:? "service" - <*> o .:? "ip" - <*> o .:? "ip6" + <$> o .:/ "ip" + <*> o .:/ "ip6" <*> o .:? "tor" <*> o .:? "i2p" <*> o .:? "freenet" @@ -93,101 +227,43 @@ instance FromJSON NmcDom where <*> o .:? "email" <*> o .:? "loc" <*> o .:? "info" - <*> o .:? "ns" + <*> o .:/ "ns" <*> o .:? "delegate" - <*> o .:? "import" - <*> o .:? "map" - <*> o .:? "fingerprint" - <*> o .:? "tls" + <*> o .:/ "import" + <*> makeSubmap o + <*> o .:/ "fingerprint" <*> o .:? "ds" + <*> makeMx o + <*> return Nothing -- domSrv created in subdomains + <*> return Nothing -- domTlsa created in subdomains parseJSON _ = empty -emptyNmcDom = NmcDom Nothing Nothing Nothing Nothing Nothing Nothing - Nothing Nothing Nothing Nothing Nothing Nothing - Nothing Nothing Nothing Nothing Nothing Nothing - -normalizeDom :: NmcDom -> NmcDom -normalizeDom dom - | domNs dom /= Nothing = emptyNmcDom { domNs = domNs dom - , domEmail = domEmail dom - } - | domDelegate dom /= Nothing = emptyNmcDom -- FIXME - | domTranslate dom /= Nothing = dom { domMap = Nothing } - | otherwise = dom - -descendNmcDom :: [String] -> NmcDom -> NmcDom -descendNmcDom subdom rawdom = - let dom = normalizeDom rawdom - in case subdom of - [] -> - case domMap dom of - Nothing -> dom - Just map -> - case M.lookup "" map of -- Stupid, but there are "" in the map - Nothing -> dom -- Try to merge it with the root data - Just sub -> mergeNmcDom sub dom -- Or maybe drop it altogether... - d:ds -> - case domMap dom of - Nothing -> emptyNmcDom - Just map -> - case M.lookup d map of - Nothing -> emptyNmcDom - Just sub -> descendNmcDom ds sub - --- FIXME -- I hope there exists a better way to merge records! -mergeNmcDom :: NmcDom -> NmcDom -> NmcDom -mergeNmcDom sub dom = dom { domService = choose domService - , domIp = choose domIp - , domIp6 = choose domIp6 - , domTor = choose domTor - , domI2p = choose domI2p - , domFreenet = choose domFreenet - , domAlias = choose domAlias - , domTranslate = choose domTranslate - , domEmail = choose domEmail - , domLoc = choose domLoc - , domInfo = choose domInfo - , domNs = choose domNs - , domDelegate = choose domDelegate - , domImport = choose domImport - , domFingerprint = choose domFingerprint - , domTls = choose domTls - , domDs = choose domDs - } - where - choose :: (NmcDom -> Maybe a) -> Maybe a - choose field = case field dom of - Nothing -> field sub - Just x -> Just x - --- | Perform query and return error string or parsed domain object -queryNmcDom :: - (String -> IO (Either String ByteString)) -- ^ query operation action - -> String -- ^ key - -> IO (Either String NmcDom) -- ^ error string or domain -queryNmcDom queryOp key = do - l <- queryOp key - case l of - Left estr -> return $ Left estr - Right str -> case decode str :: Maybe NmcDom of - Nothing -> return $ Left $ "Unparseable value: " ++ (show str) - Just dom -> return $ Right dom - --- | Try to fetch "import" object and merge it into the base domain --- In case of errors they are ignored, and nothing is merged. --- Original "import" element is removed, but new imports from the --- imported objects are processed recursively until there are none. -mergeImport :: - (String -> IO (Either String ByteString)) -- ^ query operation action - -> NmcDom -- ^ base domain - -> IO NmcDom -- ^ result with merged import -mergeImport queryOp base = do - let base' = base {domImport = Nothing} - -- print base' - case domImport base of - Nothing -> return base' - Just key -> do - sub <- queryNmcDom queryOp key - case sub of - Left e -> return base' - Right sub' -> mergeImport queryOp $ sub' `mergeNmcDom` base' +instance Mergeable NmcDom where + merge sub dom = dom { domIp = mergelm domIp + , domIp6 = mergelm domIp6 + , domTor = choose domTor + , domI2p = mergelm domI2p + , domFreenet = choose domFreenet + , domAlias = choose domAlias + , domTranslate = choose domTranslate + , domEmail = choose domEmail + , domLoc = choose domLoc + , domInfo = mergelm domInfo + , domNs = mergelm domNs + , domDelegate = mergelm domDelegate + , domImport = mergelm domImport + , domSubmap = mergelm domSubmap + , domFingerprint = mergelm domFingerprint + , domDs = mergelm domDs + , domMx = mergelm domMx + , domSrv = mergelm domSrv + , domTlsa = mergelm domTlsa + } + where + mergelm x = merge (x sub) (x dom) +-- Because it is not possible to define instance of merge for Strings, +-- we have to treat string elements separately, otherwise strings are +-- 'unioned' along with the rest of lists. Ugly, but alternatives are worse. + choose field = case field dom of + Nothing -> field sub + Just x -> Just x