module Cidr
( Cidr(..),
cidr_from_string,
- combine_all
+ cidr_tests,
+ combine_all,
+ contains,
+ contains_proper,
+ max_octet1,
+ max_octet2,
+ max_octet3,
+ max_octet4,
+ min_octet1,
+ min_octet2,
+ min_octet3,
+ min_octet4,
+ prop_all_cidrs_contain_themselves,
+ prop_contains_proper_intransitive
) where
+import Data.List (nubBy)
+import Test.HUnit
+import Test.QuickCheck
+
+import qualified Bit as B
import IPv4Address
import ListUtils
import Maskable
show cidr = (show (ipv4address cidr)) ++ "/" ++ (show (maskbits cidr))
+instance Arbitrary Cidr where
+ arbitrary = do
+ ipv4 <- arbitrary :: Gen IPv4Address
+ mask <- arbitrary :: Gen Maskbits
+ return (Cidr ipv4 mask)
+
+ coarbitrary _ = variant 0
+
+
+-- Two CIDR ranges are equivalent if they have the same network bits
+-- and the masks are the same.
+equivalent :: Cidr -> Cidr -> Bool
+equivalent Cidr.None Cidr.None = True
+equivalent Cidr.None _ = False
+equivalent _ Cidr.None = False
+equivalent (Cidr addr1 mbits1) (Cidr addr2 mbits2) =
+ (mbits1 == mbits2) && ((apply_mask addr1 mbits1 B.Zero) == (apply_mask addr2 mbits2 B.Zero))
+
-- Returns the mask portion of a CIDR address. That is, everything
-- after the trailing slash.
maskbits_from_cidr_string :: String -> Maskbits
+min_host :: Cidr -> IPv4Address
+min_host Cidr.None = IPv4Address.None
+min_host (Cidr IPv4Address.None _) = IPv4Address.None
+min_host (Cidr _ Maskbits.None) = IPv4Address.None
+min_host (Cidr addr mask) = apply_mask addr mask B.Zero
+
+
+max_host :: Cidr -> IPv4Address
+max_host Cidr.None = IPv4Address.None
+max_host (Cidr IPv4Address.None _) = IPv4Address.None
+max_host (Cidr _ Maskbits.None) = IPv4Address.None
+max_host (Cidr addr mask) = apply_mask addr mask B.One
+
+
+min_octet1 :: Cidr -> Octet
+min_octet1 cidr = octet1 (min_host cidr)
+
+min_octet2 :: Cidr -> Octet
+min_octet2 cidr = octet2 (min_host cidr)
+
+min_octet3 :: Cidr -> Octet
+min_octet3 cidr = octet3 (min_host cidr)
+
+min_octet4 :: Cidr -> Octet
+min_octet4 cidr = octet4 (min_host cidr)
+
+max_octet1 :: Cidr -> Octet
+max_octet1 cidr = octet1 (max_host cidr)
+
+max_octet2 :: Cidr -> Octet
+max_octet2 cidr = octet2 (max_host cidr)
+
+max_octet3 :: Cidr -> Octet
+max_octet3 cidr = octet3 (max_host cidr)
+
+max_octet4 :: Cidr -> Octet
+max_octet4 cidr = octet4 (max_host cidr)
+
+
+
-- Return true if the first argument (a CIDR range) contains the
-- second (another CIDR range). There are a lot of ways we can be fed
-- junk here. For lack of a better alternative, just return False when
| mbits1 > mbits2 = False
| otherwise = addr1masked == addr2masked
where
- addr1masked = apply_mask addr1 mbits1
- addr2masked = apply_mask addr2 mbits1
+ addr1masked = apply_mask addr1 mbits1 B.Zero
+ addr2masked = apply_mask addr2 mbits1 B.Zero
contains_proper :: Cidr -> Cidr -> Bool
contains_proper cidr1 cidr2 =
- (cidr1 `contains` cidr2) && (not (cidr1 == cidr2))
+ (cidr1 `contains` cidr2) && (not (cidr2 `contains` cidr1))
-- A CIDR range is redundant (with respect to the given list) if
redundant cidrlist cidr = any ((flip contains_proper) cidr) cidrlist
--- We want to get rid of all the Cidrs that are properly contained
--- in some other Cidr.
+-- First, we look at all possible pairs of cidrs, and combine the
+-- adjacent ones in to a new list. Then, we concatenate that list with
+-- the original one, and filter out all of the redundancies. If two
+-- adjacent Cidrs are combined into a larger one, they will be removed
+-- in the second step since the larger Cidr must contain the smaller
+-- two.
combine_all :: [Cidr] -> [Cidr]
combine_all cidrs =
+ combine_contained unique_cidrs
+ where
+ unique_cidrs = nubBy equivalent valid_cidr_combinations
+ valid_cidr_combinations = filter (/= Cidr.None) cidr_combinations
+ cidr_combinations =
+ cidrs ++ [ (combine_adjacent x y) | x <- cidrs, y <- cidrs ]
+
+
+-- Take a list of CIDR ranges and filter out all of the ones that are
+-- contained entirelt within some other range in the list.
+combine_contained :: [Cidr] -> [Cidr]
+combine_contained cidrs =
filter (not . (redundant cidrs)) cidrs
+-- If the two Cidrs are not adjacent, return Cidr.None. Otherwise,
+-- decrement the maskbits of cidr1 and return that; it will contain
+-- both cidr1 and cidr2.
+combine_adjacent :: Cidr -> Cidr -> Cidr
+combine_adjacent cidr1 cidr2
+ | not (adjacent cidr1 cidr2) = Cidr.None
+ | (maskbits cidr1 == Zero) = Cidr.None
+ | otherwise = cidr1 { maskbits = decrement (maskbits cidr1) }
+
+
+
-- Determine whether or not two CIDR ranges are adjacent. If two
-- ranges lie consecutively within the IP space, they can be
-- combined. For example, 10.1.0.0/24 and 10.0.1.0/24 are adjacent,
addr2 = ipv4address cidr2
mbits1 = maskbits cidr1
mbits2 = maskbits cidr2
+
+
+
+
+
+-- HUnit Tests
+
+test_equality1 :: Test
+test_equality1 =
+ TestCase $ assertEqual "10.1.1.0/23 equals itself" True (cidr1 == cidr1)
+ where
+ cidr1 = cidr_from_string "10.1.1.0/23"
+
+
+test_contains1 :: Test
+test_contains1 =
+ TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24" True (cidr1 `contains` cidr2)
+ where
+ cidr1 = cidr_from_string "10.1.1.0/23"
+ cidr2 = cidr_from_string "10.1.1.0/24"
+
+
+test_contains2 :: Test
+test_contains2 =
+ TestCase $ assertEqual "10.1.1.0/23 contains itself" True (cidr1 `contains` cidr1)
+ where
+ cidr1 = cidr_from_string "10.1.1.0/23"
+
+
+test_contains_proper1 :: Test
+test_contains_proper1 =
+ TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24 properly" True (cidr1 `contains_proper` cidr2)
+ where
+ cidr1 = cidr_from_string "10.1.1.0/23"
+ cidr2 = cidr_from_string "10.1.1.0/24"
+
+
+test_contains_proper2 :: Test
+test_contains_proper2 =
+ TestCase $ assertEqual "10.1.1.0/23 does not contain itself properly" False (cidr1 `contains_proper` cidr1)
+ where
+ cidr1 = cidr_from_string "10.1.1.0/23"
+
+
+test_adjacent1 :: Test
+test_adjacent1 =
+ TestCase $ assertEqual "10.1.0.0/24 is adjacent to 10.1.1.0/24" True (cidr1 `adjacent` cidr2)
+ where
+ cidr1 = cidr_from_string "10.1.0.0/24"
+ cidr2 = cidr_from_string "10.1.1.0/24"
+
+
+test_adjacent2 :: Test
+test_adjacent2 =
+ TestCase $ assertEqual "10.1.0.0/23 is not adjacent to 10.1.0.0/24" False (cidr1 `adjacent` cidr2)
+ where
+ cidr1 = cidr_from_string "10.1.0.0/23"
+ cidr2 = cidr_from_string "10.1.0.0/24"
+
+
+test_adjacent3 :: Test
+test_adjacent3 =
+ TestCase $ assertEqual "10.1.0.0/24 is not adjacent to 10.2.5.0/24" False (cidr1 `adjacent` cidr2)
+ where
+ cidr1 = cidr_from_string "10.1.0.0/24"
+ cidr2 = cidr_from_string "10.2.5.0/24"
+
+
+test_adjacent4 :: Test
+test_adjacent4 =
+ TestCase $ assertEqual "10.1.1.0/24 is not adjacent to 10.1.2.0/24" False (cidr1 `adjacent` cidr2)
+ where
+ cidr1 = cidr_from_string "10.1.1.0/24"
+ cidr2 = cidr_from_string "10.1.2.0/24"
+
+
+test_combine_contained1 :: Test
+test_combine_contained1 =
+ TestCase $ assertEqual "10.0.0.0/8, 10.1.0.0/16, and 10.1.1.0/24 combine to 10.0.0.0/8" expected_cidrs (combine_contained test_cidrs)
+ where
+ cidr1 = cidr_from_string "10.0.0.0/8"
+ cidr2 = cidr_from_string "10.1.0.0/16"
+ cidr3 = cidr_from_string "10.1.1.0/24"
+ expected_cidrs = [cidr1]
+ test_cidrs = [cidr1, cidr2, cidr3]
+
+
+test_combine_contained2 :: Test
+test_combine_contained2 =
+ TestCase $ assertEqual "192.168.3.0/23 does not contain 192.168.1.0/24" [cidr1, cidr2] (combine_contained [cidr1, cidr2])
+ where
+ cidr1 = cidr_from_string "192.168.3.0/23"
+ cidr2 = cidr_from_string "192.168.1.0/24"
+
+
+test_combine_all1 :: Test
+test_combine_all1 =
+ TestCase $ assertEqual "10.0.0.0/24 is adjacent to 10.0.1.0/24 and 10.0.3.0/23 contains 10.0.2.0/24" expected_cidrs (combine_all test_cidrs)
+ where
+ cidr1 = cidr_from_string "10.0.0.0/24"
+ cidr2 = cidr_from_string "10.0.1.0/24"
+ cidr3 = cidr_from_string "10.0.2.0/24"
+ cidr4 = cidr_from_string "10.0.3.0/23"
+ cidr5 = cidr_from_string "10.0.0.0/23"
+ expected_cidrs = [cidr4, cidr5]
+ test_cidrs = [cidr1, cidr2, cidr3, cidr4]
+
+
+test_combine_all2 :: Test
+test_combine_all2 =
+ TestCase $ assertEqual "127.0.0.1/32 combines with itself recursively" expected_cidrs (combine_all test_cidrs)
+ where
+ cidr1 = cidr_from_string "127.0.0.1/32"
+ expected_cidrs = [cidr1]
+ test_cidrs = [cidr1, cidr1, cidr1, cidr1, cidr1]
+
+
+cidr_tests :: [Test]
+cidr_tests = [ test_equality1,
+ test_contains1,
+ test_contains2,
+ test_contains_proper1,
+ test_contains_proper2,
+ test_adjacent1,
+ test_adjacent2,
+ test_adjacent3,
+ test_adjacent4,
+ test_combine_contained1,
+ test_combine_contained2,
+ test_combine_all1,
+ test_combine_all2
+ ]
+
+
+-- QuickCheck Tests
+prop_all_cidrs_contain_themselves :: Cidr -> Bool
+prop_all_cidrs_contain_themselves cidr1 = cidr1 `contains` cidr1
+
+
+-- If cidr1 properly contains cidr2, then by definition cidr2
+-- does not properly contain cidr1.
+prop_contains_proper_intransitive :: Cidr -> Cidr -> Property
+prop_contains_proper_intransitive cidr1 cidr2 =
+ (cidr1 `contains_proper` cidr2) ==>
+ (not (cidr2 `contains_proper` cidr1))
projects / hath.git / blobdiff