From 56bf9f21747cc68a954048cb88f4ddfd79f7a0fa 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 709f8beeb3..9d241abb95 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -644,6 +644,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 365a969c1e..dffd620242 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -629,6 +629,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 a8b7b5226a..b57eaeabf2 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -546,6 +546,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 709f8beeb3..9d241abb95 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -644,6 +644,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 3941287cf9..0a468036c6 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -609,6 +609,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 8e1c1887b7..a9d565933f 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -542,6 +542,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 cd8e1ae25a..6aac6b8577 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -138,6 +138,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 @@ -373,6 +374,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 @@ -560,6 +562,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 @@ -752,6 +755,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 13c79a4b46..021682f702 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1819,6 +1819,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 9e3abe0181..2e04c468d0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1854,6 +1854,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.2