Forward Firewall: added GPL header to all files

diff --git a/config/forwardfw/convert-dmz b/config/forwardfw/convert-dmz
index 6ba054e632b438f9dae53d86155f396248c26654..3d91364259a437d3c478b8a36f5027c04b14a10f 100755 (executable)
--- a/config/forwardfw/convert-dmz
+++ b/config/forwardfw/convert-dmz
@@ -1,17 +1,33 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-######################################################################## 
-# Script:      convert-dmz
-# Date:                03.04.2013
-# Author:      Alexander Marx (amarx@ipfire.org)
-########################################################################
-#
-# This script converts old dmz holes rules from old Firewall
-# to the new one. This is a 2-step process.
-# STEP1: read old config and normalize settings
-# STEP2: check valid ip and save valid rules to new firewall
-# 
-########################################################################
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2013                                                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# 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, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+# Author: Alexander Marx (amarx@ipfire.org)                                   #
+###############################################################################
+#                                                                             #
+# This script converts old dmz holes rules from old firewall                  #
+# to the new one. This is a 2-step process.                                   #
+# STEP1: read old config and normalize settings                               #
+# STEP2: check valid ip and save valid rules to new firewall                  #
+#                                                                             #
+###############################################################################

 my @current=();
 my @alias=();
 my %configdmz=();
 my @current=();
 my @alias=();
 my %configdmz=();

diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw
index 05bf13dada3fc2557a27b1c797342a31e60266a4..c9077a8713dbbc4f2f403436269e93eb89d205ce 100755 (executable)
--- a/config/forwardfw/convert-outgoingfw
+++ b/config/forwardfw/convert-outgoingfw
@@ -1,17 +1,33 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-######################################################################## 
-# Script:      convert-outgoingfw
-# Date:                21.03.2013
-# Author:      Alexander Marx (amarx@ipfire.org)
-########################################################################
-#
-# This script converts old groups and firewallrules 
-# to the new one. This is a 3-step process.
-# STEP1: convert groups ->LOG /var/log/converters
-# STEP2: convert rules  ->LOG /var/log/converters
-# STEP3: convert P2P rules 
-#
-########################################################################
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2013                                                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# 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, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+# Author: Alexander Marx (amarx@ipfire.org)                                   #
+###############################################################################
+#                                                                             #
+# This script converts old groups and firewallrules                           #
+# to the new one. This is a 3-step process.                                   #
+# STEP1: convert groups ->LOG /var/log/converters                             #
+# STEP2: convert rules  ->LOG /var/log/converters                             #
+# STEP3: convert P2P rules                                                    #
+#                                                                             #
+###############################################################################

 
 require '/var/ipfire/general-functions.pl';
 
 
 require '/var/ipfire/general-functions.pl';
 

diff --git a/config/forwardfw/convert-portfw b/config/forwardfw/convert-portfw
index 691cfb429a0a632114d423f43d8ecf1f95c0bd16..e741c3d8de193c7306ef52023d5ddf9edd4f9607 100755 (executable)
--- a/config/forwardfw/convert-portfw
+++ b/config/forwardfw/convert-portfw
@@ -1,18 +1,33 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-
-######################################################################## 
-# Script:      convert-portfw
-# Date:                21.03.2013
-# Author:      Alexander Marx (amarx@ipfire.org)
-########################################################################
-#
-# This script converts old portforwarding rules from old Firewall
-# to the new one. This is a 3-step process.
-# STEP1: read old config and normalize settings
-# STEP2: create new rules from old ones
-# STEP3: check if rule already exists, when not, put it into 
-#        /var/ipfire/forward/nat
-########################################################################
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2013                                                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# 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, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+# Author: Alexander Marx (amarx@ipfire.org)                                   #
+###############################################################################
+#                                                                             #
+# This script converts old portforwarding rules from old Firewall             #
+# to the new one. This is a 3-step process.                                   #
+# STEP1: read old config and normalize settings                               #
+# STEP2: create new rules from old ones                                       #
+# STEP3: check if rule already exists, when not, put it into                  #
+#        /var/ipfire/forward/nat                                              #
+###############################################################################

 require '/var/ipfire/general-functions.pl';
 my @values=();
 my @built_rules=();
 require '/var/ipfire/general-functions.pl';
 my @values=();
 my @built_rules=();

diff --git a/config/forwardfw/convert-xtaccess b/config/forwardfw/convert-xtaccess
index 8c3bb56a00706f48f3b81f5539311f8094d91d2a..23fb226c692d359ba4d8438dcd0422524fb2fd17 100755 (executable)
--- a/config/forwardfw/convert-xtaccess
+++ b/config/forwardfw/convert-xtaccess
@@ -1,4 +1,30 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2013                                                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# 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, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+# Author: Alexander Marx (amarx@ipfire.org)                                   #
+###############################################################################
+#                                                                             #
+#This script converts old xtaccess rules to new firewall                      #
+#Logfiles are created under /var/log/converters                               #
+#                                                                             #
+###############################################################################

 my @current=();
 my @alias=();
 my %configinputfw=();
 my @current=();
 my @alias=();
 my %configinputfw=();

