cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed indentation for consistency with the rest of propellor

This commit is contained in:
Joey Hess 2014-10-31 10:20:34 -04:00
parent 63560cde90
commit 3a1f058c64
1 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Propellor/Property/Firewall.hs
View File

@ -2,10 +2,15 @@
-- --
-- Copyright 2014 Arnaud Bailly <arnaud.oqube@gmail.com> -- Copyright 2014 Arnaud Bailly <arnaud.oqube@gmail.com>
-- License: BSD-2-Clause -- License: BSD-2-Clause
module Propellor.Property.Firewall( module Propellor.Property.Firewall (
rule, rule,
installed, installed,
Chain(..),Target(..),Proto(..),Rules(..),ConnectionState(..)) where Chain(..),
Target(..),
Proto(..),
Rules(..),
ConnectionState(..)
) where
import Data.Monoid import Data.Monoid
import Data.Char import Data.Char
@ -26,16 +31,17 @@ rule c t rs = property ("firewall rule: " <> show r) addIpTable
addIpTable = liftIO $ do addIpTable = liftIO $ do
let args = toIpTable r let args = toIpTable r
exist <- boolSystem "/sbin/iptables" (chk args) exist <- boolSystem "/sbin/iptables" (chk args)
if exist then if exist
return NoChange then return NoChange
else ifM (boolSystem "/sbin/iptables" (add args)) else ifM (boolSystem "/sbin/iptables" (add args))
( return MadeChange , return FailedChange) ( return MadeChange , return FailedChange)
add params = (Param "-A") : params add params = (Param "-A") : params
chk params = (Param "-C") : params chk params = (Param "-C") : params
toIpTable :: Rule -> [CommandParam] toIpTable :: Rule -> [CommandParam]
toIpTable r = map Param ((show $ ruleChain r) : toIpTable r = map Param $
(toIpTableArg (ruleRules r)) ++ [ "-j" , show $ ruleTarget r ]) (show $ ruleChain r) :
(toIpTableArg (ruleRules r)) ++ [ "-j" , show $ ruleTarget r ]
toIpTableArg :: Rules -> [String] toIpTableArg :: Rules -> [String]
toIpTableArg Everything = [] toIpTableArg Everything = []
@ -46,10 +52,10 @@ toIpTableArg (IFace iface) = ["-i", iface]
toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)]
toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r'
data Rule = Rule { data Rule = Rule
ruleChain :: Chain { ruleChain :: Chain
,ruleTarget :: Target , ruleTarget :: Target
,ruleRules :: Rules , ruleRules :: Rules
} deriving (Eq, Show, Read) } deriving (Eq, Show, Read)
data Chain = INPUT | OUTPUT | FORWARD data Chain = INPUT | OUTPUT | FORWARD
@ -66,7 +72,8 @@ type Port = Int
data ConnectionState = ESTABLISHED | RELATED | NEW | INVALID data ConnectionState = ESTABLISHED | RELATED | NEW | INVALID
deriving (Eq,Show,Read) deriving (Eq,Show,Read)
data Rules = Everything data Rules
= Everything
| Proto Proto | Proto Proto
-- ^There is actually some order dependency between proto and port so this should be a specific -- ^There is actually some order dependency between proto and port so this should be a specific
-- data type with proto + ports -- data type with proto + ports
@ -82,5 +89,3 @@ infixl 0 :-
instance Monoid Rules where instance Monoid Rules where
mempty = Everything mempty = Everything
mappend = (:-) mappend = (:-)