From fe2f95a43c36fd3328e7faaffd28657b70560ff3 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 13 Aug 2015 01:04:31 +0200 Subject: Propellor.Property.Firewall: fix Port datatype to iptable parameter translation --- src/Propellor/Property/Firewall.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/Firewall.hs') diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs index d643b185..dafdcc6d 100644 --- a/src/Propellor/Property/Firewall.hs +++ b/src/Propellor/Property/Firewall.hs @@ -44,8 +44,8 @@ toIpTable r = map Param $ toIpTableArg :: Rules -> [String] toIpTableArg Everything = [] toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] -toIpTableArg (DPort port) = ["--dport", show port] -toIpTableArg (DPortRange (f,t)) = ["--dport", show f ++ ":" ++ show t] +toIpTableArg (DPort (Port port)) = ["--dport", show port] +toIpTableArg (DPortRange (Port f, Port t)) = ["--dport", show f ++ ":" ++ show t] toIpTableArg (IFace iface) = ["-i", iface] toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' -- cgit v1.3-2-g0d8e From f4abc3c1cb8f89ee23704b0833b5d72f53abd15b Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 13 Aug 2015 01:21:23 +0200 Subject: Propellor.Property.Firewall: coding style --- debian/changelog | 2 +- src/Propellor/Property/Firewall.hs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/Propellor/Property/Firewall.hs') diff --git a/debian/changelog b/debian/changelog index 24bbe84a..3ee27088 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ propellor (2.7.1) UNRELEASED; urgency=medium * Make sure that make is installed when bootstrapping propellor. - * Fix bug in Firewall.toIpTableArg. + * Fix bug in Firewall's Port datatype to iptable parameter translation code. Thanks, Antoine Eiche. -- Joey Hess Wed, 12 Aug 2015 19:19:28 -0400 diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs index dafdcc6d..dd82fcc8 100644 --- a/src/Propellor/Property/Firewall.hs +++ b/src/Propellor/Property/Firewall.hs @@ -42,13 +42,14 @@ toIpTable r = map Param $ (toIpTableArg (ruleRules r)) ++ [ "-j" , show $ ruleTarget r ] toIpTableArg :: Rules -> [String] -toIpTableArg Everything = [] -toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] +toIpTableArg Everything = [] +toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] toIpTableArg (DPort (Port port)) = ["--dport", show port] -toIpTableArg (DPortRange (Port f, Port t)) = ["--dport", show f ++ ":" ++ show t] -toIpTableArg (IFace iface) = ["-i", iface] -toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] -toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' +toIpTableArg (DPortRange + (Port f, Port t)) = ["--dport", show f ++ ":" ++ show t] +toIpTableArg (IFace iface) = ["-i", iface] +toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] +toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' data Rule = Rule { ruleChain :: Chain -- cgit v1.3-2-g0d8e From 3ee61b70bb37c358acb8e74ce46cab669e9fe171 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2015 10:03:06 -0400 Subject: better comply with propellor's layout style --- src/Propellor/Property/Firewall.hs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/Propellor/Property/Firewall.hs') diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs index dd82fcc8..6c95a022 100644 --- a/src/Propellor/Property/Firewall.hs +++ b/src/Propellor/Property/Firewall.hs @@ -42,14 +42,18 @@ toIpTable r = map Param $ (toIpTableArg (ruleRules r)) ++ [ "-j" , show $ ruleTarget r ] toIpTableArg :: Rules -> [String] -toIpTableArg Everything = [] -toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] +toIpTableArg Everything = [] +toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] toIpTableArg (DPort (Port port)) = ["--dport", show port] -toIpTableArg (DPortRange - (Port f, Port t)) = ["--dport", show f ++ ":" ++ show t] -toIpTableArg (IFace iface) = ["-i", iface] -toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] -toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' +toIpTableArg (DPortRange (Port f, Port t)) = + ["--dport", show f ++ ":" ++ show t] +toIpTableArg (IFace iface) = ["-i", iface] +toIpTableArg (Ctstate states) = + [ "-m" + , "conntrack" + , "--ctstate", concat $ intersperse "," (map show states) + ] +toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' data Rule = Rule { ruleChain :: Chain -- cgit v1.3-2-g0d8e