###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2017 Stephan Feddersen <addons@h-loit.de> #
+# Copyright (C) 2017-2019 Stephan Feddersen <sfeddersen@ipfire.org> #
# All Rights Reserved. #
# #
# This program is free software: you can redistribute it and/or modify #
# #
###############################################################################
#
-# id: wio.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen
+# Version: 2019/11/08 14:35:23
#
# This wio.cgi is based on the Code from the IPCop WIO Addon
# and is extremly adapted to work with IPFire.
#
# Autor: Stephan Feddersen
# Co-Autor: Alexander Marx
-# Co-Autor: Frank Mainz
+# Co-Autor: Frank Mainz (for some Code for the IPCop WIO Addon)
#
use strict;
my $count = 0;
my $showcount = 0;
-my ( $infomessage, $errormessage, $importmessage, $message ) = '';
+my $arpbuttontext = "$Lang::tr{'wio_show_table_on'}";
+my $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}";
+my $networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}";
+
+my ( $message, $infomessage, $errormessage, $importmessage ) = '';
my ( $buttontext, $host, $timestamp, $ipadr, $on, $remark, $dyndns, $dyndnsip, $sendemailon, $net, $dev, $iprange, $output, $write, $webinterface,
$sendemailoff, $pingmethode, $online, $color, $bgcolor, $exitcode, $id, $line, $interface, $counter, $vpnn2nip, $vpnn2nmask, $ddns, $edc,
$wiosettings{'MAILSTYLE'} = 'email';
$wiosettings{'OVPNRWMAIL'} = 'off';
$wiosettings{'SHUTDOWN'} = 'off';
+$wiosettings{'WIOGUISHOWARPTABLE'} = '';
+$wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} = '';
+$wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = '';
&Header::getcgihash(\%wiosettings);
&Header::getcgihash(\%mainsettings);
unless ( `ps -A | grep wio.pl` ) {
while ( $count < $wiosettings{'COUNT'} ) {
if ( defined($wiosettings{"USE$count"}) && $wiosettings{"USE$count"} eq 'on' ) {
- $wiosettings{'CLIENTID'} = $wiosettings{'CLIENTID$count'};
+ $wiosettings{'CLIENTID'} = $wiosettings{"CLIENTID$count"};
$wiosettings{'TIMESTAMP'} = $wiosettings{"TIMESTAMP$count"};
$wiosettings{'IPADR'} = $wiosettings{"IPADR$count"};
$wiosettings{'HOST'} = $wiosettings{"HOST$count"};
}
}
+## show / hide arptable
+
+if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable' ) {
+ unless ( `ps -A | grep wio.pl` ) {
+ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) {
+ $wiosettings{'WIOGUISHOWARPTABLE'} = 'off';
+ $arpbuttontext = "$Lang::tr{'wio_show_table_on'}";
+ }
+ else {
+ $wiosettings{'WIOGUISHOWARPTABLE'} = 'on';
+ $arpbuttontext = "$Lang::tr{'wio_show_table_off'}";
+ }
+ }
+ else {
+ $infomessage = "$Lang::tr{'wio_error_function'}";
+ }
+}
+
+## show / hide clientimporttable
+
+if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'clientimport' ) {
+ unless ( `ps -A | grep wio.pl` ) {
+ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) {
+ $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} = 'off';
+ $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}";
+ }
+ else {
+ $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} = 'on';
+ $clientimportbuttontext = "$Lang::tr{'wio_show_table_off'}";
+ }
+ }
+ else {
+ $infomessage = "$Lang::tr{'wio_error_function'}";
+ }
+}
+
+## show / hide networksearchtable
+
+if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'networksearch' ) {
+ unless ( `ps -A | grep wio.pl` ) {
+ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) {
+ $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'off';
+ $networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}";
+ }
+ else {
+ $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'on';
+ $networksearchbuttontext = "$Lang::tr{'wio_show_table_off'}";
+ }
+ }
+ else {
+ $infomessage = "$Lang::tr{'wio_error_function'}";
+ }
+}
+
## add arp client
if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_add'} ) {
}
}
-## enable / disabel client || enable / disable dyndns || enable / disable sendemailon || enable / disable sendemailoff || change ip / fqdn
+## enable / disable client || enable / disable dyndns || enable / disable sendemailon || enable / disable sendemailoff || change ip / fqdn
if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable disable client'} ) { $edc = 'on'; }
if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable disable dyndns'} ) { $edd = 'on'; }
if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_refresh'} || $wiosettings{'ACTION'} eq $Lang::tr{'wio_sc_refresh'} ) {
+unless ( `ps -A | grep wio.pl` ) {
+
if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_sc_refresh'} ) {
open(FILE, "> $onoffip");
print FILE @current[$wiosettings{'ID'}];
undef($wiosettings{'ID'});
}
-unless ( `ps -A | grep wio.pl` ) {
-
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'wio'}, 1, $refreshbox);
&Header::openbigbox('100%', 'left', '');
while ( system("/usr/local/bin/wiohelper", "&") ) {}
-exit 0;
+exit 0;
}
else {
$infomessage = "$Lang::tr{'wio_already_running'}";
+ unlink($onoffip);
}
}
$wiosettings{'HOST$count'} = gethostbyaddr(inet_aton($line[1]), AF_INET);
if ($wiosettings{'HOST$count'} eq '') { $wiosettings{'HOST$count'} = $line[1]; }
$wiosettings{'REMARK$count'} = '';
- $wiosettings{'WEBINTERFACE$count'} = '';
}
else {
$wiosettings{'HOST$count'} = $line[7];
print"infomessage: $infomessage<br />\n";
&hrline();
-
+
my $wiodebug = 0;
foreach (sort keys %wiosettings) {
print"$_ = $wiosettings{$_}<br />\n";
<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'>
<table width='100%'>
<tr>
- <td width='45%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_settings_msg'}</b></td>
+ <td width='55%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_settings_msg'}</b></td>
<td width='2%'> </td>
- <td width='53%'> </td>
+ <td width='43%'> </td>
</tr>
<tr><td colspan='3'> </td></tr>
<tr>
print "<option $selected{'TIMEOUT'}{$_}>$_</option>\n";
}
-print"
+print"
</select> $Lang::tr{'wio sec'}</td>
</tr>
<tr><td colspan='3'> </td></tr>
<td align='left'><input type='checkbox' name='CLIENTREMARK' $checked{'CLIENTREMARK'}{'on'} /></td>
</tr>
<tr><td colspan='3'> </td></tr>
-
";
if ( $wiosettings{'SENDEMAIL'} eq 'on' ) {
print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
-<tr height='20'>
- <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_wan_con'}</b></td>
- <td width='72%' align='right'> </td>
+<tr height='25'>
+ <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_wan_con'}</b></td>
+ <td width='67%' align='right'> </td>
</tr>
<tr><td colspan='2'> </td></tr>
</table>
<td width='15%' align='center'><b>$Lang::tr{'wio_wanname'}</b></td>
<td width='24%' align='center'><b>$Lang::tr{'wio_dyndns_hosts'}</b></td>
<td width='11%' align='center'><b>$Lang::tr{'wio image'}</b></td>
- <td width='14%' align='center'><b>$Lang::tr{'wio_wancheck'}</b></td>
+ <td width='14%' align='center'><b>$Lang::tr{'wio_connected'}</b></td>
</tr>
<tr bgcolor='$color{'color22'}' height='20'>
<td align='center'>01</td>
print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
-<tr height='20'>
- <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_vpn_con'}</b></td>
- <td width='72%'> </td>
+<tr height='25'>
+ <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_vpn_con'}</b></td>
+ <td width='67%'> </td>
</tr>
<tr><td colspan='2'> </td></tr>
</table>
<td width='8%' align='center'><b>$Lang::tr{'type'}</b></td>
<td width='25%' align='center'><b>$Lang::tr{'wio_common_name'}</b></td>
<td width='11%' align='center'><b>$Lang::tr{'wio image'}</b></td>
- <td width='14%' align='center'><b>$Lang::tr{'wio_ovpn_connected'}</b></td>
+ <td width='14%' align='center'><b>$Lang::tr{'wio_connected'}</b></td>
</tr>
";
<td align='center' height='20'> </td>
</tr>
";
-
+
if ($vpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') {
print"<tr".($idvpn % 2?" bgcolor='$color{'color20'}'":" bgcolor='$color{'color22'}'")." height='20'><td> </td><td colspan='16' align='left'>$vpnconfighash{$key}[25]</td></tr>";
}
print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
-<tr height='20'>
- <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_ovpn_con'}</b></td>
- <td width='72%'> </td>
+<tr height='25'>
+ <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_ovpn_con'}</b></td>
+ <td width='67%'> </td>
</tr>
<tr><td colspan='2'> </td></tr>
</table>
<td width='8%' align='center'><b>$Lang::tr{'type'}</b></td>
<td width='25%' align='center'><b>$Lang::tr{'common name'}</b></td>
<td width='11%' align='center'><b>$Lang::tr{'wio image'}</b></td>
- <td width='14%' align='center'><b>$Lang::tr{'wio_ovpn_connected'}</b></td>
+ <td width='14%' align='center'><b>$Lang::tr{'wio_connected'}</b></td>
</tr>
";
$statustxt = "$Lang::tr{'capsclosed'}";
}
else {
-
if ($ovpnconfighash{$key}[3] eq 'net') {
if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") {
my @output = "";
if ($ovpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') {
print"<tr".($idovpn % 2?" bgcolor='$color{'color20'}'":" bgcolor='$color{'color22'}'")." height='20'><td> </td><td colspan='16' align='left'>$ovpnconfighash{$key}[25]</td></tr>";
}
-
+
print"<tr height='1'><td colspan='17' bgcolor='#696565'></td></tr>";
$idovpn++
}
print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
-<tr height='20'>
- <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_clients'}</b></td>
- <td width='72%'> </td>
+<tr height='25'>
+ <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_clients'}</b></td>
+ <td width='67%'> </td>
</tr>
<tr><td colspan='2'> </td></tr>
</table>
$ic = "${_}";
foreach $interface (@devs_net) {
- next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE'));
+ next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && $netsettings{"RED_TYPE"} eq 'PPPOE');
if ( $netsettings{"$ic"."_DEV"} eq $interface ) {
if ( &General::IpInSubnet($ipaddresses[$a], $netsettings{"$ic"."_NETADDRESS"}, $netsettings{"$ic"."_NETMASK"}) ) {
print"<td align='center' height='20'><img src='$imgstatic/$devs_img[$in]' alt='$Lang::tr{$devs_alt[$in]}' title='$Lang::tr{$devs_alt[$in]}' /></td>";
}
}
- if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') {
- my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"';
- my @rednet = split ("/", $redipadr);
- chomp ($rednet[1]);
- my $red_netmask = General::iporsubtodec($rednet[1]);
- my $red_netaddress = Network::get_netaddress("$rednet[0]/$red_netmask");
-
- if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask) ) {
- print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>";
- last SWITCH;
- }
- else {
- print"<td align='center'><img align='middle' src='$imgstatic/white.png' alt='$Lang::tr{'wio_unknown_lan'}' title='$Lang::tr{'wio_unknown_lan'}' /></td>";
- last SWITCH;
- }
- }
-
if ( -e "$vpnpid" ) {
foreach $key (keys(%vpnconfighash)) {
next unless ($vpnconfighash{$key}[3] eq 'net');
-
+
my $convertip = &General::ipcidr2msk($vpnconfighash{$key}[11]);
-
+
my @net = split ("/", $convertip);
$vpnn2nip = $net[0];
@match = split ("/", $ovpnsettings{'DOVPN_SUBNET'});
if ( &General::IpInSubnet($ipaddresses[$a], $match[0], $match[1]) ) {
- print"<td align='center'><img src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>";
- last SWITCH;
+ print"<td align='center'><img src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>";
+ last SWITCH;
}
}
if ( %ovpnccdconfhash ne '' ) {
foreach $key (keys(%ovpnccdconfhash)) {
-
+
my $convertip = &General::ipcidr2msk($ovpnccdconfhash{$key}[1]);
-
my @net = split ("/", $convertip);
$vpnn2nip = $net[0];
print"<td align='center'><img align='middle' src='$imgstatic/ovpn.png' alt='OpenVPN' title='OpenVPN' /></td>";
last SWITCH;
}
-
}
}
+
+ if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) {
+ my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"';
+ my @rednet = split ("/", $redipadr);
+ chomp ($rednet[1]);
+ my $red_netmask = General::iporsubtodec($rednet[1]);
+ my $red_netaddress = Network::get_netaddress("$rednet[0]/$red_netmask");
+
+ if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask) ) {
+ print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>";
+ last SWITCH;
+ }
+ }
+ else {
+ print"<td align='center'><img align='middle' src='$imgstatic/white.png' alt='$Lang::tr{'wio_unknown_lan'}' title='$Lang::tr{'wio_unknown_lan'}' /></td>";
+ last SWITCH;
+ }
}
if ( $webinterface[$a] eq 'HTTP' ) {
print"
<table width='100%' border='0' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
<tr>
- <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_add'}</b></td>
- <td width='72%' align='right'> </td>
+ <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_add'}</b></td>
+ <td width='67%' align='right'> </td>
</tr>
<tr>
<td> </td>
print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
<tr>
- <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_arp_table_entries'}</b></td>
- <td width='72%'> </td>
+ <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_arp_table_entries'}</b></td>
+ <td width='67%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='WIOGUISHOWARPTABLE' value='arptable' /><input type='submit' name='ACTION' value='$arpbuttontext' /></form></td>
</tr>
-<tr><td colspan='2'> </td></tr>
</table>
+";
+if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'on' ) {
+
+print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
+<tr><td colspan='2'> </td></tr>
<tr bgcolor='$color{'color20'}'>
<td width='5%' align='center' height='20'><b>$Lang::tr{'wio_id'}</b></td>
<td width='20%' align='center' height='20'><b>$Lang::tr{'wio_hwaddress'}</b></td>
}
}
- if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') {
+ if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE' || $netsettings{"RED_TYPE"} eq 'STATIC') {
my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"';
my @rednet = split ("/", $redipadr);
chomp ($rednet[1]);
print"
</table>
";
+}
&hrline();
print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
<tr>
- <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_import_file'}</b></td>
- <td width='72%'> </td>
+ <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_import_file'}</b></td>
+ <td width='67%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='WIOGUISHOWCLIENTIMPORTTABLE' value='clientimport' /><input type='submit' name='ACTION' value='$clientimportbuttontext' /></form></td>
</tr>
-<tr><td colspan='2'> </td></tr>
</table>
+";
+
+if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'on' ) {
+
+print"
<table width='100%' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
+<tr><td colspan='3'> </td></tr>
<tr bgcolor='$color{'color22'}'>
<form method='post' action='/cgi-bin/wio.cgi' enctype='multipart/form-data'>
<td width='35%' align='right'>$Lang::tr{'wio_import_csv'} </td>
</tr>
</table>
";
+}
&hrline;
print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
<tr>
- <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_net_scan'}</b></td>
- <td width='72%'> </td>
+ <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_net_scan'}</b></td>
+ <td width='67%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='WIOGUISHOWNETWORKSEARCHTABLE' value='networksearch' /><input type='submit' name='ACTION' value='$networksearchbuttontext' /></form></td>
</tr>
</table>
+";
+
+if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'on' ) {
+
+print"
<table width='100%' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
<tr>
<td colspan='3'> </td>
</table>
</form>
";
-
+}
&Header::closebox();
}
############################################################################################################################
-sub SortByTunnelName
-{
- if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) {
- return -1;
- }
- elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) {
- return 1;
- }
- else {
- return 0;
- }
+sub SortByTunnelName {
+
+ if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) {
+ return -1;
+ }
+ elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) {
+ return 1;
+ }
+ else {
+ return 0;
+ }
+
}
############################################################################################################################
-sub validSave
-{
+sub validSave {
+
if ( $wiosettings{'IPADR'} eq '' && $wiosettings{'PINGMETHODE'} eq 'ip' && $wiosettings{'DYNDNS'} eq '' ) {
$errormessage = $Lang::tr{'wio_ip_empty'};
}
if ( $wiosettings{'ID'} eq '' && ! defined($errormessage) ) { $errormessage = &WIO::checkinto($wiosettings{'IPADR'}, $wiosettings{'HOST'}, @current); }
if ( $wiosettings{'REMARK'} ne '' ) { $wiosettings{'REMARK'} =~ s/,/,/g; }
+
}
projects / ipfire-2.x.git / blobdiff