From 1427a2931e9d0dae0119066655158fca22a2f83a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 2 Aug 2013 11:27:14 +0200 Subject: [PATCH] tor.cgi: Check for valid accounting limit. --- doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 4 ++++ html/cgi-bin/tor.cgi | 4 ++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 10 files changed, 16 insertions(+) diff --git a/doc/language_issues.es b/doc/language_issues.es index 42543a211e..7669f8bfcc 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -827,6 +827,7 @@ WARNING: untranslated string: tor connected relays 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 accounting limit 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 diff --git a/doc/language_issues.fr b/doc/language_issues.fr index ac8dd35898..bab4e21fb4 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -818,6 +818,7 @@ WARNING: untranslated string: tor connected relays 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 accounting limit 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 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 479455aea1..4848c2a5b8 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -735,6 +735,7 @@ WARNING: untranslated string: tor connected relays 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 accounting limit 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 diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 42543a211e..7669f8bfcc 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -827,6 +827,7 @@ WARNING: untranslated string: tor connected relays 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 accounting limit 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 diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 419fe95765..42514e7d2c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -798,6 +798,7 @@ WARNING: untranslated string: tor connected relays 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 accounting limit 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 diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7c24233684..ab20a3c809 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -731,6 +731,7 @@ WARNING: untranslated string: tor connected relays 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 accounting limit 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 diff --git a/doc/language_missings b/doc/language_missings index ccd6557ddc..3fcfcf4ecb 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -349,6 +349,7 @@ < tor contact info < tor do not advertise relay < tor enabled +< tor errmsg invalid accounting limit < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -757,6 +758,7 @@ < tor contact info < tor do not advertise relay < tor enabled +< tor errmsg invalid accounting limit < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -1117,6 +1119,7 @@ < tor contact info < tor do not advertise relay < tor enabled +< tor errmsg invalid accounting limit < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -1482,6 +1485,7 @@ < tor contact info < tor do not advertise relay < tor enabled +< tor errmsg invalid accounting limit < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 59f1cc01c6..28d8bf7ef1 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -116,6 +116,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { } } + if ($settings{'TOR_RELAY_ACCOUNTING_LIMIT'} !~ /^\d+$/) { + $errormessage = "$Lang::tr{'tor errmsg invalid accounting limit'}: $settings{'TOR_RELAY_ACCOUNTING_LIMIT'}"; + } + 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 a5a17fc007..fbc9c6f860 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1992,6 +1992,7 @@ 'tor contact info' => 'Kontaktinformationen', 'tor do not advertise relay' => 'Relay nicht announcieren', 'tor enabled' => 'Tor einschalten', +'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit', '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.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 80d956170f..e78735cce3 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2019,6 +2019,7 @@ 'tor contact info' => 'Contact Info', 'tor do not advertise relay' => 'Do not advertise the relay', 'tor enabled' => 'Enable Tor', +'tor errmsg invalid accounting limit' => 'Invalid accounting limit', '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', -- 2.39.5