X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=e57959e460e964d9beec7f09995dd40d5f84aae0;hb=18a81546e7c4ad10574918efb08b2e104e911d73;hp=b2fc64b5eb71a441226f7772b2ed8e591afb9ca3;hpb=e8b41784eaa68049f7a7354916c9c9920050db70;p=hath.git diff --git a/src/Main.hs b/src/Main.hs index b2fc64b..e57959e 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -1,11 +1,18 @@ -import Data.List ((\\), intercalate, intersperse) +import Control.Concurrent.ParallelIO.Global ( + parallel, + stopGlobalPool ) +import Control.Monad (unless, when) +import qualified Data.ByteString.Char8 as BS (intercalate, pack, unpack) +import Data.List ((\\), intercalate) import Data.Maybe (catMaybes, isNothing) -import System.Exit (ExitCode(..), exitWith) +import Data.String.Utils (splitWs) +import System.Exit (ExitCode(..), exitSuccess, exitWith) import System.IO (stderr, hPutStrLn) import Cidr (Cidr(..), cidr_from_string, combine_all, + enumerate, max_octet1, max_octet2, max_octet3, @@ -21,39 +28,33 @@ import CommandLine (help_set, Mode(..), parse_errors, parse_mode) - -import Octet - --- Some exit codes, used in the ExitFailure constructor. -exit_invalid_cidr :: Int -exit_invalid_cidr = 1 -exit_args_parse_failed :: Int -exit_args_parse_failed = 2 +import DNS (Domain, lookup_ptrs) +import ExitCodes ( exit_args_parse_failed, exit_invalid_cidr ) +import Octet () --- A regular expression that matches a non-address character. +-- | A regular expression that matches a non-address character. non_addr_char :: String non_addr_char = "[^\\.0-9]" --- Add non_addr_chars on either side of the given String. This --- prevents (for example) the regex '127.0.0.1' from matching --- '127.0.0.100'. +-- | Add non_addr_chars on either side of the given String. This +-- prevents (for example) the regex '127.0.0.1' from matching +-- '127.0.0.100'. addr_barrier :: String -> String addr_barrier x = non_addr_char ++ x ++ non_addr_char --- The magic happens here. We take a CIDR String as an argument, and --- return the equivalent regular expression. We do this as follows: +-- | The magic happens here. We take a CIDR String as an argument, and +-- return the equivalent regular expression. We do this as follows: -- --- 1. Compute the minimum possible value of each octet. --- 2. Compute the maximum possible value of each octet. --- 3. Generate a regex matching every value between those min and --- max values. --- 4. Join the regexes from step 3 with regexes matching periods. --- 5. Stick an address boundary on either side of the result. ---cidr_to_regex :: String -> String +-- 1. Compute the minimum possible value of each octet. +-- 2. Compute the maximum possible value of each octet. +-- 3. Generate a regex matching every value between those min and +-- max values. +-- 4. Join the regexes from step 3 with regexes matching periods. +-- 5. Stick an address boundary on either side of the result. cidr_to_regex :: Cidr.Cidr -> String cidr_to_regex cidr = addr_barrier (intercalate "\\." [range1, range2, range3, range4]) @@ -62,25 +63,25 @@ cidr_to_regex cidr = range2 = numeric_range min2 max2 range3 = numeric_range min3 max3 range4 = numeric_range min4 max4 - min1 = octet_to_int (min_octet1 cidr) - min2 = octet_to_int (min_octet2 cidr) - min3 = octet_to_int (min_octet3 cidr) - min4 = octet_to_int (min_octet4 cidr) - max1 = octet_to_int (max_octet1 cidr) - max2 = octet_to_int (max_octet2 cidr) - max3 = octet_to_int (max_octet3 cidr) - max4 = octet_to_int (max_octet4 cidr) + min1 = fromEnum (min_octet1 cidr) + min2 = fromEnum (min_octet2 cidr) + min3 = fromEnum (min_octet3 cidr) + min4 = fromEnum (min_octet4 cidr) + max1 = fromEnum (max_octet1 cidr) + max2 = fromEnum (max_octet2 cidr) + max3 = fromEnum (max_octet3 cidr) + max4 = fromEnum (max_octet4 cidr) --- Take a list of Strings, and return a regular expression matching --- any of them. +-- | Take a list of Strings, and return a regular expression matching +-- any of them. alternate :: [String] -> String -alternate terms = "(" ++ (concat (intersperse "|" terms)) ++ ")" +alternate terms = "(" ++ (intercalate "|" terms) ++ ")" --- Take two Ints as parameters, and return a regex matching any --- integer between them (inclusive). +-- | Take two Ints as parameters, and return a regex matching any +-- integer between them (inclusive). numeric_range :: Int -> Int -> String numeric_range x y = alternate (map show [lower..upper]) @@ -94,34 +95,28 @@ main = do -- First, check for any errors that occurred while parsing -- the command line options. errors <- CommandLine.parse_errors - if not (null errors) - then do - hPutStrLn stderr (concat errors) - putStrLn CommandLine.help_text - exitWith (ExitFailure exit_args_parse_failed) - else do -- Nothing + unless (null errors) $ do + hPutStrLn stderr (concat errors) + putStrLn CommandLine.help_text + exitWith (ExitFailure exit_args_parse_failed) -- Next, check to see if the 'help' option was passed to the -- program. If it was, display the help, and exit successfully. help_opt_set <- CommandLine.help_set - if help_opt_set - then do - putStrLn CommandLine.help_text - exitWith ExitSuccess - else do -- Nothing + when help_opt_set $ do + putStrLn CommandLine.help_text + exitSuccess -- The input function we receive here should know what to read. inputfunc <- (CommandLine.input_function) input <- inputfunc - let cidr_strings = lines input + let cidr_strings = splitWs input let cidrs = map cidr_from_string cidr_strings - if (any isNothing cidrs) - then do - putStrLn "Error: not valid CIDR notation." - exitWith (ExitFailure exit_invalid_cidr) - else do -- Nothing + when (any isNothing cidrs) $ do + putStrLn "Error: not valid CIDR notation." + exitWith (ExitFailure exit_invalid_cidr) -- Filter out only the valid ones. let valid_cidrs = catMaybes cidrs @@ -133,20 +128,42 @@ main = do Regex -> do let regexes = map cidr_to_regex valid_cidrs putStrLn $ alternate regexes - Reduce -> do - _ <- mapM (putStrLn . show) (combine_all valid_cidrs) - return () - Dupe -> do - _ <- mapM (putStrLn . show) dupes - return () + Reduce -> + mapM_ print (combine_all valid_cidrs) + Dupe -> + mapM_ print dupes where dupes = valid_cidrs \\ (combine_all valid_cidrs) Diff -> do - _ <- mapM putStrLn deletions - _ <- mapM putStrLn additions - return () + mapM_ putStrLn deletions + mapM_ putStrLn additions where dupes = valid_cidrs \\ (combine_all valid_cidrs) - deletions = map (\s -> "-" ++ (show s)) dupes + deletions = map (\s -> '-' : (show s)) dupes newcidrs = (combine_all valid_cidrs) \\ valid_cidrs - additions = map (\s -> "+" ++ (show s)) newcidrs + additions = map (\s -> '+' : (show s)) newcidrs + List -> do + let combined_cidrs = combine_all valid_cidrs + let addrs = concatMap enumerate combined_cidrs + mapM_ print addrs + Reverse -> do + let combined_cidrs = combine_all valid_cidrs + let addrs = concatMap enumerate combined_cidrs + let addr_bytestrings = map (BS.pack . show) addrs + ptrs <- lookup_ptrs addr_bytestrings + let pairs = zip addr_bytestrings ptrs + _ <- parallel (map (putStrLn . show_pair) pairs) + return () + + stopGlobalPool + + where + show_pair :: (Domain, Maybe [Domain]) -> String + show_pair (s, mds) = + (BS.unpack s) ++ ": " ++ results + where + space = BS.pack " " + results = + case mds of + Nothing -> "" + Just ds -> BS.unpack $ BS.intercalate space ds