Development November 2017

development@lists.ipfire.org

15 participants
68 discussions

Re: Planning out Core Update 117
by ummeegge 22 Nov '17

22 Nov '17

Hi Michael, thanks for your interest. You can find in here --> https://people.ipfire.org/~ummeegge/OpenVPN-2.4/ the files and dev history . Since Core 116 have no changes in the language files, the OpenVPN Core 115 development should also be valid for the actual IPFire version (try to keep it in the forum as updated as possible)… Please CC your mails here also to development(a)lists.ipfire.org . All the best, Erik > Hi Erik, > > I'll join the testing as I am very interested in OpenVPN - N2N and road warrior for Android clients. > Sorry - I don't follow forum anymore, just the e-mail distribution list. > > Best regards, > h&m > Horace

3 5

Fwd: squid-graph and IPFire-Firewall distribution
by Matthias Fischer 21 Nov '17

21 Nov '17

Hi, sent this message/question six days ago, still got no answer. Shall I push the new 'sgraph' version so someone can take a look or shall I wait? I now use the original tarball and patch it for our needs. Best, Matthias -------- Forwarded Message -------- Subject: squid-graph and IPFire-Firewall distribution Date: Wed, 15 Nov 2017 13:09:58 -0000 From: fischerm42(a)users.sf.net Reply-To: fischerm42(a)users.sf.net To: detach8(a)users.sf.net CC: fischerm42(a)users.sf.net REPLY at https://sourceforge.net/u/fischerm42/profile/send_message - - - - - - - - - - - - - - - - - - - - - Hi, I'm one of the people who are working and maintainig the IPFire-Firewall distribution. No real programmer (IT-Technician in first order), rather a "dedicated user". Since I plan to revive and integrate 'squid-graph 3.2' version from IPCop to one of the upcoming IPFire releases, I'd like to ask if you'd mind if I adapt your code to IPFire's needs? I don't want to change anything important or essential - I just want to do (as I call it) some 'polishing' and some localisations by adding some translation strings (like: lang::tr{'STRING_TO_TRANSLATE'}), e.g.. Of course everything else - the main program - remains as it is! Integration is planned by always using the original tarball (will it be maintained in the future!?) and running a single patch against 'squid-graph'. If you want to take a look or review that patch - just contact me. Best, Matthias Fischer - - - - - - - - - - - - - - - - - - - - - This message was sent to you via the SourceForge web mail form. Replying to this email will not work, please send a message to Matthias Fischer at https://sourceforge.net/u/fischerm42/profile/send_message

1 0

[PATCH v2] show IDS rule names correctly in WebUI log
by Peter Müller 21 Nov '17

21 Nov '17

The WebUI IDS log did not display the rule name for alerts where a signature with a five digit number was triggered (some Emerging Threats signatures are using them). Changing the regular expression so it will match on five digit SIDs, too. Fixes #11519. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/logs.cgi/ids.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index 44b3abdac..98176d690 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -387,7 +387,7 @@ sub processevent } ($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport, $sid) = ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n/a"); @refs = (); - $_ =~ m/:([0-9]{1,4})\] (.*) \[\*\*\]/; + $_ =~ m/:([0-9]{1,5})\] (.*) \[\*\*\]/; $title = &Header::cleanhtml($2,"y"); } if ($_ =~ m/Classification: (.*)\] \[Priority: (\d)\]/) { -- 2.13.6

1 0

[PATCH 2/3 v3] allow changing remote syslog protocol to TCP
by Peter Müller 21 Nov '17

21 Nov '17

