require '/var/ipfire/general-functions.pl';
+
use Socket;
use File::Path;
+use File::Copy;
+
my $ipgrouppath = "${General::swroot}/outgoing/groups/ipgroups/";
my $macgrouppath = "${General::swroot}/outgoing/groups/macgroups/";
my $outgoingrules = "${General::swroot}/outgoing/rules";
my $ovpnconfig = "${General::swroot}/ovpn/ovpnconfig";
my $ccdconfig = "${General::swroot}/ovpn/ccd.conf";
my $fwdfwconfig = "${General::swroot}/forward/config";
+my $outfwconfig = "${General::swroot}/forward/outgoing";
my $fwdfwsettings = "${General::swroot}/forward/settings";
my @ipgroups = qx(ls $ipgrouppath);
my @macgroups = qx(ls $macgrouppath);
my %settingsovpn=();
my %configovpn=();
my %ccdconf=();
-my %fwconf=();
+my %fwconfig=();
+my %fwconfigout=();
my %fwdsettings=();
&General::readhash($outfwsettings,\%outsettings);
&process_groups;
&process_rules;
-
+&process_p2p;
+system("/usr/local/bin/forwardfwctrl");
sub process_groups
{
if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
#IP Group processing
foreach my $group (@ipgroups){
chomp $group;
+ print LOG "\nProcessing IP-GROUP: $group...\n";
open (DATEI, "<$ipgrouppath/$group");
my @zeilen = <DATEI>;
foreach my $ip (@zeilen){
chomp($ip);
$ip =~ s/\s//gi;
+ print LOG "Check IP $ip from Group $group ";
my $val=&check_ip($ip);
if($val){
push(@hostarray,$val.",ip");
+ print LOG "-> OK\n";
}
else{
print LOG "-> IP \"$ip\" from group $group not converted (invalid IP) \n";
#MAC Group processing
foreach my $group (@macgroups){
chomp $group;
+ print LOG "\nProcessing MAC-GROUP: $group...\n";
open (DATEI, "<$macgrouppath/$group");
my @zeilen = <DATEI>;
foreach my $mac (@zeilen){
chomp($mac);
$mac =~ s/\s//gi;
+ print LOG "Checking MAC $mac from group $group ";
#MAC checking
if(&General::validmac($mac)){
$val=$mac;
}
if($val){
push(@hostarray,$val.",mac");
+ print LOG "-> OK\n";
}
else{
print LOG "-> Mac $mac from group $group not converted (invalid MAC)\n";
$adr=int($1).".".int($2).".".int($3).".".int($4);
my $b = &General::iporsubtodec($5);
$a=$adr."/".$b;
- }
- if($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
+ }elsif($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
$adr=int($1).".".int($2).".".int($3).".".int($4);
if(&General::validip($adr)){
$a=$adr."/255.255.255.255";
my ($ip,$type) = split(",",$adr);
my ($ippart,$subnet) = split("/",$ip);
my ($byte1,$byte2,$byte3,$byte4) = split(/\./,$subnet);
- if($byte4 eq '255'){
+ if($byte4 eq '255'){
+ print LOG "Processing SINGLE HOST $ippart/$subnet from group $grp\n";
if(!&check_host($ip)){
my $key = &General::findhasharraykey(\%hosts);
$name="host ";
$hosts{$key}[1] = $type;
$hosts{$key}[2] = $ip;
$hosts{$key}[3] = 1;
+ print LOG "->Host (IP) $ip added to custom hosts\n"
}else{
- print LOG "Host (IP) $ip already exists\n";
+ print LOG "->Host (IP) $ip already exists\n";
}
}elsif($byte4 < '255'){
+ print LOG "Processing NETWORK $ippart/$subnet from Group $grp\n";
if(!&check_net($ippart,$subnet)){
my $netkey = &General::findhasharraykey(\%nets);
$name="net ";
$nets{$netkey}[1] = $ippart;
$nets{$netkey}[2] = $subnet;
$nets{$netkey}[3] = 1;
+ print LOG "->Network $ippart/$subnet added to custom networks\n";
}else{
print LOG "Network $ippart already exists\n";
}
$groups{$grpkey}[2] = $name2;
$groups{$grpkey}[3] = $name3;
$groups{$grpkey}[4] = 0;
+ print LOG "->$name2 added to group $grp\n";
}
}elsif($run eq 'mac'){
#MACRUN
my ($mac,$type) = split(",",$adr);
+ print LOG "Processing HOST (MAC) $mac\n";
if(!&check_host($mac)){
my $key = &General::findhasharraykey(\%hosts);
$name="host ";
$hosts{$key}[0] = $name2;
$hosts{$key}[1] = $type;
$hosts{$key}[2] = $mac;
- $hosts{$key}[3] = 1;
+ $hosts{$key}[3] = '';
+ $hosts{$key}[4] = 1;
+ print LOG "->Host (MAC) $mac added to custom hosts\n";
}else{
- print LOG "Host (MAC) $mac already exists\n";
+ print LOG "->Host (MAC) $mac already exists\n";
}
if($name2){
my $grpkey = &General::findhasharraykey(\%groups);
$groups{$grpkey}[2] = $name2;
$groups{$grpkey}[3] = $name3;
$groups{$grpkey}[4] = 0;
+ print LOG "->$name2 added to group $grp\n";
}
}
- @hostarray=();
}
+ @hostarray=();
&General::writehasharray($confighosts,\%hosts);
&General::writehasharray($configgroups,\%groups);
&General::writehasharray($confignets,\%nets);
-
+
}
sub check_host
{
}
sub process_rules
{
- &General::readhash($fwdfwsettings,\%fwdsettings);
- if($fwdsettings{'POLICY'} ne $outsettings{'POLICY'}){
- $fwdsettings{'POLICY'}=$outsettings{'POLICY'};
- &General::writehash($fwdfwsettings,\%fwdsettings);
- }
- #open LOG
- if( -f "/var/log/converters/outgoingfw-convert.log"){unlink ("/var/log/converters/outgoingfw-convert.log");}
- open (LOG, ">/var/log/converters/outgoingfw-convert.log") or die $!;
-
my ($type,$action,$active,$grp1,$source,$grp2,$useport,$port,$prot,$grp3,$target,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to);
+ &General::readhash($fwdfwsettings,\%fwdsettings);
if ($outsettings{'POLICY'} eq 'MODE1'){
+ $fwdfwsettings{'POLICY'}='MODE1';
$type='ALLOW';
$action='ACCEPT';
}elsif($outsettings{'POLICY'} eq 'MODE2'){
+ $fwdsettings{'POLICY'}='MODE2';
$type='DENY';
$action='DROP';
}else{
return;
}
+ &General::writehash($fwdfwsettings,\%fwdsettings);
+
+ #open LOG
+ if( -f "/var/log/converters/outgoingfw-convert.log"){unlink ("/var/log/converters/outgoingfw-convert.log");}
+ open (LOG, ">/var/log/converters/outgoingfw-convert.log") or die $!;
open (DATEI, "<$outgoingrules");
my @lines = <DATEI>;
foreach my $rule (@lines)
if($configline[0] eq $type){
#some variables we can use from old config
if($configline[1] eq 'on'){ $active='ON';}else{$active='';}
- if($configline[3] eq 'all'){
- push(@prot,"tcp");
- push(@prot,"udp");
- $useport='ON';
- $grp3='TGT_PORT';
+ if($configline[3] eq 'all' && $configline[8] ne ''){
+ push(@prot,"TCP");
+ push(@prot,"UDP");
+ }elsif($configline[3] eq 'all' && $configline[8] eq ''){
+ push(@prot,"");
}else{
push(@prot,$configline[3]);
- $useport='ON';
- $grp3='TGT_PORT';
}
- if($configline[4] ne ''){ $remark=$configline[4];}else{$remark='';}
- if($configline[9] eq 'aktiv'){ $log='ON';}else{$log='';}
+ if($configline[4] ne ''){
+ $configline[4] =~ s/,/;/g;
+ $remark = $configline[4];
+ }else{$remark = '';}
+ if($configline[9] eq 'Active'){ $log='ON';}else{$log='';}
if($configline[10] eq 'on' && $configline[11] eq 'on' && $configline[12] eq 'on' && $configline[13] eq 'on' && $configline[14] eq 'on' && $configline[15] eq 'on' && $configline[16] eq 'on'){
if($configline[17] eq '00:00' && $configline[18] eq '00:00'){
$time='';
$grp1='std_net_src';
$source='ORANGE';
}elsif ($configline[2] eq 'red') {
- print LOG "-> Rule not converted, is an outgoing rule.Please put it manually in /etc/sysconfig/firewall.local \n";
- next;
+ $grp1='std_net_src';
+ $source='IPFire';
+ &General::readhash($fwdfwsettings,\%fwdsettings);
+ $fwdsettings{'POLICY1'}=$outsettings{'POLICY'};
+ $fwdsettings{'POLICY'}=$outsettings{'POLICY'};
+ &General::writehash($fwdfwsettings,\%fwdsettings);
}elsif ($configline[2] eq 'blue') {
$grp1='std_net_src';
$source='BLUE';
}elsif ($configline[2] eq 'ip') {
my $z=&check_ip($configline[5]);
if($z){
+ my ($ipa,$subn) = split("/",$z);
+ $subn=&General::iporsubtocidr($subn);
$grp1='src_addr';
- $source=$z;
+ $source="$ipa/$subn";
}else{
print LOG "-> Rule not converted, missing/invalid source ip \"$configline[5]\"\n";
next;
$grp1='std_net_src';
$source='ALL';
}else{
- #&General::readhasharray($configgroups,\%groups);
foreach my $key (sort keys %groups){
if($groups{$key}[0] eq $configline[2]){
$grp1='cust_grp_src';
if($configline[7] ne ''){
my $address=&check_ip($configline[7]);
if($address){
+ my ($dip,$dsub) = split("/",$address);
+ $dsub=&General::iporsubtocidr($dsub);
$grp2='tgt_addr';
- $target=$address;
+ $target="$dip/$dsub";
}elsif(!$address){
my $getwebsiteip=&get_ip_from_domain($configline[7]);
if ($getwebsiteip){
$grp2='tgt_addr';
$target=$getwebsiteip;
+ $remark.=" $configline[7]";
}else{
print LOG "-> Rule not converted, invalid domain \"$configline[7]\"\n";
next;
my @values=();
my @parts=split(",",$configline[8]);
foreach (@parts){
+ $_=~ tr/-/:/;
if (!($_ =~ /^(\d+)\:(\d+)$/)) {
if(&General::validport($_)){
$useport='ON';
print LOG "-> Rule not converted because not for Firewall mode $outsettings{'POLICY'} (we are only converting for actual mode)\n";
}
&General::readhasharray($fwdfwconfig,\%fwconfig);
+ &General::readhasharray($outfwconfig,\%fwconfigout);
my $check;
+ my $chain;
foreach my $protocol (@prot){
+ if ($source eq 'IPFire'){
+ $chain='OUTGOINGFW';
+ }else{
+ $chain='FORWARDFW';
+ }
$protocol=uc($protocol);
- print LOG "-> Converted: $action,FORWARDFW,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to\n";
+ print LOG "-> Converted: $action,$chain,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to\n";
#Put rules into system....
###########################
-
#check for double rules
foreach my $key (sort keys %fwconfig){
- if("$action,FORWARDFW,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to"
+ if("$action,$chain,$active,$grp1,$source,$grp2,$target,,,,,$useport,$protocol,,$grp3,$port,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to"
eq "$fwconfig{$key}[0],$fwconfig{$key}[1],$fwconfig{$key}[2],$fwconfig{$key}[3],$fwconfig{$key}[4],$fwconfig{$key}[5],$fwconfig{$key}[6],,,,,$fwconfig{$key}[11],$fwconfig{$key}[12],,$fwconfig{$key}[14],$fwconfig{$key}[15],$fwconfig{$key}[16],$fwconfig{$key}[17],$fwconfig{$key}[18],$fwconfig{$key}[19],$fwconfig{$key}[20],$fwconfig{$key}[21],$fwconfig{$key}[22],$fwconfig{$key}[23],$fwconfig{$key}[24],$fwconfig{$key}[25],$fwconfig{$key}[26],$fwconfig{$key}[27]"){
$check='on';
next;
&General::writehasharray($configgroups,\%groups);
}
}
- my $key = &General::findhasharraykey(\%fwconfig);
- $fwconfig{$key}[0] = $action;
- $fwconfig{$key}[1] = "FORWARDFW";
- $fwconfig{$key}[2] = $active;
- $fwconfig{$key}[3] = $grp1;
- $fwconfig{$key}[4] = $source;
- $fwconfig{$key}[5] = $grp2;
- $fwconfig{$key}[6] = $target;
- $fwconfig{$key}[11] = $useport;
- $fwconfig{$key}[12] = $protocol;
- $fwconfig{$key}[14] = $grp3;
- $fwconfig{$key}[15] = $port;
- $fwconfig{$key}[16] = $remark;
- $fwconfig{$key}[17] = $log;
- $fwconfig{$key}[18] = $time;
- $fwconfig{$key}[19] = $time_mon;
- $fwconfig{$key}[20] = $time_tue;
- $fwconfig{$key}[21] = $time_wed;
- $fwconfig{$key}[22] = $time_thu;
- $fwconfig{$key}[23] = $time_fri;
- $fwconfig{$key}[24] = $time_sat;
- $fwconfig{$key}[25] = $time_sun;
- $fwconfig{$key}[26] = $time_from;
- $fwconfig{$key}[27] = $time_to;
+ if ($chain eq 'FORWARDFW'){
+ my $key = &General::findhasharraykey(\%fwconfig);
+ $fwconfig{$key}[0] = $action;
+ $fwconfig{$key}[1] = $chain;
+ $fwconfig{$key}[2] = $active;
+ $fwconfig{$key}[3] = $grp1;
+ $fwconfig{$key}[4] = $source;
+ $fwconfig{$key}[5] = $grp2;
+ $fwconfig{$key}[6] = $target;
+ $fwconfig{$key}[11] = $useport;
+ $fwconfig{$key}[12] = $protocol;
+ $fwconfig{$key}[14] = $grp3;
+ $fwconfig{$key}[15] = $port;
+ $fwconfig{$key}[16] = $remark;
+ $fwconfig{$key}[17] = $log;
+ $fwconfig{$key}[18] = $time;
+ $fwconfig{$key}[19] = $time_mon;
+ $fwconfig{$key}[20] = $time_tue;
+ $fwconfig{$key}[21] = $time_wed;
+ $fwconfig{$key}[22] = $time_thu;
+ $fwconfig{$key}[23] = $time_fri;
+ $fwconfig{$key}[24] = $time_sat;
+ $fwconfig{$key}[25] = $time_sun;
+ $fwconfig{$key}[26] = $time_from;
+ $fwconfig{$key}[27] = $time_to;
+ }else{
+ my $key = &General::findhasharraykey(\%fwconfigout);
+ $fwconfigout{$key}[0] = $action;
+ $fwconfigout{$key}[1] = $chain;
+ $fwconfigout{$key}[2] = $active;
+ $fwconfigout{$key}[3] = $grp1;
+ $fwconfigout{$key}[4] = $source;
+ $fwconfigout{$key}[5] = $grp2;
+ $fwconfigout{$key}[6] = $target;
+ $fwconfigout{$key}[11] = $useport;
+ $fwconfigout{$key}[12] = $protocol;
+ $fwconfigout{$key}[14] = $grp3;
+ $fwconfigout{$key}[15] = $port;
+ $fwconfigout{$key}[16] = $remark;
+ $fwconfigout{$key}[17] = $log;
+ $fwconfigout{$key}[18] = $time;
+ $fwconfigout{$key}[19] = $time_mon;
+ $fwconfigout{$key}[20] = $time_tue;
+ $fwconfigout{$key}[21] = $time_wed;
+ $fwconfigout{$key}[22] = $time_thu;
+ $fwconfigout{$key}[23] = $time_fri;
+ $fwconfigout{$key}[24] = $time_sat;
+ $fwconfigout{$key}[25] = $time_sun;
+ $fwconfigout{$key}[26] = $time_from;
+ $fwconfigout{$key}[27] = $time_to;
+ }
+ &General::writehasharray($fwdfwconfig,\%fwconfig);
+ &General::writehasharray($outfwconfig,\%fwconfigout);
}
}
- &General::writehasharray($fwdfwconfig,\%fwconfig);
- system("/usr/local/bin/forwardfwctrl");
@prot=();
}
close(LOG);
&General::writehasharray($configgroups,\%groups);
&General::writehasharray($confignets,\%nets);
}
+sub process_p2p
+{
+ copy("/var/ipfire/outgoing/p2protocols","/var/ipfire/forward/p2protocols");
+ chmod oct('0777'), '/var/ipfire/forward/p2protocols';
+}
projects / people / teissler / ipfire-2.x.git / blobdiff