From 69b660ba565aa75df76aeed6b1efba65ff0a9539 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 26 Jan 2013 09:45:16 -0800 Subject: [PATCH] Add Related and Untracked actions. Signed-off-by: Tom Eastep --- Shorewall/action.Invalid | 2 +- Shorewall/action.Related | 57 ++++++++++++++++++++++++++++++++++++++ Shorewall/action.Untracked | 57 ++++++++++++++++++++++++++++++++++++++ Shorewall/actions.std | 2 ++ Shorewall6/actions.std | 4 ++- 5 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 Shorewall/action.Related create mode 100644 Shorewall/action.Untracked diff --git a/Shorewall/action.Invalid b/Shorewall/action.Invalid index edf6bbf8f..725e1a412 100644 --- a/Shorewall/action.Invalid +++ b/Shorewall/action.Invalid @@ -5,7 +5,7 @@ # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # -# (c) 2011 - Tom Eastep (teastep@shorewall.net) +# (c) 2011,2012 - Tom Eastep (teastep@shorewall.net) # # Complete documentation is available at http://shorewall.net # diff --git a/Shorewall/action.Related b/Shorewall/action.Related new file mode 100644 index 000000000..779d10bd6 --- /dev/null +++ b/Shorewall/action.Related @@ -0,0 +1,57 @@ +# +# Shorewall 4 - Invalid Action +# +# /usr/share/shorewall/action.Related +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 2013 - Tom Eastep (teastep@shorewall.net) +# +# Complete documentation is available at http://shorewall.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Related[([|-[,{audit|-}])] +# +# Default action is DROP +# +########################################################################################## +?FORMAT 2 + +DEFAULTS DROP,- + +?BEGIN PERL; + +use Shorewall::IPAddrs; +use Shorewall::Config; +use Shorewall::Chains; + +my ( $action, $audit ) = get_action_params( 2 ); + +fatal_error "Related parameter ($audit) to action Related" if supplied $audit && $audit ne 'audit'; +fatal_error "Related parameter ($action) to action Related" unless $action =~ /^(?:ACCEPT|DROP|REJECT)$/; + +my $chainref = get_action_chain; + +my ( $level, $tag ) = get_action_logging; +my $target = require_audit ( $action , $audit ); + +log_rule_limit $level, $chainref, 'Related' , $action, '', $tag, 'add', "$globals{STATEMATCH} RELATED " if $level ne ''; +add_jump $chainref , $target, 0, "$globals{STATEMATCH} RELATED "; + +allow_optimize( $chainref ); + +1; + +?END PERL; diff --git a/Shorewall/action.Untracked b/Shorewall/action.Untracked new file mode 100644 index 000000000..1c538ecb9 --- /dev/null +++ b/Shorewall/action.Untracked @@ -0,0 +1,57 @@ +# +# Shorewall 4 - Untracked Action +# +# /usr/share/shorewall/action.Untracked +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 2013 - Tom Eastep (teastep@shorewall.net) +# +# Complete documentation is available at http://shorewall.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Untracked[([|-[,{audit|-}])] +# +# Default action is DROP +# +########################################################################################## +?FORMAT 2 + +DEFAULTS DROP,- + +?BEGIN PERL; + +use Shorewall::IPAddrs; +use Shorewall::Config; +use Shorewall::Chains; + +my ( $action, $audit ) = get_action_params( 2 ); + +fatal_error "Untracked parameter ($audit) to action Untracked" if supplied $audit && $audit ne 'audit'; +fatal_error "Untracked parameter ($action) to action Untracked" unless $action =~ /^(?:ACCEPT|DROP|REJECT)$/; + +my $chainref = get_action_chain; + +my ( $level, $tag ) = get_action_logging; +my $target = require_audit ( $action , $audit ); + +log_rule_limit $level, $chainref, 'Untracked' , $action, '', $tag, 'add', "$globals{STATEMATCH} UNTRACKED " if $level ne ''; +add_jump $chainref , $target, 0, "$globals{STATEMATCH} UNTRACKED "; + +allow_optimize( $chainref ); + +1; + +?END PERL; diff --git a/Shorewall/actions.std b/Shorewall/actions.std index ae18bd9ae..73fc36599 100644 --- a/Shorewall/actions.std +++ b/Shorewall/actions.std @@ -41,5 +41,7 @@ DropSmurfs noinline # Drop smurf packets Invalid noinline # Handles packets in the INVALID conntrack state NotSyn noinline # Handles TCP packets which do not have SYN=1 and ACK=0 Reject # Default Action for REJECT policy +Related noinline # Handles packets in the RELATED conntrack state RST noinline # Handle packets with RST set TCPFlags noinline # Handle bad flag combinations. +Untracked noinline # Handles packets in the UNTRACKED conntrack state diff --git a/Shorewall6/actions.std b/Shorewall6/actions.std index 8e2d727a4..149dca304 100644 --- a/Shorewall6/actions.std +++ b/Shorewall6/actions.std @@ -29,5 +29,7 @@ DropSmurfs noinline # Handles packets with a broadcast source address Invalid noinline # Handles packets in the INVALID conntrack state NotSyn noinline # Handles TCP packets that do not have SYN=1 and ACK=0 Reject # Default Action for REJECT policy +Related noinline # Handles packets in the RELATED conntrack state +RST noinline # Handle packets with RST set TCPFlags noinline # Handles bad flags combinations - +Untracked noinline # Handles packets in the UNTRACKED conntrack state