tor.cgi: Check for valid port numbers.

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 5336bbfd7ee189df938f75320f2b9ef041db06e9..bbe5e1de78abdaf21ae7c3d4d7e6880fbeebd9d1 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -409,7 +409,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 9d59bf593322e98491a646af8476e3eacabaa286..12489577b404c2c94ade77687e7cc8690046bbf3 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -442,7 +442,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 8adc0f4ef9d1123c7a69ed7d9ab0c940d85e5617..1abd23ac5cd00d6969a7a106ccec6ca36cebd915 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -645,6 +645,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 b5361a7b44c962457272d40dd218afec93a1316d..73159d89959b87d9be039f1fb93d0d240f9c726b 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -630,6 +630,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 febebf9d1ec2b818a8f7bb4ddda9dbd8ee4c729d..7c45d6182087893bdbffd28b78a7ce5201ce0c43 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -547,6 +547,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 8adc0f4ef9d1123c7a69ed7d9ab0c940d85e5617..1abd23ac5cd00d6969a7a106ccec6ca36cebd915 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -645,6 +645,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 47c2da4771c9c28f29b04065b0e4152ea514c450..4a114a51d4471b316e6d175a060960781d21a267 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -610,6 +610,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 6679e73b3feea7162706c456fc4e5c3577e4976a..31c552df59b617cac1aa4d7d31ef1bab33af4e79 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -543,6 +543,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 195b1df0a3551dc0c9a1a71a215b59b0226961f8..524045f08b32e02c05feae98e152c3e8a9bf91bb 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -140,6 +140,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
@@ -372,6 +374,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
@@ -556,6 +560,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
@@ -745,6 +751,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 b9f1a45be7618dc889f91d3601d8667af5d7a954..a56b55a4d9a4ebe3cc608123e206d3cf0448849f 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1821,6 +1821,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 aae29af0ff75841794cf3eed7799ff3d5cb299cd..c611204d39240b3ac3f59a315da251ab9f430429 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1857,6 +1857,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',