From: Michael Tremer Date: Wed, 31 Jul 2013 17:40:17 +0000 (+0200) Subject: Merge remote-tracking branch 'ms/tor' into tor X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d154ab5899fc6f380be7d42148c2803e7dc3017f;hp=6869929e9ac66287494e2da14b0634036d25e588 Merge remote-tracking branch 'ms/tor' into tor --- diff --git a/config/menu/EX-tor.menu b/config/menu/EX-tor.menu new file mode 100644 index 000000000..00ddffe8d --- /dev/null +++ b/config/menu/EX-tor.menu @@ -0,0 +1,6 @@ +$subipfire->{'50.tor'} = { + 'caption' => $Lang::tr{'tor'}, + 'uri' => '/cgi-bin/tor.cgi', + 'title' => $Lang::tr{'tor'}, + 'enabled' => 1, +}; diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index cd33ec496..8965ff70e 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -91,6 +91,7 @@ var/ipfire/menu.d/70-log.menu #var/ipfire/menu.d/EX-imspector.menu #var/ipfire/menu.d/EX-mpfire.menu #var/ipfire/menu.d/EX-samba.menu +#var/ipfire/menu.d/EX-tor.menu #var/ipfire/menu.d/EX-tripwire.menu #var/ipfire/menu.d/EX-wlanap.menu var/ipfire/modem diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index e670be2d5..8eb6dad17 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -4,10 +4,11 @@ etc/rc.d/init.d/tor #etc/tor etc/tor/tor-tsocks.conf etc/tor/torrc +srv/web/ipfire/cgi-bin/tor.cgi usr/bin/tor usr/bin/tor-gencert usr/bin/tor-resolve -usr/bin/torify +#usr/bin/torify usr/local/bin/torctrl #usr/share/doc/tor #usr/share/doc/tor/tor-gencert.html @@ -22,7 +23,7 @@ usr/share/tor usr/share/tor/defaults-torrc usr/share/tor/geoip var/ipfire/backup/addons/includes/tor -srv/web/ipfire/cgi-bin/tor.cgi +var/ipfire/menu.d/EX-tor.menu var/ipfire/tor var/ipfire/tor/settings var/ipfire/tor/torrc diff --git a/doc/language_issues.es b/doc/language_issues.es index 7756f2644..8adc0f4ef 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -625,6 +625,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 21fa1ad17..b5361a7b4 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -610,6 +610,7 @@ WARNING: untranslated string: server restart WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 3a8f682b5..febebf9d1 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -527,6 +527,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 7756f2644..8adc0f4ef 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -625,6 +625,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 324c47720..47c2da477 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -590,6 +590,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 31a18c92a..6679e73b3 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -523,6 +523,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_missings b/doc/language_missings index e47da816f..a9fa8756e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -116,6 +116,7 @@ < snort working < static routes < system information +< tor < tor accounting < tor accounting bytes < tor accounting bytes left @@ -346,6 +347,7 @@ < Set time on boot < static routes < system information +< tor < tor accounting < tor accounting bytes < tor accounting bytes left @@ -528,6 +530,7 @@ < qos enter bandwidths < server restart < static routes +< tor < tor accounting < tor accounting bytes < tor accounting bytes left @@ -715,6 +718,7 @@ < qos enter bandwidths < server restart < static routes +< tor < tor accounting < tor accounting bytes < tor accounting bytes left diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 6b4d9cc1b..0c173e0cc 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -88,9 +88,6 @@ my $warnmessage = ''; &Header::showhttpheaders(); -# Load settings from file. -&General::readhash("${General::swroot}/tor/settings", \%settings); - # Get GUI values. &Header::getcgihash(\%settings); @@ -132,6 +129,9 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { $settings{'ACTION'} = ''; } +# Load settings from file. +&General::readhash("${General::swroot}/tor/settings", \%settings); + &showMainBox(); # Close Tor control connection. @@ -171,21 +171,19 @@ sub showMainBox() { $Lang::tr{'tor enabled'}: - - - + + $Lang::tr{'tor socks port'}: + $Lang::tr{'tor relay enabled'}: - + - + END - &Header::closebox(); - if ($settings{'TOR_ENABLED'} eq 'on') { my @temp = split(",", $settings{'TOR_ALLOWED_SUBNETS'}); $settings{'TOR_ALLOWED_SUBNETS'} = join("\n", @temp); @@ -193,18 +191,10 @@ END @temp = split(",", $settings{'TOR_USE_EXIT_NODES'}); $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp); - &Header::openbox('100%', 'left', $Lang::tr{'tor configuration'}); - print < - - $Lang::tr{'tor socks port'}: - - - - - +
+
@@ -224,7 +214,9 @@ END
+
+
@@ -250,16 +242,17 @@ END print < -
+
+

END - - &Header::closebox(); } + &Header::closebox(); + if ($settings{'TOR_RELAY_ENABLED'} eq 'on') { $checked{'TOR_RELAY_NOADVERTISE'}{'on'} = ''; $checked{'TOR_RELAY_NOADVERTISE'}{'off'} = ''; @@ -516,10 +509,12 @@ END my @nodes = &TorORConnStatus($torctrl); if (@nodes) { + my $nodes_length = scalar @nodes; print < - $Lang::tr{'tor connected relays'} + $Lang::tr{'tor connected relays'} + ($nodes_length) END @@ -678,9 +673,9 @@ sub BuildConfiguration() { # Restart the service. if (($settings{'TOR_ENABLED'} eq 'on') || ($settings{'TOR_RELAY_ENABLED'} eq 'on')) { - system("/usr/local/bin/torctrl restart"); + system("/usr/local/bin/torctrl restart &>/dev/null"); } else { - system("/usr/local/bin/torctrl stop"); + system("/usr/local/bin/torctrl stop &>/dev/null"); } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 848aaefa2..a21f75ab3 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1797,6 +1797,7 @@ 'tone' => 'Ton', 'tone dial' => 'Tonwahl:', 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt', +'tor' => 'Tor', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (empfangen/gesendet)', 'tor accounting bytes left' => 'übrig', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 150411a4a..b16ecbf84 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1831,6 +1831,7 @@ 'tone' => 'Tone', 'tone dial' => 'Tone dial:', 'too long 80 char max' => ' is too long, maximum allowed is 80 characters', +'tor' => 'Tor', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (read/written)', 'tor accounting bytes left' => 'left',