tor.cgi: Check for valid port numbers.

This commit is contained in:
Michael Tremer
2013-08-02 11:20:53 +02:00
parent b0449403e6
commit 818f47d06f
12 changed files with 38 additions and 2 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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) {

View File

@@ -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',

View File

@@ -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',