diff --git a/config/forwardfw/firewall-lib.pl b/config/forwardfw/firewall-lib.pl
index a1f96ba40ff1af290ce90a14bc7f52bc5f165ce6..e616d7efa9c9025d8f1e0540bf4e1336d7f6b5cd 100755 (executable)
--- a/config/forwardfw/firewall-lib.pl
+++ b/config/forwardfw/firewall-lib.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2012                                                                                                             #
+# Copyright (C) 2013                                                          #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -18,7 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################

-
+# Author: Alexander Marx (amarx@ipfire.org)                                   #
+###############################################################################

 
 use strict;
 no warnings 'uninitialized';
 
 use strict;
 no warnings 'uninitialized';

diff --git a/config/forwardfw/firewall-policy b/config/forwardfw/firewall-policy
index e142f2d3f44fc998aeca9eb50fb627b382f2ab81..f6c88e4afafe171745b5c53e34a17e31d2926b82 100755 (executable)
--- a/config/forwardfw/firewall-policy
+++ b/config/forwardfw/firewall-policy
@@ -1,5 +1,28 @@
 #!/bin/sh
 
 #!/bin/sh
 

+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2013                                                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# 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, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+# Author: Alexander Marx (amarx@ipfire.org)                                   #
+###############################################################################
+
+

 eval $(/usr/local/bin/readhash /var/ipfire/forward/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/forward/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)

diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
index 07f3abd1eaa6d02ebc915f97c3f61b198de1cfaa..e3592701caf329ce6baae2153d7104cbb53dff30 100755 (executable)
--- a/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2012                                                                                                             #
+# Copyright (C) 2013                                                          #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -18,10 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################

-#                                                                                                                                                        #
-# Hi folks! I hope this code is useful for all. I needed something to handle  #
-# my VPN Connections in a comfortable way.                                                               #
-# This script builds firewallrules from the webinterface                      #
+# Author: Alexander Marx (amarx@ipfire.org)                                   #

 ###############################################################################
 
 use strict;
 ###############################################################################
 
 use strict;


@@ -89,7 +86,7 @@ close(CONN1);
 ################################
 #    DEBUG/TEST                #
 ################################
 ################################
 #    DEBUG/TEST                #
 ################################

-my $MODE=1;     # 0 - normal operation
+my $MODE=0;     # 0 - normal operation

                                # 1 - print configline and rules to console     
                                # 
 ################################               
                                # 1 - print configline and rules to console     
                                # 
 ################################               

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index bd8cea8edcf799e88cda38962a82a19209f171fa..88e16086f9af0b2c74228a1d34f9a6a962c9726c 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2012                                                                                                 #
+# Copyright (C) 2013                                                          #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -18,7 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################

-
+# Author: Alexander Marx (amarx@ipfire.org)                                   #
+###############################################################################

 
 use strict;
 use Sort::Naturally;
 
 use strict;
 use Sort::Naturally;

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 879e6b83cbaf711ce4f10499b33cf8bc46eb5285..fffa9353ebfde82eb1d846b330bb1c9b0cc31918 100755 (executable)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2013                                                          #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -18,9 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################

-# New function for forwarding firewall. To make it comfortable to create         #
-# rules, we need "spelling names" for single Hosts. If you have any questions #
-# <amarx@ipfire.org>                                                                                                             #
+# Author: Alexander Marx  (amarx@ipfire.org)                                  #

 ###############################################################################
 use strict;
 
 ###############################################################################
 use strict;
 

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 73a2f59a6a3879676a55169576be9c1076e8613f..7d34feab0893d16bc4a9bc9c07f73d7c17d59ee1 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -11,6 +11,9 @@
 # $Id: optionsfw.cgi,v 1.1.2.10 2005/10/03 00:34:10 gespinasse Exp $
 #
 #
 # $Id: optionsfw.cgi,v 1.1.2.10 2005/10/03 00:34:10 gespinasse Exp $
 #
 #

+########################################################################
+#  Modifications for new Firewall (C) 2013 by amarx@ipfire.org
+########################################################################

 
 # enable only the following on debugging purpose
 #use warnings;
 
 # enable only the following on debugging purpose
 #use warnings;

diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index 9d248a133396d5a522968363c89cda35325ec782..79417502b5955166d1378deec8e7d440798c7cc5 100755 (executable)
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2012                                                                                                 #
+# Copyright (C) 2013                                                          #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -18,16 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################

-#                                                                                                                                                        #
-# Hi folks! I hope this code is useful for all. I needed something to handle  #
-# my VPN Connections in a comfortable way. As a prerequisite i needed            #
-# something that makes sure the vpn roadwarrior are able to have a fixed         #
-# ip-address. So i developed the ccd extension for the vpn server.                       #
-#                                                                                                                                                        #
-# Now that the ccd extension is ready i am able to develop the main request.  #
-# Any feedback is appreciated.                                                                                           #
-#                                                                                                                                                        #
-#Copymaster                                                                                                                                      #
+# Author: Alexander Marx (Amarx@ipfire.org)                                   #

 ###############################################################################
 
 use strict;
 ###############################################################################
 
 use strict;