tor.cgi: Check for valid relay address.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 68a04b7a3066e99c9e338dda5a756a8eb385b6d4..42543a211ebfacbace24220167c271d84e6ce270 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -828,6 +828,7 @@ WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid ip or mask
+WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name
 WARNING: untranslated string: tor errmsg invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 3fc2b778a7b6dded203a16d0ede7789d56e53cba..ac8dd358983c0287033619d45a93ace46b8a51e3 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -819,6 +819,7 @@ WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid ip or mask
+WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name
 WARNING: untranslated string: tor errmsg invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 492660453f9c40983fc32728a23c466499638075..479455aea1214e4947f4d6b45b4574601b450125 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -736,6 +736,7 @@ WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid ip or mask
+WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name
 WARNING: untranslated string: tor errmsg invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 68a04b7a3066e99c9e338dda5a756a8eb385b6d4..42543a211ebfacbace24220167c271d84e6ce270 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -828,6 +828,7 @@ WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid ip or mask
+WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name
 WARNING: untranslated string: tor errmsg invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 6481328a1564901427a54f6700bc7515f9971622..419fe95765ca0a0d099c98bf1a0e811909040274 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -799,6 +799,7 @@ WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid ip or mask
+WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name
 WARNING: untranslated string: tor errmsg invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 65ee68377521c41d10b03cabbc9729a38ac552a7..7c2423368412db51dfb5f3f550262e98fe3af3fe 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -732,6 +732,7 @@ WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid ip or mask
+WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name
 WARNING: untranslated string: tor errmsg invalid relay port
 WARNING: untranslated string: tor errmsg invalid socks port

diff --git a/doc/language_missings b/doc/language_missings
index bbea66c8e144728c4fd81a77263d6529f83fac63..ccd6557ddc795ad48bad2b9e95f8c870e4ed930e 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -350,6 +350,7 @@
 < tor do not advertise relay
 < tor enabled
 < tor errmsg invalid ip or mask
+< tor errmsg invalid relay address
 < tor errmsg invalid relay name
 < tor errmsg invalid relay port
 < tor errmsg invalid socks port
@@ -757,6 +758,7 @@
 < tor do not advertise relay
 < tor enabled
 < tor errmsg invalid ip or mask
+< tor errmsg invalid relay address
 < tor errmsg invalid relay name
 < tor errmsg invalid relay port
 < tor errmsg invalid socks port
@@ -1116,6 +1118,7 @@
 < tor do not advertise relay
 < tor enabled
 < tor errmsg invalid ip or mask
+< tor errmsg invalid relay address
 < tor errmsg invalid relay name
 < tor errmsg invalid relay port
 < tor errmsg invalid socks port
@@ -1480,6 +1483,7 @@
 < tor do not advertise relay
 < tor enabled
 < tor errmsg invalid ip or mask
+< tor errmsg invalid relay address
 < tor errmsg invalid relay name
 < tor errmsg invalid relay port
 < tor errmsg invalid socks port

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index ed8964cdbd8f989dfd9812ff9462451e43bbd11b..59f1cc01c6842d6b915cecab768a7079483e199c 100644 (file)
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -73,6 +73,7 @@ if (&Header::blue_used()) {
 
 $settings{'TOR_RELAY_ENABLED'} = 'off';
 $settings{'TOR_RELAY_MODE'} = 'exit';
+$settings{'TOR_RELAY_ADDRESS'} = '';
 $settings{'TOR_RELAY_PORT'} = 9001;
 $settings{'TOR_RELAY_NICKNAME'} = '';
 $settings{'TOR_RELAY_CONTACT_INFO'} = '';
@@ -109,6 +110,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                $errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}";
        }
 
+       if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
+               if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) {
+                       $errormessage = "$Lang::tr{'tor errmsg invalid relay address'}: $settings{'TOR_RELAY_ADDRESS'}";
+               }
+       }
+
        my @temp = split(/[\n,]/,$settings{'TOR_ALLOWED_SUBNETS'});
        $settings{'TOR_ALLOWED_SUBNETS'} = "";
        foreach (@temp) {

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 9a97b8c769a3d9979614ec7bc3be731a548c5deb..a5a17fc0077fb3a7dc3c36fcba00c0c357644df5 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1993,6 +1993,7 @@
 'tor do not advertise relay' => 'Relay nicht announcieren',
 'tor enabled' => 'Tor einschalten',
 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',
+'tor errmsg invalid relay address' => 'Ungültige Relay-Adresse',
 'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.',
 'tor errmsg invalid relay port' => 'Ungültiger Relay-Port',
 'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8475850dffd234d55aca447d4067d962971350ce..80d956170f67c070d7c2e209a7200d0dcba349df 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2021,6 +2021,7 @@
 'tor enabled' => 'Enable Tor',
 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
 'tor errmsg invalid node id' => 'Invalid node ID',
+'tor errmsg invalid relay address' => 'Invalid relay address',
 'tor errmsg invalid relay name' => 'Invalid relay nickname',
 'tor errmsg invalid relay port' => 'Invalid relay port',
 'tor errmsg invalid socks port' => 'Invalid SOCKS port',