check correctness of 'action' attributev0.3.2

ref #2193

2 files changed, 12 insertions, 6 deletions

diff --git a/awall/model.lua b/awall/model.lua
index cc53445..ff747ff 100644
--- a/awall/model.lua
+++ b/awall/model.lua
@@ -319,10 +319,8 @@ function Rule:position() return 'append' end
 
 function Rule:target()
    if not self.action then self:error('Action not defined') end
-   if util.contains({'accept', 'drop', 'reject'}, self.action) then
-      return string.upper(self.action)
-   end
-   return self.action
+   if self.action == 'accept' then return 'ACCEPT' end
+   self:error('Invalid action: '..self.action)
 end
 
 
diff --git a/awall/modules/filter.lua b/awall/modules/filter.lua
index a97b9b3..35c5f30 100644
--- a/awall/modules/filter.lua
+++ b/awall/modules/filter.lua
@@ -173,10 +173,18 @@ function Filter:position()
    return self:limit() == 'flow-limit' and 'prepend' or 'append'
 end
 
+function Filter:actiontarget()
+   if self.action == 'tarpit' then return 'tarpit' end
+   if util.contains({'drop', 'reject'}, self.action) then
+      return string.upper(self.action)
+   end
+   return model.Rule.target(self)
+end
+
 function Filter:target()
    if self:limit() then return self:newchain('limit') end
    if self.log then return self:newchain('log'..self.action) end
-   return model.Rule.target(self)
+   return self:actiontarget()
 end
 
 function Filter:extraoptfrags()
@@ -234,7 +242,7 @@ function Filter:extraoptfrags()
 
       extend(res, combinations({{chain=chain}}, ofrags))
 
-   else logchain(self.log, self.action, model.Rule.target(self)) end
+   else logchain(self.log, self.action, self:actiontarget()) end
    
    return res
 end