Add option to change remote syslog protocol to TCP, which is more reliable than UDP, but might be unsupported on older syslog servers. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/logs.cgi/config.dat | 16 ++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat index 789341dbe..ec3c2a92d 100644 --- a/html/cgi-bin/logs.cgi/config.dat +++ b/html/cgi-bin/logs.cgi/config.dat @@ -33,6 +33,7 @@ $logsettings{'LOGWATCH_KEEP'} = '56'; my @VS = ('15','50','100','150','250','500'); $logsettings{'ENABLE_REMOTELOG'} = 'off'; $logsettings{'REMOTELOG_ADDR'} = ''; +$logsettings{'REMOTELOG_PROTOCOL'} = 'udp'; $logsettings{'ACTION'} = ''; &Header::getcgihash(\%logsettings); @@ -45,6 +46,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage = $Lang::tr{'invalid logserver address'}; } + unless ($logsettings{'REMOTELOG_PROTOCOL'} =~ /^udp|tcp$/) + { + + } } unless ($logsettings{'LOGWATCH_KEEP'} =~ /^\d+$/) { @@ -69,6 +74,10 @@ $checked{'ENABLE_REMOTELOG'}{'off'} = ''; $checked{'ENABLE_REMOTELOG'}{'on'} = ''; $checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'"; +$selected{'REMOTELOG_PROTOCOL'}{'udp'} = ''; +$selected{'REMOTELOG_PROTOCOL'}{'tcp'} == ''; +$selected{'REMOTELOG_PROTOCOL'}{$logsettings{'REMOTELOG_PROTOCOL'}} = "selected='selected'"; + $checked{'LOGVIEW_REVERSE'}{'off'} = ''; $checked{'LOGVIEW_REVERSE'}{'on'} = ''; $checked{'LOGVIEW_REVERSE'}{$logsettings{'LOGVIEW_REVERSE'}} = "checked='checked'"; @@ -139,6 +148,11 @@ print <<END <tr> <td class='base'>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLE_REMOTELOG' $checked{'ENABLE_REMOTELOG'}{'on'} /></td> <td>$Lang::tr{'log server address'}</td><td><input type='text' name='REMOTELOG_ADDR' value='$logsettings{'REMOTELOG_ADDR'}' /></td> + <td>$Lang::tr{'log server protocol'}</td><td> + <select name='REMOTELOG_PROTOCOL'> + <option value='udp' $selected{'REMOTELOG_PROTOCOL'}{'udp'}>$Lang::tr{'udp less overhead'}</option> + <option value='tcp' $selected{'REMOTELOG_PROTOCOL'}{'tcp'}>$Lang::tr{'tcp more reliable'}</option> + </select></td> </tr> </table> END -- 2.13.6

2 3

[PATCH] show IDS rule names correctly in WebUI log
by Peter Müller 21 Nov '17

21 Nov '17

Fixes #11519. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/logs.cgi/ids.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index 44b3abdac..98176d690 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -387,7 +387,7 @@ sub processevent } ($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport, $sid) = ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n/a"); @refs = (); - $_ =~ m/:([0-9]{1,4})\] (.*) \[\*\*\]/; + $_ =~ m/:([0-9]{1,5})\] (.*) \[\*\*\]/; $title = &Header::cleanhtml($2,"y"); } if ($_ =~ m/Classification: (.*)\] \[Priority: (\d)\]/) { -- 2.13.6

2 3

Re: [PATCH] change Apache TLS cipher list to "Mozilla Modern"
by Wolfgang Apolinarski 20 Nov '17

20 Nov '17

Hi Michael and Peter, > > Actually I proposed that in the discussion to another patch, but > Wolfgang said that we would exclude too many systems. I still think that there might be too many clients, which do not have support for TLS 1.2. I would suggest postponing this step to next year. Also, for the modern configuration, we should edit the SSLProtocol value: SSLProtocol all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1 This allows anyone to understand that only TLSv1.2+ is supported. Regarding the re-ordering of the cipher suites: ECDHE-ECDSA is not always faster than ECDHE-RSA. It depends on the size of the EC and the RSA key. Although I'm assuming that a 4096-bit key is quite slow... I somewhere read that 2048-bit RSA is faster than 256-bit curve. We are using a 4096-bit RSA together with a 384-bit curve. Did anyone perform some measurements? > > Did you see that conversation? And I really thought that maybe my mail did not make it through after reading the patch... Best regards, Wolfgang > > On Tue, 2017-11-07 at 20:51 +0100, Peter Müller wrote: > > Change the TLS cipher list of Apache to "Mozilla Modern". > > > > ECDSA is preferred over RSA to save CPU time on both server and > > client. Clients without support for TLS 1.2 and AES will experience > > connection failures. > > > > Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> > > --- > > config/httpd/vhosts.d/ipfire-interface-ssl.conf | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf > > b/config/httpd/vhosts.d/ipfire-interface-ssl.conf > > index c9ccd5be5..d08d3d2bb 100644 > > --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf > > +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf > > @@ -9,7 +9,7 @@ > > TransferLog /var/log/httpd/access_log > > SSLEngine on > > SSLProtocol all -SSLv2 -SSLv3 > > - SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA > > -AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:EC > > DHE-ECDSA-AES256-SHA:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA2 > > 56:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-S > > HA384:ECDHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA: > > CAMELLIA128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:CAMELLIA256 > > -SHA > > + SSLCipherSuite > > + ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-EC > > + DSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES128-S > > + HA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-CHACHA20-POLY1305:ECDHE- > > + RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA25 > > + 6 > > SSLHonorCipherOrder on > > SSLCertificateFile /etc/httpd/server.crt > > SSLCertificateKeyFile /etc/httpd/server.key

7 12

[PATCH 3/3 v4] add language strings
by Peter Müller 20 Nov '17

20 Nov '17

Add language strings for changed config.dat CGI file. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- langs/de/cgi-bin/de.pl | 6 +++++- langs/en/cgi-bin/en.pl | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 4cf866a3a..67c9aacbd 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1396,6 +1396,7 @@ 'invalid loaded file' => 'Ungültige geladene Datei', 'invalid local-remote id' => 'Local-Id und Remote-Id dürfen nicht gleich sein, und müssen einem "@"-Zeichen beginnen. Dies sind leftid und rightid in der StrongSwan-Terminologie.', 'invalid logserver address' => 'Ungültige syslogd-Server-Adresse', +'invalid logserver protocol' => 'Ungültiges syslogd-Server-Übertragungsprotokoll', 'invalid mac address' => 'Ungültige MAC-Adresse', 'invalid max lease time' => 'Ungültige max. Haltezeit.', 'invalid maximum incoming size' => 'Ungültige max. ankommende Größe.', @@ -1482,7 +1483,8 @@ 'log enabled' => 'Protokoll aktiviert', 'log level' => 'Protokollierungslevel', 'log lines per page' => 'Zeilen pro Seite', -'log server address' => 'Syslog Server', +'log server address' => 'Syslog Server:', +'log server protocol' => 'Übertragungsprotokoll:', 'log settings' => 'Protokolldatei-Einstellungen', 'log summaries' => 'Protokollübersicht', 'log summary' => 'Protokollzusammenfassung', @@ -2189,6 +2191,7 @@ 'system logs' => 'Systemprotokolldateien', 'system status information' => 'System-Statusinformationen', 'ta key' => 'TLS-Authentifizierungsschlüssel', +'tcp more reliable' => 'TCP (zuverlässiger)', 'telephone not set' => 'Telefonnummer nicht angegeben.', 'template' => 'Vorlage', 'template warning' => 'Zur Einrichtung von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Entweder Sie wählen speichern und erstellen Klassen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.', @@ -2309,6 +2312,7 @@ 'tripwirewarningpolicy' => 'ACHTUNG - Ihr Policy wird neu erzeugt, anschließen wird die Datenbank neu initialisiert. Hierfür wird der Site-Key und Local-Key benötigt.', 'tuesday' => 'Dienstag', 'type' => 'Typ', +'udp less overhead' => 'UDP (geringerer Overhead)', 'umount' => 'Abmelden', 'umount removable media before to unplug' => 'Wechselmedien vor dem Entfernen unbedingt abmelden', 'unable to alter profiles while red is active' => 'Profile können nicht geändert werden, solange ROT aktiv ist.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 946aba873..1e9754b53 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1428,6 +1428,7 @@ 'invalid loaded file' => 'Invalid loaded file', 'invalid local-remote id' => 'local & remote id must not be equal and begin with a "@" sign. These are leftid and rightid in strongswan terminology.', 'invalid logserver address' => 'Invalid syslogd server address', +'invalid logserver protocol' => 'Invalid syslogd server protocol', 'invalid mac address' => 'Invalid MAC address', 'invalid max lease time' => 'Invalid max lease time.', 'invalid maximum incoming size' => 'Invalid maximum incoming size.', @@ -1515,6 +1516,7 @@ 'log level' => 'Log Level', 'log lines per page' => 'Lines per page', 'log server address' => 'Syslog server:', +'log server protocol' => 'protocol:', 'log settings' => 'Log Settings', 'log summaries' => 'Log summaries', 'log summary' => 'Log Summary', @@ -2231,6 +2233,7 @@ 'system logs' => 'System Logs', 'system status information' => 'System Status Information', 'ta key' => 'TLS-Authentification-Key', +'tcp more reliable' => 'TCP (more reliable)', 'telephone not set' => 'Telephone not set.', 'template' => 'Preset', 'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.', @@ -2354,6 +2357,7 @@ 'tripwirewarningpolicy' => 'WARNING - Your policy will be rebuild, after that your database will be reinitalised. Therefor the site-key and the local-key are neeeded.', 'tuesday' => 'Tuesday', 'type' => 'Type', +'udp less overhead' => 'UDP (less overhead)', 'umount' => 'Umount', 'umount removable media before to unplug' => 'Umount removable media before unplugging the device', 'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.', -- 2.13.6

1 0

[PATCH 2/3 v4] allow changing remote syslog protocol to TCP
by Peter Müller 20 Nov '17

20 Nov '17

Add option to change remote syslog protocol to TCP, which is more reliable than UDP, but might be unsupported on older syslog servers. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/logs.cgi/config.dat | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat index 789341dbe..aed0db9cf 100644 --- a/html/cgi-bin/logs.cgi/config.dat +++ b/html/cgi-bin/logs.cgi/config.dat @@ -33,6 +33,7 @@ $logsettings{'LOGWATCH_KEEP'} = '56'; my @VS = ('15','50','100','150','250','500'); $logsettings{'ENABLE_REMOTELOG'} = 'off'; $logsettings{'REMOTELOG_ADDR'} = ''; +$logsettings{'REMOTELOG_PROTOCOL'} = 'udp'; $logsettings{'ACTION'} = ''; &Header::getcgihash(\%logsettings); @@ -45,6 +46,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage = $Lang::tr{'invalid logserver address'}; } + unless ($logsettings{'REMOTELOG_PROTOCOL'} =~ /^udp|tcp$/) + { + $errormessage = $Lang::tr{'invalid logserver protocol'}; + } } unless ($logsettings{'LOGWATCH_KEEP'} =~ /^\d+$/) { @@ -69,6 +74,10 @@ $checked{'ENABLE_REMOTELOG'}{'off'} = ''; $checked{'ENABLE_REMOTELOG'}{'on'} = ''; $checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'"; +$selected{'REMOTELOG_PROTOCOL'}{'udp'} = ''; +$selected{'REMOTELOG_PROTOCOL'}{'tcp'} == ''; +$selected{'REMOTELOG_PROTOCOL'}{$logsettings{'REMOTELOG_PROTOCOL'}} = "selected='selected'"; + $checked{'LOGVIEW_REVERSE'}{'off'} = ''; $checked{'LOGVIEW_REVERSE'}{'on'} = ''; $checked{'LOGVIEW_REVERSE'}{$logsettings{'LOGVIEW_REVERSE'}} = "checked='checked'"; @@ -139,6 +148,11 @@ print <<END <tr> <td class='base'>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLE_REMOTELOG' $checked{'ENABLE_REMOTELOG'}{'on'} /></td> <td>$Lang::tr{'log server address'}</td><td><input type='text' name='REMOTELOG_ADDR' value='$logsettings{'REMOTELOG_ADDR'}' /></td> + <td>$Lang::tr{'log server protocol'}</td><td> + <select name='REMOTELOG_PROTOCOL'> + <option value='udp' $selected{'REMOTELOG_PROTOCOL'}{'udp'}>$Lang::tr{'udp less overhead'}</option> + <option value='tcp' $selected{'REMOTELOG_PROTOCOL'}{'tcp'}>$Lang::tr{'tcp more reliable'}</option> + </select></td> </tr> </table> END -- 2.13.6

1 0

[PATCH 1/3 v4] allow remote syslog via TCP in syslogdctrl.c
by Peter Müller 20 Nov '17

20 Nov '17

Make syslogctrl.c use TCP as remote logging file if specified so. Thanks to Michael for reviewing this. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- src/misc-progs/syslogdctrl.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c index 52719023e..83727162e 100644 --- a/src/misc-progs/syslogdctrl.c +++ b/src/misc-progs/syslogdctrl.c @@ -27,18 +27,19 @@ #define ERR_ANY 1 #define ERR_SETTINGS 2 /* error in settings file */ #define ERR_ETC 3 /* error with /etc permissions */ -#define ERR_CONFIG 4 /* error updated sshd_config */ +#define ERR_CONFIG 4 /* error updating syslogd config */ #define ERR_SYSLOG 5 /* error restarting syslogd */ int main(void) { - char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE]; + char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE], protocol[STRING_SIZE]; char varmessages[STRING_SIZE], asynclog[STRING_SIZE]; int config_fd,rc,fd,pid; struct stat st; struct keyvalue *kv = NULL; memset(buffer, 0, STRING_SIZE); memset(hostname, 0, STRING_SIZE); + memset(protocol, 0, STRING_SIZE); memset(varmessages, 0, STRING_SIZE); memset(asynclog, 0, STRING_SIZE); @@ -67,6 +68,12 @@ int main(void) exit(ERR_SETTINGS); } + if (!findkey(kv, "REMOTELOG_PROTOCOL", protocol)) + { + /* fall back to UDP if no protocol was given */ + protocol = "udp"; + } + if (strspn(hostname, VALID_FQDN) != strlen(hostname)) { fprintf(stderr, "Bad REMOTELOG_ADDR: %s\n", hostname); @@ -106,9 +113,24 @@ int main(void) } if (!strcmp(buffer,"on")) - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@\$.\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + { + /* check which transmission protocol was given */ + if (strcmp(protocol, "tcp") == 0) + { + /* write line for TCP */ + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@@\$.\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + } + else + { + /* write line for UDP */ + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@\$.\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + } + } else + { + /* if remote syslog has been disabled */ snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@.\\+\$$/#\\1/' /etc/syslog.conf >&%d", config_fd ); + } /* if the return code isn't 0 failsafe */ if ((rc = unpriv_system(buffer,99,99)) != 0) -- 2.13.6

1 0

[PATCH v2] add GeoIP and rDNS information to used nameservers
by Peter Müller 20 Nov '17

20 Nov '17

Add GeoIP and rDNS information to DNS nameserver list at netexternal.cgi Use newly implemented GeoIP function in /var/ipfire/geoip-functions.pl Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/netexternal.cgi | 27 ++++++++++++++++++++++++++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index 299612d4c..4393393e0 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -25,9 +25,12 @@ use strict; #use warnings; #use CGI::Carp 'fatalsToBrowser'; +use IO::Socket; + require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/graphs.pl"; my %color = (); @@ -99,6 +102,12 @@ if ( $querry[0] ne~ ""){ <strong>$Lang::tr{'nameserver'}</strong> </th> <th align="center"> + <strong>$Lang::tr{'country'}</strong> + </th> + <th align="center"> + <strong>$Lang::tr{'rdns'}</strong> + </th> + <th align="center"> <strong>$Lang::tr{'status'}</strong> </th> </tr> @@ -139,9 +148,25 @@ END my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'}; + # collect more information about name server (rDNS, GeoIP country code) + my $ccode = &GeoIP::lookup($nameserver); + my $flag_icon = &GeoIP::get_flag_icon($ccode); + + my $iaddr = inet_aton($nameserver); + my $rdns = gethostbyaddr($iaddr, AF_INET); + if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; } + print <<END; <tr bgcolor="$table_colour"> - <td>$nameserver</td> + <td> + $nameserver + </td> + <td align="center"> + <a href='country.cgi#$ccode'><img src="$flag_icon" border="0" alt="$ccode" title="$ccode" /></a> + </td> + <td align="center"> + $rdns + </td> <td bgcolor="$bgcolour" align="center"> <font color="$colour"><strong>$message</strong></font> </td> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6dff5d781..ae87464d2 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1962,6 +1962,7 @@ 'read bytes' => 'Gelesene Bytes', 'read list' => 'Liste der Leseberechtigten', 'real address' => 'Reale Addresse', +'rdns' => 'rDNS', 'reboot' => 'Neustart', 'reboot ask' => 'Neustart?', 'reboot question' => 'Extra Abfrage bei neustart und herunterfahren einschalten', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 4efff6e65..3af17d5dc 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1997,6 +1997,7 @@ 'quick playlist' => 'Quick Playlist', 'ram' => 'RAM', 'random number generator daemon' => 'Random Number Generator Daemon', +'rdns' => 'rDNS', 'read bytes' => 'Read Bytes', 'read list' => 'list with readonly hosts', 'real address' => 'Real Address', -- 2.13.6

2 4

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development November 2017