Scrap the plan to verify valid proto/port

[pdns-pipe-nmc.git] / NmcDom.hs

diff --git a/NmcDom.hs b/NmcDom.hs
index 8bfb6f358bde32dbcf037ee59b77f97c978f904e..505c5436cfccd4de417f2ae77fca3bb583727639 100644 (file)
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -18,7 +18,7 @@ import Data.Vector ((!), length)
 import qualified Data.Vector as V (singleton)
 import Data.Map (Map, unionWith, foldrWithKey)
 import qualified Data.Map as M (singleton, empty, insert, insertWith)
-import qualified Data.HashMap.Strict as H (lookup)
+import qualified Data.HashMap.Strict as H (lookup, foldrWithKey)
 import Data.Aeson
 import Data.Aeson.Types
 import Data.Default.Class
@@ -78,21 +78,16 @@ takeMap :: Object -> Parser (Maybe (Map String NmcDom))
 takeMap o =
   case H.lookup "map" o of
     Nothing          -> pure Nothing
-    Just (Object mo) -> do
-      raw <- (parseJSON (Object mo) :: Parser (Maybe (Map String NmcDom)))
-      let result = fmap splitup raw
-      return result
-        where
-          splitup :: Map String NmcDom -> Map String NmcDom
-          splitup x = foldrWithKey stow M.empty x
-          stow fqdn sdom acc = M.insertWith merge fqdn' sdom' acc
-            where
-              (fqdn', sdom') = nest (filter (/= "") (splitOnDots fqdn), sdom)
-              splitOnDots s  = splitOn "." s
-              nest ([], v)   = (fqdn, v) -- preserve "self" map entry
-              nest ([k], v)  = (k, v)
-              nest (k:ks, v) =
-                nest (ks, def { domSubmap = Just (M.singleton k v) })
+    Just (Object mo) -> H.foldrWithKey addmapentry (pure (Just M.empty)) mo
+      where
+        addmapentry "" v acc = parseJSON v >>= inject acc ""
+        addmapentry k  v acc = nest (splitOn "." (unpack k)) v acc
+        nest []     v acc = empty -- does not happen as a result of splitOn
+        nest [""]   v acc = empty -- empty element of fqdn forbidden
+        nest [d]    v acc = parseJSON v >>= inject acc d
+        nest (d:ds) v acc =
+          nest ds v acc >>= (inject acc d) . (\r -> def { domSubmap = r })
+        inject acc d r = (fmap.fmap) (M.insertWith merge d r) acc
     _ -> empty
 
 takeSrv :: Object -> Parser (Maybe (Map String NmcDom))
@@ -125,7 +120,6 @@ takeTls o =
           where
             tmap2dmap :: Map String (Map String [NmcRRTlsa])
                       -> Parser (Maybe (Map String NmcDom))
-                -- FIXME return parse error on invalid proto or port
             tmap2dmap m1 = return $ foldrWithKey addprotoelem (Just M.empty) m1
             addprotoelem k1 m2 acc = protoelem k1 m2 `merge` acc
             protoelem k1 m2 = Just (M.singleton ("_" ++ k1) (pmap2dmap m2))
@@ -187,7 +181,7 @@ instance Mergeable NmcRRI2p where
 data NmcRRTlsa = NmcRRTlsa
                         { tlsMatchType  :: Int -- 0:exact 1:sha256 2:sha512
                         , tlsMatchValue :: String
-                        , tlsIncSubdoms :: Int -- 1:enforce on subdoms 0:no
+                        , tlsIncSubdoms :: Bool -- enforce on subdoms?
                         } deriving (Show, Eq)
 
 instance FromJSON NmcRRTlsa where
@@ -195,7 +189,10 @@ instance FromJSON NmcRRTlsa where
                 if length a == 3 then NmcRRTlsa
                         <$> parseJSON (a ! 0)
                         <*> parseJSON (a ! 1)
-                        <*> parseJSON (a ! 2)
+                        <*> case (a ! 2) of
+                              Number 0 -> return False
+                              Number 1 -> return True
+                              _        -> empty
                 else empty
         parseJSON _ = empty