Restore NotSyn and RST logic using perl_action_tcp_helper()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-03-13 10:49:23 -07:00
parent c2fd48c4c6
commit bed747c20b
3 changed files with 58 additions and 21 deletions

View File

@ -71,7 +71,7 @@ DropUPnP(@5)
#
# Drop 'newnotsyn' traffic so that it doesn't get logged.
#
NotSyn(-,@1) - - tcp
NotSyn(DROP,@1) - - tcp
#
# Drop late-arriving DNS replies. These are just a nuisance and clutter up
# the log.

View File

@ -1,22 +1,52 @@
#
# Shorewall - NotSyn Action
# Shorewall 4 - NotSyn Action
#
# /usr/share/shorewall/action.NotSyn
#
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2011 - 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.
#
# NotSyn[([<action>])]
#
# Default action is DROP
#
##########################################################################################
?if @2 ne '' && @2 ne '-'
?if @2 eq 'audit'
DEFAULTS A_DROP,-
?else
?error The second parameter to NotSyn must be 'audit' or '-'
?endif
?else
DEFAULTS DROP,-
?endif
@1 - - ;;+ -p 6 ! --syn
?begin perl;
use strict;
use Shorewall::IPAddrs;
use Shorewall::Config;
use Shorewall::Chains;
use Shorewall::Rules;
my ( $action, $audit ) = get_action_params( 2 );
if ( supplied $audit ) {
fatal_error "Invalid parameter ($audit) to action NotSyn" if $audit ne 'audit';
$action = "A_$action";
}
perl_action_tcp_helper( $action, '-p 6 ! --syn' );
1;
?end perl;

View File

@ -30,14 +30,21 @@
DEFAULTS DROP,-
?if @2 ne '' && @2 ne '-'
?if @2 eq 'audit'
DEFAULTS A_DROP,-
?else
?error The second parameter to NotSyn must be 'audit' or '-'
?endif
?else
DEFAULTS DROP,-
?endif
?begin perl;
@1 - - - ;;+ -p 6 --tcp-flags RST RST
use Shorewall::Config;
use Shorewall::Chains;
use Shorewall::Rules;
my ( $action, $audit ) = get_action_params( 2 );
if ( supplied $audit ) {
fatal_error "Invalid parameter ($audit) to action RST" if $audit ne 'audit';
$action = "A_$action";
}
perl_action_tcp_helper( $action, '-p 6 --tcp-flags RST RST' );
1;
?end perl;