From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 Aug 2013 09:22:52 +0000 (+0200)
Subject: tor.cgi: Check for valid relay address.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=bd8b033078e3a255285c56e4056083bf6108ebaf

tor.cgi: Check for valid relay address.
---

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 1abd23ac5..709f8beeb 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -645,6 +645,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 73159d899..365a969c1 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -630,6 +630,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 7c45d6182..a8b7b5226 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -547,6 +547,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 1abd23ac5..709f8beeb 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -645,6 +645,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 4a114a51d..3941287cf 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -610,6 +610,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 31c552df5..8e1c1887b 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -543,6 +543,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 524045f08..cd8e1ae25 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -139,6 +139,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
@@ -373,6 +374,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
@@ -559,6 +561,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
@@ -750,6 +753,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 ed8964cdb..59f1cc01c 100644
--- 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 a56b55a4d..13c79a4b4 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1820,6 +1820,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 c611204d3..9e3abe018 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1856,6 +1856,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',