Support hostnames as --server arguments.

[haeredes.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index d425734c275404e24310edb650ac33c9b4fe0b67..4aa0c326de6f5ebbc81bd371a1c46c31dac10bd0 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -4,42 +4,50 @@ where
 import Control.Concurrent.ParallelIO.Global (
   parallel,
   stopGlobalPool )
 import Control.Concurrent.ParallelIO.Global (
   parallel,
   stopGlobalPool )

+import Control.Monad (unless)

 import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
   words )
 import Data.List ((\\))
 import Data.String.Utils (join)
 import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
   words )
 import Data.List ((\\))
 import Data.String.Utils (join)

-

 import Network.DNS (
   Domain,
   FileOrNumericHost(RCHostName),
   ResolvConf(resolvInfo),
   defaultResolvConf,
 import Network.DNS (
   Domain,
   FileOrNumericHost(RCHostName),
   ResolvConf(resolvInfo),
   defaultResolvConf,

-  lookupNS,

   makeResolvSeed,
   withResolver )
   makeResolvSeed,
   withResolver )

+import System.Exit (ExitCode(..), exitWith)
+import System.IO (hPutStrLn, stderr)
+

 
 import CommandLine (Args(..), get_args)
 
 import CommandLine (Args(..), get_args)

-import DNS (normalize)
+import DNS (
+  LookupResult,
+  lookupMX',
+  lookupNS',
+  normalize,
+  resolve_address )
+import ExitCodes (exit_bad_server)

 
 report :: (Domain, Maybe [Domain]) -> IO ()
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =
 
 report :: (Domain, Maybe [Domain]) -> IO ()
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =

-  if null leftovers
-  then return ()
-  else putStrLn $ "Domain " ++
-                  (show d) ++
-                  " delegates somewhere else: " ++
-                  (join " " (map show leftovers))
+  unless (null leftovers) $
+    putStrLn $ "Domain " ++
+               (show d) ++
+               " delegates somewhere else: " ++
+               (join " " (map show leftovers))

 
 clean :: [Domain] -- ^ List of delegates, @ds@
 
 clean :: [Domain] -- ^ List of delegates, @ds@

-      -> (Domain, Maybe [Domain]) -- ^ Pairs of (domain name, lookup result)
-      -> (Domain, Maybe [Domain])
+      -> LookupResult
+      -> LookupResult

 clean _ p@(_, Nothing) = p
 clean _ p@(_, Nothing) = p

-clean ds (d, Just targets) =
-  (d, Just $ targets \\ ds)
+clean delgts (d, Just targets) =
+  (d, Just $ targets \\ delgts)
+

 
 
 main :: IO ()
 
 
 main :: IO ()


@@ -59,25 +67,29 @@ main = do
   let nrml_domains   = map normalize raw_domains
   let nrml_delegates = map normalize raw_delegates
 
   let nrml_domains   = map normalize raw_domains
   let nrml_delegates = map normalize raw_delegates
 

-  let rc = case (server cfg) of
-             Nothing -> defaultResolvConf
-             Just s -> defaultResolvConf { resolvInfo = RCHostName s }
+  rc <- case (server cfg) of
+          Nothing -> return defaultResolvConf
+          Just s -> do
+            s' <- resolve_address s
+            case s' of
+              Nothing -> do
+                hPutStrLn stderr ("Bad DNS server or lookup error: " ++ s)
+                exitWith (ExitFailure exit_bad_server)
+              Just s'' ->
+                return $ defaultResolvConf { resolvInfo =
+                                               RCHostName (show s'') }

 
   rs <- makeResolvSeed rc
 
   rs <- makeResolvSeed rc

-  withResolver rs $ \resolver -> do
-    -- This function keeps the domain matches with its NS records.
-    let lookupNS' = \d -> (lookupNS resolver d) >>= (return . ((,) d))
-
-    -- Bad stuff happens if we try to run these lookups in parallel
-    -- instead of the reports.
-    domains_ns <- mapM lookupNS' nrml_domains
-    let cdns = map (clean nrml_delegates) domains_ns
-
-    _ <- case cfg of
-           (NS _ _) ->
-             -- We're only checking NS records, so report what we found.
-             parallel (map report cdns)
-           (MX _ _) ->
-             return [()]
-
-    stopGlobalPool
+
+  let lookup_function = case cfg of
+                          (NS _ _) -> lookupNS'
+                          (MX _ _) -> lookupMX'
+
+  _ <- withResolver rs $ \resolver -> do
+         -- Bad stuff happens if we try to run these lookups in parallel
+         -- instead of the reports.
+         records <- mapM (lookup_function resolver) nrml_domains
+         let cleaned_records = map (clean nrml_delegates) records
+         parallel (map report cleaned_records)
+
+  stopGlobalPool