From 818f47d06f0b2126428e8702c5930b9b44c73cc1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 2 Aug 2013 11:20:53 +0200 Subject: [PATCH] tor.cgi: Check for valid port numbers. --- doc/language_issues.de | 1 - doc/language_issues.en | 1 - doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 8 ++++++++ html/cgi-bin/tor.cgi | 8 ++++++++ langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 38 insertions(+), 2 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 5336bbfd7..bbe5e1de7 100644 --- 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 9d59bf593..12489577b 100644 --- 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 8adc0f4ef..1abd23ac5 100644 --- 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 b5361a7b4..73159d899 100644 --- 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 febebf9d1..7c45d6182 100644 --- 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 8adc0f4ef..1abd23ac5 100644 --- 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 47c2da477..4a114a51d 100644 --- 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 6679e73b3..31c552df5 100644 --- 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 195b1df0a..524045f08 100644 --- 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 14eac4e72..ed8964cdb 100644 --- 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 b9f1a45be..a56b55a4d 100644 --- 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 aae29af0f..c611204d3 100644 --- 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', -- 2.39.2