From: Michael Tremer Date: Wed, 19 Dec 2018 19:47:41 +0000 (+0100) Subject: DNS Forwarding: Let UI accept hostnames, too X-Git-Tag: v2.21-core127~90 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=cb8a25e5ec4c045f634ba585012f2edf09e6be29 DNS Forwarding: Let UI accept hostnames, too Signed-off-by: Michael Tremer --- diff --git a/doc/language_issues.en b/doc/language_issues.en index 392490cb09..72a56b96d6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1121,6 +1121,7 @@ WARNING: untranslated string: invalid input for remote host/ip = Invalid input f WARNING: untranslated string: invalid input for state or province = Invalid input for state or province. WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). WARNING: untranslated string: invalid ip = Invalid IP Address +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid keep time = Keep time must be a valid number WARNING: untranslated string: invalid key = Invalid key. WARNING: untranslated string: invalid local-remote id = local & remote id must not be equal and begin with a "@" sign. These are leftid and rightid in strongswan terminology. diff --git a/doc/language_issues.es b/doc/language_issues.es index 581b99a0ab..caf8fc497c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1029,6 +1029,7 @@ WARNING: untranslated string: invalid input for dpd delay = Invalid input for DP WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec network = IPsec network diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 368f66648e..7b9119764f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -782,6 +782,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: guardian watch snort alertfile = unknown string WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: no data = unknown string WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant.
Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.

All OpenVPN clients needs then to be renewed!
WARNING: untranslated string: pakfire ago = ago. diff --git a/doc/language_issues.it b/doc/language_issues.it index 010b6cead2..301c0c28dd 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -857,6 +857,7 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 336a75a061..bbd78eeeb4 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -873,6 +873,7 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 581b99a0ab..caf8fc497c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1029,6 +1029,7 @@ WARNING: untranslated string: invalid input for dpd delay = Invalid input for DP WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec network = IPsec network diff --git a/doc/language_issues.ru b/doc/language_issues.ru index ae25fb2a29..d5a2fc3366 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1031,6 +1031,7 @@ WARNING: untranslated string: invalid input for dpd delay = Invalid input for DP WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec network = IPsec network diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 38d8a3fdea..b32d216b5c 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -784,6 +784,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: guardian watch snort alertfile = unknown string WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: no data = unknown string WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit!
Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".
WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore.
Please update to the latest IPFire version and generate a new root and host certificate.

All OpenVPN clients needs then to be renewed!
diff --git a/doc/language_missings b/doc/language_missings index 84e955d013..188455681d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -494,6 +494,7 @@ < invalid input for dpd timeout < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < ipsec < ipsec network @@ -782,6 +783,7 @@ # Checking cgi-bin translations for language: fr # ############################################################################ < dnsforward forward_servers +< invalid ip or hostname < ovpn warning rfc3280 < wlanap neighbor scan < wlanap neighbor scan warning @@ -921,6 +923,7 @@ < incoming overhead in bytes per second < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < log server protocol < masquerade blue @@ -1156,6 +1159,7 @@ < incoming overhead in bytes per second < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < log server protocol < masquerade blue @@ -1712,6 +1716,7 @@ < invalid input for dpd timeout < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < ipsec < ipsec network @@ -2430,6 +2435,7 @@ < invalid input for dpd timeout < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < ipsec < ipsec network @@ -2705,6 +2711,7 @@ < crypto warning < dnsforward forward_servers < fwdfw all subnets +< invalid ip or hostname < ovpn error dh < ovpn error md5 < ovpn warning rfc3280 diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index 9091ee1db9..521a7a20b4 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -70,8 +70,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) my @forward_servers = split(/\,/, $cgiparams{'FORWARD_SERVERS'}); foreach my $forward_server (@forward_servers) { # Check if the settings for the forward server are valid. - unless(&General::validip($forward_server)) { - $errormessage = "$Lang::tr{'invalid ip'}: $forward_server"; + unless(&General::validip($forward_server) || &General::validfqdn($forward_server)) { + $errormessage = "$Lang::tr{'invalid ip or hostname'}: $forward_server"; last; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a6fcfea7e9..0ca760f52f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1405,6 +1405,7 @@ 'invalid input for state or province' => 'Ungültige Eingabe für Bundesstaat oder Provinz.', 'invalid input for valid till days' => 'Ungültige Eingabe für Gültig bis (Tage).', 'invalid ip' => 'Ungültige IP-Adresse', +'invalid ip or hostname' => 'Ungültige IP-Addresse oder Hostname', 'invalid keep time' => 'Die Aufbewahrungszeit muss eine gültige Zahl sein', 'invalid key' => 'Ungültiger Schlüssel.', 'invalid loaded file' => 'Ungültige geladene Datei', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5bbd0c345d..465738b96c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1436,6 +1436,7 @@ 'invalid input for state or province' => 'Invalid input for state or province.', 'invalid input for valid till days' => 'Invalid input for Valid till (days).', 'invalid ip' => 'Invalid IP Address', +'invalid ip or hostname' => 'Invalid IP Address or Hostname', 'invalid keep time' => 'Keep time must be a valid number', 'invalid key' => 'Invalid key.', 'invalid loaded file' => 'Invalid loaded file',