tor.cgi: Check for valid port numbers.

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 6f76ef6467dcc6aacdfa82e84c2d4a4a9412afdb..8f23c51be3b82b346afff427e68f5e97c1b87832 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -486,7 +486,6 @@ WARNING: translation string unused: too long 80 char max
 WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
-WARNING: translation string unused: tor errmsg invalid relay name
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 611041a7771ac7e9c2cf7ca63b3269510d71e52c..93502081696966dfecf220afd9454981747bb12e 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -519,7 +519,6 @@ WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
 WARNING: translation string unused: tor errmsg invalid node id
-WARNING: translation string unused: tor errmsg invalid relay name
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time

diff --git a/doc/language_issues.es b/doc/language_issues.es
index a09c507fde720e6a01d2841ff848587a1b642f73..68a04b7a3066e99c9e338dda5a756a8eb385b6d4 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -828,6 +828,9 @@ 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 name
+WARNING: untranslated string: tor errmsg invalid relay port
+WARNING: untranslated string: tor errmsg invalid socks port
 WARNING: untranslated string: tor exit country any
 WARNING: untranslated string: tor exit nodes
 WARNING: untranslated string: tor relay address

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index bcc871bc486ea0ce307ab224a3c3aae576fb46f2..3fc2b778a7b6dded203a16d0ede7789d56e53cba 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -819,6 +819,9 @@ 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 name
+WARNING: untranslated string: tor errmsg invalid relay port
+WARNING: untranslated string: tor errmsg invalid socks port
 WARNING: untranslated string: tor exit country any
 WARNING: untranslated string: tor exit nodes
 WARNING: untranslated string: tor relay address

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 5b44a0c6e90d7d0c7a3f6f7966891f77b12af7ce..492660453f9c40983fc32728a23c466499638075 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -736,6 +736,9 @@ 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 name
+WARNING: untranslated string: tor errmsg invalid relay port
+WARNING: untranslated string: tor errmsg invalid socks port
 WARNING: untranslated string: tor exit country any
 WARNING: untranslated string: tor exit nodes
 WARNING: untranslated string: tor relay address

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index a09c507fde720e6a01d2841ff848587a1b642f73..68a04b7a3066e99c9e338dda5a756a8eb385b6d4 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -828,6 +828,9 @@ 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 name
+WARNING: untranslated string: tor errmsg invalid relay port
+WARNING: untranslated string: tor errmsg invalid socks port
 WARNING: untranslated string: tor exit country any
 WARNING: untranslated string: tor exit nodes
 WARNING: untranslated string: tor relay address

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 203d1b5e72efcfc99453d762f4b355f3821cd17f..6481328a1564901427a54f6700bc7515f9971622 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -799,6 +799,9 @@ 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 name
+WARNING: untranslated string: tor errmsg invalid relay port
+WARNING: untranslated string: tor errmsg invalid socks port
 WARNING: untranslated string: tor exit country any
 WARNING: untranslated string: tor exit nodes
 WARNING: untranslated string: tor relay address

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index e1fd0161126e3f926393d8e32e6f46c1a089d5ba..65ee68377521c41d10b03cabbc9729a38ac552a7 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -732,6 +732,9 @@ 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 name
+WARNING: untranslated string: tor errmsg invalid relay port
+WARNING: untranslated string: tor errmsg invalid socks port
 WARNING: untranslated string: tor exit country any
 WARNING: untranslated string: tor exit nodes
 WARNING: untranslated string: tor relay address

diff --git a/doc/language_missings b/doc/language_missings
index 857b73b6b7ddd93ee83f2d7780828bd6c747c9ba..bbea66c8e144728c4fd81a77263d6529f83fac63 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -351,6 +351,8 @@
 < tor enabled
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay name
+< tor errmsg invalid relay port
+< tor errmsg invalid socks port
 < tor exit country
 < tor exit country any
 < tor exit nodes
@@ -756,6 +758,8 @@
 < tor enabled
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay name
+< tor errmsg invalid relay port
+< tor errmsg invalid socks port
 < tor exit country
 < tor exit country any
 < tor exit nodes
@@ -1113,6 +1117,8 @@
 < tor enabled
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay name
+< tor errmsg invalid relay port
+< tor errmsg invalid socks port
 < tor exit country
 < tor exit country any
 < tor exit nodes
@@ -1475,6 +1481,8 @@
 < tor enabled
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay name
+< tor errmsg invalid relay port
+< tor errmsg invalid socks port
 < tor exit country
 < tor exit country any
 < tor exit nodes

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 14eac4e728db21be3e70e493bd5d52a4f1618be6..ed8964cdbd8f989dfd9812ff9462451e43bbd11b 100644 (file)
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -101,6 +101,14 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                $errormessage = "$Lang::tr{'tor errmsg invalid relay name'}: $settings{'TOR_RELAY_NICKNAME'}";
        }
 
+       if (!&General::validport($settings{'TOR_SOCKS_PORT'})) {
+               $errormessage = "$Lang::tr{'tor errmsg invalid socks port'}: $settings{'TOR_SOCKS_PORT'}";
+       }
+
+       if (!&General::validport($settings{'TOR_RELAY_PORT'})) {
+               $errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}";
+       }
+
        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 314441711daea2e8ed8f6cba9597d7a251d389bc..9a97b8c769a3d9979614ec7bc3be731a548c5deb 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1994,6 +1994,8 @@
 'tor enabled' => 'Tor einschalten',
 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',
 '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',
 'tor exit country' => 'Exit-Land',
 'tor exit country any' => 'Beliebig',
 'tor exit nodes' => 'Exit-Nodes',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 56119e96ae0ee90bcd9816baf1a37805c2d8f588..8475850dffd234d55aca447d4067d962971350ce 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2022,6 +2022,8 @@
 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
 'tor errmsg invalid node id' => 'Invalid node ID',
 'tor errmsg invalid relay name' => 'Invalid relay nickname',
+'tor errmsg invalid relay port' => 'Invalid relay port',
+'tor errmsg invalid socks port' => 'Invalid SOCKS port',
 'tor exit country' => 'Exit country',
 'tor exit country any' => 'Any country',
 'tor exit nodes' => 'Exit Nodes',