webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 09:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tor

Browse Source 
Conflicts:
	langs/de/cgi-bin/de.pl
	lfs/tor
This commit is contained in:
Jan Paul Tuecking
2013-09-06 21:57:51 +02:00
parent cd4a82251b cd010e09a3
commit e7c69924fc
13 changed files with 72 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/packages/tor
View File

@@ -1,6 +1,9 @@
#etc/logrotate.d
etc/logrotate.d/tor
etc/rc.d/init.d/tor
etc/rc.d/rc0.d/K40tor
etc/rc.d/rc3.d/S60tor
etc/rc.d/rc6.d/K40tor
#etc/tor
etc/tor/tor-tsocks.conf
etc/tor/torrc

2
doc/language_issues.es
View File

@@ -642,6 +642,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -663,6 +664,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard

2
doc/language_issues.fr
View File

@@ -627,6 +627,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -648,6 +649,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard

2
doc/language_issues.nl
View File

@@ -544,6 +544,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -565,6 +566,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard

2
doc/language_issues.pl
View File

@@ -642,6 +642,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -663,6 +664,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard

2
doc/language_issues.ru
View File

@@ -607,6 +607,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -628,6 +629,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard

2
doc/language_issues.tr
View File

@@ -540,6 +540,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -561,6 +562,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard

8
doc/language_missings
View File

@@ -136,6 +136,7 @@
< tor configuration
< tor connected relays
< tor contact info
< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -158,6 +159,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
< tor service
< tor socks port
< tor stats
< tor traffic limit hard
@@ -371,6 +373,7 @@
< tor configuration
< tor connected relays
< tor contact info
< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -393,6 +396,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
< tor service
< tor socks port
< tor stats
< tor traffic limit hard
@@ -558,6 +562,7 @@
< tor configuration
< tor connected relays
< tor contact info
< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -580,6 +585,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
< tor service
< tor socks port
< tor stats
< tor traffic limit hard
@@ -750,6 +756,7 @@
< tor configuration
< tor connected relays
< tor contact info
< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -772,6 +779,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
< tor service
< tor socks port
< tor stats
< tor traffic limit hard

65
html/cgi-bin/ovpnmain.cgi
View File

@@ -2195,14 +2195,15 @@ else
# m.a.d net2net
###
if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf");
my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
unlink ($certfile) or die "Removing $certfile fail: $!";
unlink ($conffile) or die "Removing $conffile fail: $!";
rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!";
my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
unlink ($certfile);
unlink ($conffile);
if (-e "${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") {
rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!";
}
}
unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem");
@@ -3604,35 +3605,33 @@ if ($cgiparams{'TYPE'} eq 'net') {
}
# Check if a remote host/IP has been set for the client.
if ($cgiparams{'REMOTE'} eq '' && $cgiparams{'SIDE'} ne 'server') {
$errormessage = $Lang::tr{'invalid input for remote host/ip'};
if ($cgiparams{'TYPE'} eq 'net') {
if ($cgiparams{'SIDE'} ne 'server' && $cgiparams{'REMOTE'} eq '') {
$errormessage = $Lang::tr{'invalid input for remote host/ip'};
# Check if this is a N2N connection and drop temporary config.
if ($cgiparams{'TYPE'} eq 'net') {
unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
}
goto VPNCONF_ERROR;
}
# Check if a remote host/IP has been configured - the field can be empty on the server side.
if ($cgiparams{'REMOTE'} ne '') {
# Check if the given IP is valid - otherwise check if it is a valid domain.
if (! &General::validip($cgiparams{'REMOTE'})) {
# Check for a valid domain.
if (! &General::validfqdn ($cgiparams{'REMOTE'})) {
$errormessage = $Lang::tr{'invalid input for remote host/ip'};
# Check if this is a N2N connection and drop temporary config.
if ($cgiparams{'TYPE'} eq 'net') {
# Check if this is a N2N connection and drop temporary config.
unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
}
goto VPNCONF_ERROR;
rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
goto VPNCONF_ERROR;
}
# Check if a remote host/IP has been configured - the field can be empty on the server side.
if ($cgiparams{'REMOTE'} ne '') {
# Check if the given IP is valid - otherwise check if it is a valid domain.
if (! &General::validip($cgiparams{'REMOTE'})) {
# Check for a valid domain.
if (! &General::validfqdn ($cgiparams{'REMOTE'})) {
$errormessage = $Lang::tr{'invalid input for remote host/ip'};
# Check if this is a N2N connection and drop temporary config.
unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
goto VPNCONF_ERROR;
}
}
}
}
}
if ($cgiparams{'TYPE'} ne 'host') {

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

@@ -321,7 +321,13 @@ END
foreach my $country_name (sort @country_names) {
my $country_code = Locale::Country::country2code($country_name);
$country_code = uc($country_code);
print "<option value='$country_code'>$country_name ($country_code)</option>\n";
print "<option value='$country_code'";
if ($settings{'TOR_EXIT_COUNTRY'} eq $country_code) {
print " selected";
}
print ">$country_name ($country_code)</option>\n";
}
print <<END;

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

@@ -1840,7 +1840,7 @@
'tor relay mode relay' => 'Nur Relay',
'tor relay nickname' => 'Relay-Nickname',
'tor relay port' => 'Relay-Port',
'tor service' => 'Tor Service',
'tor service' => 'Tor-Service',
'tor socks port' => 'SOCKS-Port',
'tor stats' => 'Statistiken',
'tor traffic limit hard' => 'Das Übertragungslimit wurde erreicht.',

2
lfs/tor
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
PAK_VER = 2
PAK_VER = 3
DEPS = "libevent2"

10
src/initscripts/init.d/tor
View File

@@ -9,9 +9,13 @@
. /etc/sysconfig/rc
. ${rc_functions}
function setup_firewall() {
eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
function tor_is_enabled() {
[ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
}
function setup_firewall() {
# Flush all rules.
flush_firewall
@@ -27,6 +31,8 @@ function flush_firewall() {
case "${1}" in
start)
tor_is_enabled || exit 0
# Setup firewall.
setup_firewall