webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

tor.cgi: Check for valid relay address.

Browse Source
This commit is contained in:
Michael Tremer
2013-08-02 11:22:52 +02:00
parent 818f47d06f
commit bd8b033078
10 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/language_issues.es
View File

@@ -645,6 +645,7 @@ WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor do not advertise relay
WARNING: untranslated string: tor enabled WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid ip or mask 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 WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: tor errmsg invalid relay port WARNING: untranslated string: tor errmsg invalid relay port
WARNING: untranslated string: tor errmsg invalid socks port WARNING: untranslated string: tor errmsg invalid socks port

1
doc/language_issues.fr
View File

@@ -630,6 +630,7 @@ WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor do not advertise relay
WARNING: untranslated string: tor enabled WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid ip or mask 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 WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: tor errmsg invalid relay port WARNING: untranslated string: tor errmsg invalid relay port
WARNING: untranslated string: tor errmsg invalid socks port WARNING: untranslated string: tor errmsg invalid socks port

1
doc/language_issues.nl
View File

@@ -547,6 +547,7 @@ WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor do not advertise relay
WARNING: untranslated string: tor enabled WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid ip or mask 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 WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: tor errmsg invalid relay port WARNING: untranslated string: tor errmsg invalid relay port
WARNING: untranslated string: tor errmsg invalid socks port WARNING: untranslated string: tor errmsg invalid socks port

1
doc/language_issues.pl
View File

@@ -645,6 +645,7 @@ WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor do not advertise relay
WARNING: untranslated string: tor enabled WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid ip or mask 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 WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: tor errmsg invalid relay port WARNING: untranslated string: tor errmsg invalid relay port
WARNING: untranslated string: tor errmsg invalid socks port WARNING: untranslated string: tor errmsg invalid socks port

1
doc/language_issues.ru
View File

@@ -610,6 +610,7 @@ WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor do not advertise relay
WARNING: untranslated string: tor enabled WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid ip or mask 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 WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: tor errmsg invalid relay port WARNING: untranslated string: tor errmsg invalid relay port
WARNING: untranslated string: tor errmsg invalid socks port WARNING: untranslated string: tor errmsg invalid socks port

1
doc/language_issues.tr
View File

@@ -543,6 +543,7 @@ WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor do not advertise relay
WARNING: untranslated string: tor enabled WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid ip or mask 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 WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: tor errmsg invalid relay port WARNING: untranslated string: tor errmsg invalid relay port
WARNING: untranslated string: tor errmsg invalid socks port WARNING: untranslated string: tor errmsg invalid socks port

4
doc/language_missings
View File

@@ -139,6 +139,7 @@
< tor do not advertise relay < tor do not advertise relay
< tor enabled < tor enabled
< tor errmsg invalid ip or mask < tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name < tor errmsg invalid relay name
< tor errmsg invalid relay port < tor errmsg invalid relay port
< tor errmsg invalid socks port < tor errmsg invalid socks port
@@ -373,6 +374,7 @@
< tor do not advertise relay < tor do not advertise relay
< tor enabled < tor enabled
< tor errmsg invalid ip or mask < tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name < tor errmsg invalid relay name
< tor errmsg invalid relay port < tor errmsg invalid relay port
< tor errmsg invalid socks port < tor errmsg invalid socks port
@@ -559,6 +561,7 @@
< tor do not advertise relay < tor do not advertise relay
< tor enabled < tor enabled
< tor errmsg invalid ip or mask < tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name < tor errmsg invalid relay name
< tor errmsg invalid relay port < tor errmsg invalid relay port
< tor errmsg invalid socks port < tor errmsg invalid socks port
@@ -750,6 +753,7 @@
< tor do not advertise relay < tor do not advertise relay
< tor enabled < tor enabled
< tor errmsg invalid ip or mask < tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name < tor errmsg invalid relay name
< tor errmsg invalid relay port < tor errmsg invalid relay port
< tor errmsg invalid socks port < tor errmsg invalid socks port

7
html/cgi-bin/tor.cgi
View File

@@ -73,6 +73,7 @@ if (&Header::blue_used()) {
$settings{'TOR_RELAY_ENABLED'} = 'off'; $settings{'TOR_RELAY_ENABLED'} = 'off';
$settings{'TOR_RELAY_MODE'} = 'exit'; $settings{'TOR_RELAY_MODE'} = 'exit';
$settings{'TOR_RELAY_ADDRESS'} = '';
$settings{'TOR_RELAY_PORT'} = 9001; $settings{'TOR_RELAY_PORT'} = 9001;
$settings{'TOR_RELAY_NICKNAME'} = ''; $settings{'TOR_RELAY_NICKNAME'} = '';
$settings{'TOR_RELAY_CONTACT_INFO'} = ''; $settings{'TOR_RELAY_CONTACT_INFO'} = '';
@@ -109,6 +110,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
$errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}"; $errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}";
} }
if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) {
$errormessage = "$Lang::tr{'tor errmsg invalid relay address'}: $settings{'TOR_RELAY_ADDRESS'}";
}
}
my @temp = split(/[\n,]/,$settings{'TOR_ALLOWED_SUBNETS'}); my @temp = split(/[\n,]/,$settings{'TOR_ALLOWED_SUBNETS'});
$settings{'TOR_ALLOWED_SUBNETS'} = ""; $settings{'TOR_ALLOWED_SUBNETS'} = "";
foreach (@temp) { foreach (@temp) {

1
langs/de/cgi-bin/de.pl
View File

@@ -1820,6 +1820,7 @@
'tor do not advertise relay' => 'Relay nicht announcieren', 'tor do not advertise relay' => 'Relay nicht announcieren',
'tor enabled' => 'Tor einschalten', 'tor enabled' => 'Tor einschalten',
'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz', '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.', 'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.',
'tor errmsg invalid relay port' => 'Ungültiger Relay-Port', 'tor errmsg invalid relay port' => 'Ungültiger Relay-Port',
'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port', 'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port',

1
langs/en/cgi-bin/en.pl
View File

@@ -1856,6 +1856,7 @@
'tor enabled' => 'Enable Tor', 'tor enabled' => 'Enable Tor',
'tor errmsg invalid ip or mask' => 'Invalid IP subnet', 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
'tor errmsg invalid node id' => 'Invalid node ID', 'tor errmsg invalid node id' => 'Invalid node ID',
'tor errmsg invalid relay address' => 'Invalid relay address',
'tor errmsg invalid relay name' => 'Invalid relay nickname', 'tor errmsg invalid relay name' => 'Invalid relay nickname',
'tor errmsg invalid relay port' => 'Invalid relay port', 'tor errmsg invalid relay port' => 'Invalid relay port',
'tor errmsg invalid socks port' => 'Invalid SOCKS port', 'tor errmsg invalid socks port' => 'Invalid SOCKS port',