diff --git a/config/backup/includes/tor b/config/backup/includes/tor new file mode 100644 index 000000000..bff495611 --- /dev/null +++ b/config/backup/includes/tor @@ -0,0 +1,4 @@ +/etc/tor +/var/ipfire/tor +/var/lib/tor/fingerprint +/var/lib/tor/keys diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr index 38bd82a44..a2b5d83f0 100644 --- a/config/backup/includes/vdr +++ b/config/backup/includes/vdr @@ -1 +1,2 @@ /etc/vdr +/etc/sysconfig/vdr 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/ovpn/verify b/config/ovpn/verify index 72334296c..44ed1105d 100644 --- a/config/ovpn/verify +++ b/config/ovpn/verify @@ -49,7 +49,7 @@ if (-f "${General::swroot}/ovpn/ovpnconfig"){ exit 0 if ($cn eq $CN); # Compatibility code for incorrectly saved CNs. - $cn =~ s/\ /_/; + $cn =~ s/\ /_/g; exit 0 if ($cn eq $CN); } } diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index ff6d73188..25fca8db4 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -126,6 +126,7 @@ etc/rc.d/init.d/teamspeak etc/rc.d/init.d/template #etc/rc.d/init.d/tftpd etc/rc.d/init.d/tmpfs +#etc/rc.d/init.d/tor etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry etc/rc.d/init.d/upnpd 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/common/daq b/config/rootfiles/common/daq index 10ec777b2..4467545ae 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -21,7 +21,7 @@ usr/lib/daq #usr/lib/libdaq.la #usr/lib/libdaq.so usr/lib/libdaq.so.2 -usr/lib/libdaq.so.2.0.0 +usr/lib/libdaq.so.2.0.1 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a diff --git a/config/rootfiles/common/gperf b/config/rootfiles/common/gperf new file mode 100644 index 000000000..7c3a1cb61 --- /dev/null +++ b/config/rootfiles/common/gperf @@ -0,0 +1,4 @@ +#usr/bin/gperf +#usr/share/doc/gperf.html +#usr/share/info/gperf.info +#usr/share/man/man1/gperf.1 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 55cee863d..3aca59ece 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -128,6 +128,7 @@ etc/rc.d/init.d/teamspeak etc/rc.d/init.d/template #etc/rc.d/init.d/tftpd etc/rc.d/init.d/tmpfs +#etc/rc.d/init.d/tor #etc/rc.d/init.d/transmission etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index a8dac5972..8fd9b0bfc 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -32,6 +32,7 @@ usr/local/bin/squidctrl usr/local/bin/sshctrl usr/local/bin/syslogdctrl usr/local/bin/timectrl +#usr/local/bin/torctrl #usr/local/bin/tripwirectrl usr/local/bin/updxlratorctrl usr/local/bin/upnpctrl diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 2d5d42b43..5d61ec17b 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -31,6 +31,11 @@ usr/lib/ipsec/libradius.so.0.0.0 usr/lib/ipsec/libstrongswan.so usr/lib/ipsec/libstrongswan.so.0 usr/lib/ipsec/libstrongswan.so.0.0.0 +#usr/lib/ipsec/libtls.a +#usr/lib/ipsec/libtls.la +usr/lib/ipsec/libtls.so +usr/lib/ipsec/libtls.so.0 +usr/lib/ipsec/libtls.so.0.0.0 #usr/lib/ipsec/plugins usr/lib/ipsec/plugins/libstrongswan-aes.so usr/lib/ipsec/plugins/libstrongswan-attr.so @@ -39,7 +44,12 @@ usr/lib/ipsec/plugins/libstrongswan-constraints.so usr/lib/ipsec/plugins/libstrongswan-curl.so usr/lib/ipsec/plugins/libstrongswan-des.so usr/lib/ipsec/plugins/libstrongswan-dnskey.so +usr/lib/ipsec/plugins/libstrongswan-eap-identity.so +usr/lib/ipsec/plugins/libstrongswan-eap-mschapv2.so +usr/lib/ipsec/plugins/libstrongswan-eap-peap.so usr/lib/ipsec/plugins/libstrongswan-eap-radius.so +usr/lib/ipsec/plugins/libstrongswan-eap-tls.so +usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so usr/lib/ipsec/plugins/libstrongswan-fips-prf.so usr/lib/ipsec/plugins/libstrongswan-gmp.so usr/lib/ipsec/plugins/libstrongswan-hmac.so @@ -51,18 +61,22 @@ usr/lib/ipsec/plugins/libstrongswan-openssl.so usr/lib/ipsec/plugins/libstrongswan-pem.so usr/lib/ipsec/plugins/libstrongswan-pgp.so usr/lib/ipsec/plugins/libstrongswan-pkcs1.so +usr/lib/ipsec/plugins/libstrongswan-pkcs12.so usr/lib/ipsec/plugins/libstrongswan-pkcs7.so usr/lib/ipsec/plugins/libstrongswan-pkcs8.so usr/lib/ipsec/plugins/libstrongswan-pubkey.so usr/lib/ipsec/plugins/libstrongswan-random.so +usr/lib/ipsec/plugins/libstrongswan-rc2.so usr/lib/ipsec/plugins/libstrongswan-resolve.so usr/lib/ipsec/plugins/libstrongswan-revocation.so usr/lib/ipsec/plugins/libstrongswan-sha1.so usr/lib/ipsec/plugins/libstrongswan-sha2.so usr/lib/ipsec/plugins/libstrongswan-socket-default.so +usr/lib/ipsec/plugins/libstrongswan-sshkey.so usr/lib/ipsec/plugins/libstrongswan-stroke.so usr/lib/ipsec/plugins/libstrongswan-updown.so usr/lib/ipsec/plugins/libstrongswan-x509.so +usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so usr/lib/ipsec/plugins/libstrongswan-xcbc.so #usr/libexec/ipsec diff --git a/config/rootfiles/core/72/exclude b/config/rootfiles/core/72/exclude new file mode 100644 index 000000000..e8ae55d97 --- /dev/null +++ b/config/rootfiles/core/72/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases +etc/snort/snort.conf diff --git a/config/rootfiles/core/72/filelists/daq b/config/rootfiles/core/72/filelists/daq new file mode 120000 index 000000000..d0e0956f2 --- /dev/null +++ b/config/rootfiles/core/72/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/files b/config/rootfiles/core/72/filelists/files new file mode 100644 index 000000000..e8f90a120 --- /dev/null +++ b/config/rootfiles/core/72/filelists/files @@ -0,0 +1,11 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/local/bin/openvpnctrl +usr/local/bin/setddns.pl +var/ipfire/langs +var/ipfire/ovpn/verify diff --git a/config/rootfiles/core/72/filelists/i586/strongswan-padlock b/config/rootfiles/core/72/filelists/i586/strongswan-padlock new file mode 120000 index 000000000..2412824fb --- /dev/null +++ b/config/rootfiles/core/72/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/snort b/config/rootfiles/core/72/filelists/snort new file mode 120000 index 000000000..9406ce01c --- /dev/null +++ b/config/rootfiles/core/72/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/squid b/config/rootfiles/core/72/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/72/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/strongswan b/config/rootfiles/core/72/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/72/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/72/meta b/config/rootfiles/core/72/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/72/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/72/update.sh b/config/rootfiles/core/72/update.sh new file mode 100644 index 000000000..c3dc20a81 --- /dev/null +++ b/config/rootfiles/core/72/update.sh @@ -0,0 +1,69 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2013 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=72 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/ipsec stop +/etc/init.d/snort stop +/etc/init.d/squid stop + +# +#Extract files +extract_files + + +# +#Start services +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/arm b/config/rootfiles/packages/arm new file mode 100644 index 000000000..eb9d128d4 --- /dev/null +++ b/config/rootfiles/packages/arm @@ -0,0 +1,166 @@ +usr/bin/arm +#usr/share/arm +#usr/share/arm-1.4.5.0-py2.7.egg-info +usr/share/arm/TorCtl +usr/share/arm/TorCtl/GeoIPSupport.py +usr/share/arm/TorCtl/GeoIPSupport.pyc +usr/share/arm/TorCtl/PathSupport.py +usr/share/arm/TorCtl/PathSupport.pyc +usr/share/arm/TorCtl/SQLSupport.py +usr/share/arm/TorCtl/SQLSupport.pyc +usr/share/arm/TorCtl/ScanSupport.py +usr/share/arm/TorCtl/ScanSupport.pyc +usr/share/arm/TorCtl/StatsSupport.py +usr/share/arm/TorCtl/StatsSupport.pyc +usr/share/arm/TorCtl/TorCtl.py +usr/share/arm/TorCtl/TorCtl.pyc +usr/share/arm/TorCtl/TorUtil.py +usr/share/arm/TorCtl/TorUtil.pyc +usr/share/arm/TorCtl/__init__.py +usr/share/arm/TorCtl/__init__.pyc +usr/share/arm/TorCtl/example.py +usr/share/arm/TorCtl/example.pyc +usr/share/arm/__init__.py +usr/share/arm/__init__.pyc +usr/share/arm/cli +usr/share/arm/cli/__init__.py +usr/share/arm/cli/__init__.pyc +usr/share/arm/cli/configPanel.py +usr/share/arm/cli/configPanel.pyc +usr/share/arm/cli/connections +usr/share/arm/cli/connections/__init__.py +usr/share/arm/cli/connections/__init__.pyc +usr/share/arm/cli/connections/circEntry.py +usr/share/arm/cli/connections/circEntry.pyc +usr/share/arm/cli/connections/connEntry.py +usr/share/arm/cli/connections/connEntry.pyc +usr/share/arm/cli/connections/connPanel.py +usr/share/arm/cli/connections/connPanel.pyc +usr/share/arm/cli/connections/countPopup.py +usr/share/arm/cli/connections/countPopup.pyc +usr/share/arm/cli/connections/descriptorPopup.py +usr/share/arm/cli/connections/descriptorPopup.pyc +usr/share/arm/cli/connections/entries.py +usr/share/arm/cli/connections/entries.pyc +usr/share/arm/cli/controller.py +usr/share/arm/cli/controller.pyc +usr/share/arm/cli/graphing +usr/share/arm/cli/graphing/__init__.py +usr/share/arm/cli/graphing/__init__.pyc +usr/share/arm/cli/graphing/bandwidthStats.py +usr/share/arm/cli/graphing/bandwidthStats.pyc +usr/share/arm/cli/graphing/connStats.py +usr/share/arm/cli/graphing/connStats.pyc +usr/share/arm/cli/graphing/graphPanel.py +usr/share/arm/cli/graphing/graphPanel.pyc +usr/share/arm/cli/graphing/resourceStats.py +usr/share/arm/cli/graphing/resourceStats.pyc +usr/share/arm/cli/headerPanel.py +usr/share/arm/cli/headerPanel.pyc +usr/share/arm/cli/interpretorPanel.py +usr/share/arm/cli/interpretorPanel.pyc +usr/share/arm/cli/logPanel.py +usr/share/arm/cli/logPanel.pyc +usr/share/arm/cli/menu +usr/share/arm/cli/menu/__init__.py +usr/share/arm/cli/menu/__init__.pyc +usr/share/arm/cli/menu/actions.py +usr/share/arm/cli/menu/actions.pyc +usr/share/arm/cli/menu/item.py +usr/share/arm/cli/menu/item.pyc +usr/share/arm/cli/menu/menu.py +usr/share/arm/cli/menu/menu.pyc +usr/share/arm/cli/popups.py +usr/share/arm/cli/popups.pyc +usr/share/arm/cli/torrcPanel.py +usr/share/arm/cli/torrcPanel.pyc +usr/share/arm/cli/wizard.py +usr/share/arm/cli/wizard.pyc +usr/share/arm/gui +usr/share/arm/gui/__init__.py +usr/share/arm/gui/__init__.pyc +usr/share/arm/gui/arm.xml +usr/share/arm/gui/configPanel.py +usr/share/arm/gui/configPanel.pyc +usr/share/arm/gui/connections +usr/share/arm/gui/connections/__init__.py +usr/share/arm/gui/connections/__init__.pyc +usr/share/arm/gui/connections/circEntry.py +usr/share/arm/gui/connections/circEntry.pyc +usr/share/arm/gui/connections/connEntry.py +usr/share/arm/gui/connections/connEntry.pyc +usr/share/arm/gui/connections/connPanel.py +usr/share/arm/gui/connections/connPanel.pyc +usr/share/arm/gui/controller.py +usr/share/arm/gui/controller.pyc +usr/share/arm/gui/generalPanel.py +usr/share/arm/gui/generalPanel.pyc +usr/share/arm/gui/graphing +usr/share/arm/gui/graphing/__init__.py +usr/share/arm/gui/graphing/__init__.pyc +usr/share/arm/gui/graphing/bandwidthStats.py +usr/share/arm/gui/graphing/bandwidthStats.pyc +usr/share/arm/gui/graphing/graphPanel.py +usr/share/arm/gui/graphing/graphPanel.pyc +usr/share/arm/gui/logPanel.py +usr/share/arm/gui/logPanel.pyc +usr/share/arm/prereq.py +usr/share/arm/prereq.pyc +#usr/share/arm/resources +#usr/share/arm/resources/arm.1 +#usr/share/arm/resources/exitNotice +#usr/share/arm/resources/exitNotice/how_tor_works_thumb.png +#usr/share/arm/resources/exitNotice/index.html +#usr/share/arm/resources/startTor +#usr/share/arm/resources/tor-arm.desktop +#usr/share/arm/resources/tor-arm.svg +#usr/share/arm/resources/torConfigDesc.txt +#usr/share/arm/resources/torrcOverride +#usr/share/arm/resources/torrcOverride/override.c +#usr/share/arm/resources/torrcOverride/override.h +#usr/share/arm/resources/torrcOverride/override.py +#usr/share/arm/resources/torrcTemplate.txt +usr/share/arm/settings.cfg +usr/share/arm/starter.py +usr/share/arm/starter.pyc +usr/share/arm/test.py +usr/share/arm/test.pyc +#usr/share/arm/uninstall +usr/share/arm/util +usr/share/arm/util/__init__.py +usr/share/arm/util/__init__.pyc +usr/share/arm/util/conf.py +usr/share/arm/util/conf.pyc +usr/share/arm/util/connections.py +usr/share/arm/util/connections.pyc +usr/share/arm/util/enum.py +usr/share/arm/util/enum.pyc +usr/share/arm/util/gtkTools.py +usr/share/arm/util/gtkTools.pyc +usr/share/arm/util/hostnames.py +usr/share/arm/util/hostnames.pyc +usr/share/arm/util/log.py +usr/share/arm/util/log.pyc +usr/share/arm/util/panel.py +usr/share/arm/util/panel.pyc +usr/share/arm/util/procName.py +usr/share/arm/util/procName.pyc +usr/share/arm/util/procTools.py +usr/share/arm/util/procTools.pyc +usr/share/arm/util/sysTools.py +usr/share/arm/util/sysTools.pyc +usr/share/arm/util/textInput.py +usr/share/arm/util/textInput.pyc +usr/share/arm/util/torConfig.py +usr/share/arm/util/torConfig.pyc +usr/share/arm/util/torInterpretor.py +usr/share/arm/util/torInterpretor.pyc +usr/share/arm/util/torTools.py +usr/share/arm/util/torTools.pyc +usr/share/arm/util/uiTools.py +usr/share/arm/util/uiTools.pyc +usr/share/arm/version.py +usr/share/arm/version.pyc +#usr/share/doc/arm +#usr/share/doc/arm/armrc.sample +#usr/share/man/man1/arm.1.gz diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor new file mode 100644 index 000000000..8eb6dad17 --- /dev/null +++ b/config/rootfiles/packages/tor @@ -0,0 +1,31 @@ +#etc/logrotate.d +etc/logrotate.d/tor +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/local/bin/torctrl +#usr/share/doc/tor +#usr/share/doc/tor/tor-gencert.html +#usr/share/doc/tor/tor-resolve.html +#usr/share/doc/tor/tor.html +#usr/share/doc/tor/torify.html +#usr/share/man/man1/tor-gencert.1 +#usr/share/man/man1/tor-resolve.1 +#usr/share/man/man1/tor.1 +#usr/share/man/man1/torify.1 +usr/share/tor +usr/share/tor/defaults-torrc +usr/share/tor/geoip +var/ipfire/backup/addons/includes/tor +var/ipfire/menu.d/EX-tor.menu +var/ipfire/tor +var/ipfire/tor/settings +var/ipfire/tor/torrc +var/lib/tor +var/log/tor diff --git a/config/tor/defaults-torrc b/config/tor/defaults-torrc new file mode 100644 index 000000000..703d821fe --- /dev/null +++ b/config/tor/defaults-torrc @@ -0,0 +1,3 @@ +DataDirectory /var/lib/tor +User nobody +Log notice syslog diff --git a/config/tor/tor.logrotate b/config/tor/tor.logrotate new file mode 100644 index 000000000..49fe00294 --- /dev/null +++ b/config/tor/tor.logrotate @@ -0,0 +1,13 @@ +/var/log/tor/*.log { + daily + rotate 5 + compress + delaycompress + missingok + notifempty + create 0640 nobody nobody + sharedscripts + postrotate + /etc/init.d/tor reload >/dev/null 2>&1 || : + endscript +} diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig index a1cebf10f..9c7906912 100644 --- a/config/vdr/vdr.sysconfig +++ b/config/vdr/vdr.sysconfig @@ -3,7 +3,7 @@ # The "master" options. Some examples of options you may want to set # here are -r, -t, and --rcu. See the vdr(1) man page for more info. # -VDR_OPTIONS=(--vfat) +VDR_OPTIONS=(--vfat --log=1) # VDR_PLUGIN_ORDER is a space separated list of plugins that should be # loaded in a specific order. This affects eg. the order the plugins' diff --git a/doc/language_issues.de b/doc/language_issues.de index 3b6e117ec..bbe5e1de7 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -406,6 +406,10 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor accounting period daily +WARNING: translation string unused: tor accounting period monthly +WARNING: translation string unused: tor accounting period weekly +WARNING: translation string unused: tor exit country WARNING: translation string unused: traffic back WARNING: translation string unused: traffic calc time WARNING: translation string unused: traffic calc time bad diff --git a/doc/language_issues.en b/doc/language_issues.en index 8f530a3f3..12489577b 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -437,6 +437,12 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor accounting period daily +WARNING: translation string unused: tor accounting period monthly +WARNING: translation string unused: tor accounting period weekly +WARNING: translation string unused: tor bridge enabled +WARNING: translation string unused: tor errmsg invalid node id +WARNING: translation string unused: tor exit country WARNING: translation string unused: traffic back WARNING: translation string unused: traffic calc time WARNING: translation string unused: traffic calc time bad diff --git a/doc/language_issues.es b/doc/language_issues.es index 2258d1b55..790ce1acc 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -549,6 +549,13 @@ WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn +WARNING: untranslated string: dnsforward +WARNING: untranslated string: dnsforward add a new entry +WARNING: untranslated string: dnsforward configuration +WARNING: untranslated string: dnsforward edit an entry +WARNING: untranslated string: dnsforward entries +WARNING: untranslated string: dnsforward forward_server +WARNING: untranslated string: dnsforward zone WARNING: untranslated string: emerging rules WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -618,6 +625,50 @@ 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 +WARNING: untranslated string: tor accounting interval +WARNING: untranslated string: tor accounting limit +WARNING: untranslated string: tor accounting period +WARNING: untranslated string: tor acls +WARNING: untranslated string: tor allowed subnets +WARNING: untranslated string: tor bandwidth burst +WARNING: untranslated string: tor bandwidth rate +WARNING: untranslated string: tor bandwidth settings +WARNING: untranslated string: tor bandwidth unlimited +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 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 +WARNING: untranslated string: tor errmsg invalid relay port +WARNING: untranslated string: tor errmsg invalid socks port +WARNING: untranslated string: tor exit country any +WARNING: untranslated string: tor exit nodes +WARNING: untranslated string: tor relay address +WARNING: untranslated string: tor relay configuration +WARNING: untranslated string: tor relay enabled +WARNING: untranslated string: tor relay external address +WARNING: untranslated string: tor relay fingerprint +WARNING: untranslated string: tor relay mode +WARNING: untranslated string: tor relay mode bridge +WARNING: untranslated string: tor relay mode exit +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 socks port +WARNING: untranslated string: tor stats +WARNING: untranslated string: tor traffic limit hard +WARNING: untranslated string: tor traffic limit soft +WARNING: untranslated string: tor traffic read written +WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 58f44541a..41d8d9d78 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -549,6 +549,13 @@ WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt +WARNING: untranslated string: dnsforward +WARNING: untranslated string: dnsforward add a new entry +WARNING: untranslated string: dnsforward configuration +WARNING: untranslated string: dnsforward edit an entry +WARNING: untranslated string: dnsforward entries +WARNING: untranslated string: dnsforward forward_server +WARNING: untranslated string: dnsforward zone WARNING: untranslated string: emerging rules WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -603,6 +610,50 @@ 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 +WARNING: untranslated string: tor accounting interval +WARNING: untranslated string: tor accounting limit +WARNING: untranslated string: tor accounting period +WARNING: untranslated string: tor acls +WARNING: untranslated string: tor allowed subnets +WARNING: untranslated string: tor bandwidth burst +WARNING: untranslated string: tor bandwidth rate +WARNING: untranslated string: tor bandwidth settings +WARNING: untranslated string: tor bandwidth unlimited +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 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 +WARNING: untranslated string: tor errmsg invalid relay port +WARNING: untranslated string: tor errmsg invalid socks port +WARNING: untranslated string: tor exit country any +WARNING: untranslated string: tor exit nodes +WARNING: untranslated string: tor relay address +WARNING: untranslated string: tor relay configuration +WARNING: untranslated string: tor relay enabled +WARNING: untranslated string: tor relay external address +WARNING: untranslated string: tor relay fingerprint +WARNING: untranslated string: tor relay mode +WARNING: untranslated string: tor relay mode bridge +WARNING: untranslated string: tor relay mode exit +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 socks port +WARNING: untranslated string: tor stats +WARNING: untranslated string: tor traffic limit hard +WARNING: untranslated string: tor traffic limit soft +WARNING: untranslated string: tor traffic read written +WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: upload new ruleset WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter file ext block diff --git a/doc/language_issues.nl b/doc/language_issues.nl index d7a7ff760..46838b024 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -513,6 +513,13 @@ WARNING: untranslated string: age sminute WARNING: untranslated string: age ssecond WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: dnsforward +WARNING: untranslated string: dnsforward add a new entry +WARNING: untranslated string: dnsforward configuration +WARNING: untranslated string: dnsforward edit an entry +WARNING: untranslated string: dnsforward entries +WARNING: untranslated string: dnsforward forward_server +WARNING: untranslated string: dnsforward zone WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: qos enter bandwidths @@ -520,6 +527,50 @@ 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 +WARNING: untranslated string: tor accounting interval +WARNING: untranslated string: tor accounting limit +WARNING: untranslated string: tor accounting period +WARNING: untranslated string: tor acls +WARNING: untranslated string: tor allowed subnets +WARNING: untranslated string: tor bandwidth burst +WARNING: untranslated string: tor bandwidth rate +WARNING: untranslated string: tor bandwidth settings +WARNING: untranslated string: tor bandwidth unlimited +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 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 +WARNING: untranslated string: tor errmsg invalid relay port +WARNING: untranslated string: tor errmsg invalid socks port +WARNING: untranslated string: tor exit country any +WARNING: untranslated string: tor exit nodes +WARNING: untranslated string: tor relay address +WARNING: untranslated string: tor relay configuration +WARNING: untranslated string: tor relay enabled +WARNING: untranslated string: tor relay external address +WARNING: untranslated string: tor relay fingerprint +WARNING: untranslated string: tor relay mode +WARNING: untranslated string: tor relay mode bridge +WARNING: untranslated string: tor relay mode exit +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 socks port +WARNING: untranslated string: tor stats +WARNING: untranslated string: tor traffic limit hard +WARNING: untranslated string: tor traffic limit soft +WARNING: untranslated string: tor traffic read written +WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2258d1b55..790ce1acc 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -549,6 +549,13 @@ WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn +WARNING: untranslated string: dnsforward +WARNING: untranslated string: dnsforward add a new entry +WARNING: untranslated string: dnsforward configuration +WARNING: untranslated string: dnsforward edit an entry +WARNING: untranslated string: dnsforward entries +WARNING: untranslated string: dnsforward forward_server +WARNING: untranslated string: dnsforward zone WARNING: untranslated string: emerging rules WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -618,6 +625,50 @@ 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 +WARNING: untranslated string: tor accounting interval +WARNING: untranslated string: tor accounting limit +WARNING: untranslated string: tor accounting period +WARNING: untranslated string: tor acls +WARNING: untranslated string: tor allowed subnets +WARNING: untranslated string: tor bandwidth burst +WARNING: untranslated string: tor bandwidth rate +WARNING: untranslated string: tor bandwidth settings +WARNING: untranslated string: tor bandwidth unlimited +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 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 +WARNING: untranslated string: tor errmsg invalid relay port +WARNING: untranslated string: tor errmsg invalid socks port +WARNING: untranslated string: tor exit country any +WARNING: untranslated string: tor exit nodes +WARNING: untranslated string: tor relay address +WARNING: untranslated string: tor relay configuration +WARNING: untranslated string: tor relay enabled +WARNING: untranslated string: tor relay external address +WARNING: untranslated string: tor relay fingerprint +WARNING: untranslated string: tor relay mode +WARNING: untranslated string: tor relay mode bridge +WARNING: untranslated string: tor relay mode exit +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 socks port +WARNING: untranslated string: tor stats +WARNING: untranslated string: tor traffic limit hard +WARNING: untranslated string: tor traffic limit soft +WARNING: untranslated string: tor traffic read written +WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 7b8329523..670069683 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -542,6 +542,13 @@ WARNING: untranslated string: ccd used WARNING: untranslated string: community rules WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per +WARNING: untranslated string: dnsforward +WARNING: untranslated string: dnsforward add a new entry +WARNING: untranslated string: dnsforward configuration +WARNING: untranslated string: dnsforward edit an entry +WARNING: untranslated string: dnsforward entries +WARNING: untranslated string: dnsforward forward_server +WARNING: untranslated string: dnsforward zone WARNING: untranslated string: emerging rules WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount @@ -583,6 +590,50 @@ 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 +WARNING: untranslated string: tor accounting interval +WARNING: untranslated string: tor accounting limit +WARNING: untranslated string: tor accounting period +WARNING: untranslated string: tor acls +WARNING: untranslated string: tor allowed subnets +WARNING: untranslated string: tor bandwidth burst +WARNING: untranslated string: tor bandwidth rate +WARNING: untranslated string: tor bandwidth settings +WARNING: untranslated string: tor bandwidth unlimited +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 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 +WARNING: untranslated string: tor errmsg invalid relay port +WARNING: untranslated string: tor errmsg invalid socks port +WARNING: untranslated string: tor exit country any +WARNING: untranslated string: tor exit nodes +WARNING: untranslated string: tor relay address +WARNING: untranslated string: tor relay configuration +WARNING: untranslated string: tor relay enabled +WARNING: untranslated string: tor relay external address +WARNING: untranslated string: tor relay fingerprint +WARNING: untranslated string: tor relay mode +WARNING: untranslated string: tor relay mode bridge +WARNING: untranslated string: tor relay mode exit +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 socks port +WARNING: untranslated string: tor stats +WARNING: untranslated string: tor traffic limit hard +WARNING: untranslated string: tor traffic limit soft +WARNING: untranslated string: tor traffic read written +WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 17568408d..6c4502fd6 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -510,12 +510,63 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: dnsforward +WARNING: untranslated string: dnsforward add a new entry +WARNING: untranslated string: dnsforward configuration +WARNING: untranslated string: dnsforward edit an entry +WARNING: untranslated string: dnsforward entries +WARNING: untranslated string: dnsforward forward_server +WARNING: untranslated string: dnsforward zone WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname 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 +WARNING: untranslated string: tor accounting interval +WARNING: untranslated string: tor accounting limit +WARNING: untranslated string: tor accounting period +WARNING: untranslated string: tor acls +WARNING: untranslated string: tor allowed subnets +WARNING: untranslated string: tor bandwidth burst +WARNING: untranslated string: tor bandwidth rate +WARNING: untranslated string: tor bandwidth settings +WARNING: untranslated string: tor bandwidth unlimited +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 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 +WARNING: untranslated string: tor errmsg invalid relay port +WARNING: untranslated string: tor errmsg invalid socks port +WARNING: untranslated string: tor exit country any +WARNING: untranslated string: tor exit nodes +WARNING: untranslated string: tor relay address +WARNING: untranslated string: tor relay configuration +WARNING: untranslated string: tor relay enabled +WARNING: untranslated string: tor relay external address +WARNING: untranslated string: tor relay fingerprint +WARNING: untranslated string: tor relay mode +WARNING: untranslated string: tor relay mode bridge +WARNING: untranslated string: tor relay mode exit +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 socks port +WARNING: untranslated string: tor stats +WARNING: untranslated string: tor traffic limit hard +WARNING: untranslated string: tor traffic limit soft +WARNING: untranslated string: tor traffic read written +WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_missings b/doc/language_missings index b78b367b0..3c611e617 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -60,6 +60,13 @@ < ccd used < deprecated fs warn < dns address deleted txt +< dnsforward +< dnsforward add a new entry +< dnsforward configuration +< dnsforward edit an entry +< dnsforward entries +< dnsforward forward_server +< dnsforward zone < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -109,6 +116,54 @@ < snort working < static routes < system information +< tor +< tor accounting +< tor accounting bytes +< tor accounting bytes left +< tor accounting interval +< tor accounting limit +< tor accounting period +< tor accounting period daily +< tor accounting period monthly +< tor accounting period weekly +< tor acls +< tor allowed subnets +< tor bandwidth burst +< tor bandwidth rate +< tor bandwidth settings +< tor bandwidth unlimited +< tor common settings +< tor configuration +< tor connected relays +< tor contact info +< tor enabled +< tor errmsg invalid accounting limit +< tor errmsg invalid ip or mask +< tor errmsg invalid relay address +< tor errmsg invalid relay name +< tor errmsg invalid relay port +< tor errmsg invalid socks port +< tor exit country +< tor exit country any +< tor exit nodes +< tor relay address +< tor relay configuration +< tor relay enabled +< tor relay external address +< tor relay fingerprint +< tor relay mode +< tor relay mode bridge +< tor relay mode exit +< tor relay mode private bridge +< tor relay mode relay +< tor relay nickname +< tor relay port +< tor socks port +< tor stats +< tor traffic limit hard +< tor traffic limit soft +< tor traffic read written +< tor use exit nodes < updxlrtr sources < updxlrtr standard view < upload new ruleset @@ -224,6 +279,13 @@ < ccd subnet < ccd used < deprecated fs warn +< dnsforward +< dnsforward add a new entry +< dnsforward configuration +< dnsforward edit an entry +< dnsforward entries +< dnsforward forward_server +< dnsforward zone < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -289,6 +351,54 @@ < Set time on boot < static routes < system information +< tor +< tor accounting +< tor accounting bytes +< tor accounting bytes left +< tor accounting interval +< tor accounting limit +< tor accounting period +< tor accounting period daily +< tor accounting period monthly +< tor accounting period weekly +< tor acls +< tor allowed subnets +< tor bandwidth burst +< tor bandwidth rate +< tor bandwidth settings +< tor bandwidth unlimited +< tor common settings +< tor configuration +< tor connected relays +< tor contact info +< tor enabled +< tor errmsg invalid accounting limit +< tor errmsg invalid ip or mask +< tor errmsg invalid relay address +< tor errmsg invalid relay name +< tor errmsg invalid relay port +< tor errmsg invalid socks port +< tor exit country +< tor exit country any +< tor exit nodes +< tor relay address +< tor relay configuration +< tor relay enabled +< tor relay external address +< tor relay fingerprint +< tor relay mode +< tor relay mode bridge +< tor relay mode exit +< tor relay mode private bridge +< tor relay mode relay +< tor relay nickname +< tor relay port +< tor socks port +< tor stats +< tor traffic limit hard +< tor traffic limit soft +< tor traffic read written +< tor use exit nodes < updxlrtr sources < updxlrtr standard view < uptime @@ -380,6 +490,13 @@ < ccd subnet < ccd used < deprecated fs warn +< dnsforward +< dnsforward add a new entry +< dnsforward configuration +< dnsforward edit an entry +< dnsforward entries +< dnsforward forward_server +< dnsforward zone < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -421,6 +538,54 @@ < qos enter bandwidths < server restart < static routes +< tor +< tor accounting +< tor accounting bytes +< tor accounting bytes left +< tor accounting interval +< tor accounting limit +< tor accounting period +< tor accounting period daily +< tor accounting period monthly +< tor accounting period weekly +< tor acls +< tor allowed subnets +< tor bandwidth burst +< tor bandwidth rate +< tor bandwidth settings +< tor bandwidth unlimited +< tor common settings +< tor configuration +< tor connected relays +< tor contact info +< tor enabled +< tor errmsg invalid accounting limit +< tor errmsg invalid ip or mask +< tor errmsg invalid relay address +< tor errmsg invalid relay name +< tor errmsg invalid relay port +< tor errmsg invalid socks port +< tor exit country +< tor exit country any +< tor exit nodes +< tor relay address +< tor relay configuration +< tor relay enabled +< tor relay external address +< tor relay fingerprint +< tor relay mode +< tor relay mode bridge +< tor relay mode exit +< tor relay mode private bridge +< tor relay mode relay +< tor relay nickname +< tor relay port +< tor socks port +< tor stats +< tor traffic limit hard +< tor traffic limit soft +< tor traffic read written +< tor use exit nodes < updxlrtr sources < updxlrtr standard view < uptime @@ -515,6 +680,13 @@ < day-graph < deprecated fs warn < disk access per +< dnsforward +< dnsforward add a new entry +< dnsforward configuration +< dnsforward edit an entry +< dnsforward entries +< dnsforward forward_server +< dnsforward zone < Edit an existing route < extrahd because there is already a device mounted < extrahd cant umount @@ -558,6 +730,54 @@ < qos enter bandwidths < server restart < static routes +< tor +< tor accounting +< tor accounting bytes +< tor accounting bytes left +< tor accounting interval +< tor accounting limit +< tor accounting period +< tor accounting period daily +< tor accounting period monthly +< tor accounting period weekly +< tor acls +< tor allowed subnets +< tor bandwidth burst +< tor bandwidth rate +< tor bandwidth settings +< tor bandwidth unlimited +< tor common settings +< tor configuration +< tor connected relays +< tor contact info +< tor enabled +< tor errmsg invalid accounting limit +< tor errmsg invalid ip or mask +< tor errmsg invalid relay address +< tor errmsg invalid relay name +< tor errmsg invalid relay port +< tor errmsg invalid socks port +< tor exit country +< tor exit country any +< tor exit nodes +< tor relay address +< tor relay configuration +< tor relay enabled +< tor relay external address +< tor relay fingerprint +< tor relay mode +< tor relay mode bridge +< tor relay mode exit +< tor relay mode private bridge +< tor relay mode relay +< tor relay nickname +< tor relay port +< tor socks port +< tor stats +< tor traffic limit hard +< tor traffic limit soft +< tor traffic read written +< tor use exit nodes < updxlrtr sources < updxlrtr standard view < uptime diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index d840d3946..88847a050 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -232,6 +232,7 @@ if ($settings{'ACTION'} eq '') &Header::openbigbox('100%', 'left', '', $errormessage); my %checked =(); # Checkbox manipulations +$checked{'SERVICE'}{'all-inkl.com'} = ''; $checked{'SERVICE'}{'cjb.net'} = ''; $checked{'SERVICE'}{'dhs.org'} = ''; $checked{'SERVICE'}{'dnspark.com'} = ''; @@ -327,6 +328,7 @@ print < $Lang::tr{'service'}: + $Lang::tr{'tor socks port'}: + + + + $Lang::tr{'tor relay enabled'}: + + + + + +END + + my @temp = split(",", $settings{'TOR_ALLOWED_SUBNETS'}); + $settings{'TOR_ALLOWED_SUBNETS'} = join("\n", @temp); + + @temp = split(",", $settings{'TOR_USE_EXIT_NODES'}); + $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp); + + print < +
+
+ + + + + + + + + + + + + +
$Lang::tr{'tor acls'}
+ $Lang::tr{'tor allowed subnets'}: +
+ +
+ +
+
+
+ + + + + + + + + + + + + +
$Lang::tr{'tor exit nodes'}
$Lang::tr{'tor use exit nodes'}:
+ + +
+

+END + + &Header::closebox(); + + # Tor relay box + $selected{'TOR_RELAY_MODE'}{'bridge'} = ''; + $selected{'TOR_RELAY_MODE'}{'exit'} = ''; + $selected{'TOR_RELAY_MODE'}{'private-bridge'} = ''; + $selected{'TOR_RELAY_MODE'}{'relay'} = ''; + $selected{'TOR_RELAY_MODE'}{$settings{'TOR_RELAY_MODE'}} = 'selected'; + + $selected{'TOR_RELAY_BANDWIDTH_RATE'}{'0'} = ''; + foreach (@bandwidth_limits) { + $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_} = ''; + } + $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$settings{'TOR_RELAY_BANDWIDTH_RATE'}} = 'selected'; + + $selected{'TOR_RELAY_BANDWIDTH_BURST'}{'0'} = ''; + foreach (@bandwidth_limits) { + $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_} = ''; + } + $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$settings{'TOR_RELAY_BANDWIDTH_BURST'}} = 'selected'; + + foreach (@accounting_periods) { + $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$_} = ''; + } + $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$settings{'TOR_RELAY_ACCOUNTING_PERIOD'}} = 'selected'; + + &Header::openbox('100%', 'left', $Lang::tr{'tor relay configuration'}); + + print < + + $Lang::tr{'tor relay mode'}: + + + + $Lang::tr{'tor relay nickname'}: * + + + + + + $Lang::tr{'tor relay address'}: * + + + + $Lang::tr{'tor relay port'}: + + + + + + $Lang::tr{'tor contact info'}: * + + + + + + +
+ + + + + + + + + + + + + + + + + +
$Lang::tr{'tor bandwidth settings'}
$Lang::tr{'tor bandwidth rate'}: + + $Lang::tr{'tor accounting limit'}: + +
$Lang::tr{'tor bandwidth burst'}: + + $Lang::tr{'tor accounting period'}: +
+END + + &Header::closebox(); + + print < + + + * $Lang::tr{'this field may be blank'} + +   + + + +
+ + + + + + + +
  
+END + + # If we have a control connection, show the stats. + if ($torctrl) { + &Header::openbox('100%', 'left', $Lang::tr{'tor stats'}); + + my @traffic = &TorTrafficStats($torctrl); + + if (@traffic) { + print < +END + + if ($settings{'TOR_RELAY_ENABLED'} eq 'on') { + my $fingerprint = &TorRelayFingerprint($torctrl); + if ($fingerprint) { + print < + $Lang::tr{'tor relay fingerprint'}: + + $fingerprint + + +END + } + } + + my $address = TorGetInfo($torctrl, "address"); + if ($address) { + print < + $Lang::tr{'tor relay external address'}: + $address + +END + } + + print < + $Lang::tr{'tor traffic read written'}: +END + print "" . &FormatBytes($traffic[0]) ."/". &FormatBytes($traffic[1]) . ""; + print < + +END + } + + my $accounting = &TorAccountingStats($torctrl); + if ($accounting) { + print < + + $Lang::tr{'tor accounting'} + +END + + if ($accounting->{'hibernating'} eq "hard") { + print < + + $Lang::tr{'tor traffic limit hard'} + + +END + } elsif ($accounting->{'hibernating'} eq "soft") { + print < + + $Lang::tr{'tor traffic limit soft'} + + +END + } + + print < + $Lang::tr{'tor accounting interval'} + + $accounting->{'interval-start'} - $accounting->{'interval-end'} + + + + $Lang::tr{'tor accounting bytes'} + +END + + print &FormatBytes($accounting->{'bytes_read'}) . "/" . &FormatBytes($accounting->{'bytes_written'}); + print " (" . &FormatBytes($accounting->{'bytes-left_read'}) . "/" . &FormatBytes($accounting->{'bytes-left_written'}); + print " $Lang::tr{'tor accounting bytes left'})"; + + print < + + +END + } + + my @nodes = &TorORConnStatus($torctrl); + if (@nodes) { + my $nodes_length = scalar @nodes; + print < + + $Lang::tr{'tor connected relays'} + ($nodes_length) + +END + + foreach my $node (@nodes) { + print < + + + $node->{'name'} + + + +END + + if (exists($node->{'country_code'})) { + print "$node->{"; + } + + print <$node->{'address'}:$node->{'port'} + + + ~$node->{'bandwidth_string'} + + +END + } + print ""; + } + + &Header::closebox(); + } + + print "\n"; + + &Header::closebigbox(); + &Header::closepage(); +} + +sub BuildConfiguration() { + my %settings = (); + &General::readhash("${General::swroot}/tor/settings", \%settings); + + my $torrc = "${General::swroot}/tor/torrc"; + + open(FILE, ">$torrc"); + + # Global settings. + print FILE "ControlPort $TOR_CONTROL_PORT\n"; + + if ($settings{'TOR_ENABLED'} eq 'on') { + my $strict_nodes = 0; + + print FILE "SocksPort 0.0.0.0:$settings{'TOR_SOCKS_PORT'}\n"; + + my @subnets = split(",", $settings{'TOR_ALLOWED_SUBNETS'}); + foreach (@subnets) { + print FILE "SocksPolicy accept $_\n" if (&General::validipandmask($_)); + } + print FILE "SocksPolicy reject *\n" if (@subnets); + + if ($settings{'TOR_EXIT_COUNTRY'} ne '') { + $strict_nodes = 1; + + print FILE "ExitNodes {$settings{'TOR_EXIT_COUNTRY'}}\n"; + } + + if ($settings{'TOR_USE_EXIT_NODES'} ne '') { + $strict_nodes = 1; + + my @nodes = split(",", $settings{'TOR_USE_EXIT_NODES'}); + foreach (@nodes) { + print FILE "ExitNode $_\n"; + } + } + + if ($strict_nodes > 0) { + print FILE "StrictNodes 1\n"; + } + } + + if ($settings{'TOR_RELAY_ENABLED'} eq 'on') { + # Reject access to private networks. + print FILE "ExitPolicyRejectPrivate 1\n"; + + print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n"; + + if ($settings{'TOR_RELAY_ADDRESS'} ne '') { + print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n"; + } + + if ($settings{'TOR_RELAY_NICKNAME'} ne '') { + print FILE "Nickname $settings{'TOR_RELAY_NICKNAME'}\n"; + } + + if ($settings{'TOR_RELAY_CONTACT_INFO'} ne '') { + print FILE "ContactInfo $settings{'TOR_RELAY_CONTACT_INFO'}\n"; + } + + # Limit to bridge mode. + my $is_bridge = 0; + + if ($settings{'TOR_RELAY_MODE'} eq 'bridge') { + $is_bridge++; + + # Private bridge. + } elsif ($settings{'TOR_RELAY_MODE'} eq 'private-bridge') { + $is_bridge++; + + print FILE "PublishServerDescriptor 0\n"; + + # Exit node. + } elsif ($settings{'TOR_RELAY_MODE'} eq 'exit') { + print FILE "ExitPolicy accept *:*\n"; + + # Relay only. + } elsif ($settings{'TOR_RELAY_MODE'} eq 'relay') { + print FILE "ExitPolicy reject *:*\n"; + } + + if ($is_bridge > 0) { + print FILE "BridgeRelay 1\n"; + print FILE "Exitpolicy reject *:*\n"; + } + + if ($settings{'TOR_RELAY_BANDWIDTH_RATE'} > 0) { + print FILE "RelayBandwidthRate "; + print FILE $settings{'TOR_RELAY_BANDWIDTH_RATE'} / 8; + print FILE " KB\n"; + + if ($settings{'TOR_RELAY_BANDWIDTH_BURST'} > 0) { + print FILE "RelayBandwidthBurst "; + print FILE $settings{'TOR_RELAY_BANDWIDTH_BURST'} / 8; + print FILE " KB\n"; + } + } + + if ($settings{'TOR_RELAY_ACCOUNTING_LIMIT'} > 0) { + print FILE "AccountingMax ".$settings{'TOR_RELAY_ACCOUNTING_LIMIT'}." MB\n"; + + if ($settings{'TOR_RELAY_ACCOUNTING_PERIOD'} eq 'daily') { + print FILE "AccountingStart day 00:00\n"; + } elsif ($settings{'TOR_RELAY_ACCOUNTING_PERIOD'} eq 'weekly') { + print FILE "AccountingStart week 1 00:00\n"; + } elsif ($settings{'TOR_RELAY_ACCOUNTING_PERIOD'} eq 'monthly') { + print FILE "AccountingStart month 1 00:00\n"; + } + } + } + + close(FILE); + + # Restart the service. + if (($settings{'TOR_ENABLED'} eq 'on') || ($settings{'TOR_RELAY_ENABLED'} eq 'on')) { + system("/usr/local/bin/torctrl restart &>/dev/null"); + } else { + system("/usr/local/bin/torctrl stop &>/dev/null"); + } +} + +sub TorConnect() { + my $socket = new IO::Socket::INET( + Proto => 'tcp', PeerAddr => '127.0.0.1', PeerPort => $TOR_CONTROL_PORT, + ) or return; + + $socket->autoflush(1); + + # Authenticate. + &TorSendCommand($socket, "AUTHENTICATE"); + + return $socket; +} + +sub TorSendCommand() { + my ($socket, $cmd) = @_; + + # Replace line ending with \r\n. + chomp $cmd; + $cmd .= "\r\n"; + + $socket->send($cmd); + + my @output = (); + while (my $line = <$socket>) { + # Skip empty lines. + if ($line =~ /^.\r\n$/) { + next; + } + + # Command has been successfully executed. + if ($line =~ /250 OK/) { + last; + + # Error. + } elsif ($line =~ /^5\d+/) { + last; + + } else { + # Remove line endings. + $line =~ s/\r\n$//; + + push(@output, $line); + } + } + + return @output; +} + +sub TorSendCommandOneLine() { + my ($tor, $cmd) = @_; + + my @output = &TorSendCommand($tor, $cmd); + return $output[0]; +} + +sub TorGetInfo() { + my ($tor, $cmd) = @_; + + my $output = &TorSendCommandOneLine($tor, "GETINFO ".$cmd); + + my ($key, $value) = split("=", $output); + return $value; +} + +sub TorClose() { + my $socket = shift; + + if ($socket) { + $socket->shutdown(2); + } +} + +sub TorTrafficStats() { + my $tor = shift; + + my $output_read = &TorGetInfo($tor, "traffic/read"); + my $output_written = &TorGetInfo($tor, "traffic/written"); + + return ($output_read, $output_written); +} + +sub TorRelayFingerprint() { + my $tor = shift; + + return &TorGetInfo($tor, "fingerprint"); +} + +sub TorORConnStatus() { + my $tor = shift; + my @nodes = (); + + my @output = &TorSendCommand($tor, "GETINFO orconn-status"); + foreach (@output) { + $_ =~ s/^250[\+-]orconn-status=//; + next if ($_ eq ""); + last if ($_ eq "."); + next unless ($_ =~ /^\$/); + + my @line = split(" ", $_); + my @node = split(/[=~]/, $line[0]); + + my $node = &TorNodeDescription($tor, $node[0]); + if ($node) { + push(@nodes, $node); + } + } + + # Sort by names. + @nodes = sort { $a->{'name'} cmp $b->{'name'} } @nodes; + + return @nodes; +} + +sub TorNodeDescription() { + my ($tor, $fingerprint) = @_; + $fingerprint =~ s/\$//; + + my $node = { + fingerprint => $fingerprint, + exit_node => 0, + }; + + my @output = &TorSendCommand($tor, "GETINFO ns/id/$node->{'fingerprint'}"); + + foreach (@output) { + # Router + if ($_ =~ /^r (\w+) (.*) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) (\d+)/) { + $node->{'name'} = $1; + $node->{'address'} = $3; + $node->{'port'} = $4; + + my $country_code = &TorGetInfo($tor, "ip-to-country/$node->{'address'}"); + $node->{'country_code'} = $country_code; + + # Flags + } elsif ($_ =~ /^s (.*)$/) { + $node->{'flags'} = split(" ", $1); + + foreach my $flag ($node->{'flags'}) { + if ($flag eq "Exit") { + $node->{'exit_node'}++; + } + } + + # Bandwidth + } elsif ($_ =~ /^w Bandwidth=(\d+)/) { + $node->{'bandwidth'} = $1 * 8; + $node->{'bandwidth_string'} = &FormatBitsPerSecond($node->{'bandwidth'}); + } + } + + if (exists($node->{'name'})) { + return $node; + } +} + +sub TorAccountingStats() { + my $tor = shift; + my $ret = {}; + + my $enabled = &TorGetInfo($tor, "accounting/enabled"); + if ($enabled ne '1') { + return; + } + + my @cmds = ("hibernating", "interval-start", "interval-end"); + foreach (@cmds) { + $ret->{$_} = &TorGetInfo($tor, "accounting/$_"); + } + + my @cmds = ("bytes", "bytes-left"); + foreach (@cmds) { + my $output = &TorGetInfo($tor, "accounting/$_"); + my @bytes = split(" ", $output); + + $ret->{$_."_read"} = $bytes[0]; + $ret->{$_."_written"} = $bytes[1]; + } + + return $ret; +} + +sub FormatBytes() { + my $bytes = shift; + + my @units = ("B", "KB", "MB", "GB", "TB"); + my $units_index = 0; + + while (($units_index <= $#units) && ($bytes >= 1024)) { + $units_index++; + $bytes /= 1024; + } + + return sprintf("%.2f %s", $bytes, $units[$units_index]); +} + +sub FormatBitsPerSecond() { + my $bits = shift; + + my @units = ("Bit/s", "KBit/s", "MBit/s", "GBit/s", "TBit/s"); + my $units_index = 0; + + while (($units_index <= $#units) && ($bits >= 1024)) { + $units_index++; + $bits /= 1024; + } + + return sprintf("%.2f %s", $bits, $units[$units_index]); +} diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 26f179341..58645c39c 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -316,9 +316,16 @@ sub writeipsecfiles { foreach my $j (@ints) { foreach my $k (@groups) { if ($comma != 0) { print CONF ","; } else { $comma = 1; } - print CONF "$i-$j-modp$k"; - } + + my @l = split("", $k); + if ($l[0] eq "e") { + shift @l; + print CONF "$i-$j-ecp".join("", @l); + } else { + print CONF "$i-$j-modp$k"; + } } + } } if ($lconfighash{$key}[24] eq 'on') { #only proposed algorythms? print CONF "!\n"; @@ -339,7 +346,12 @@ sub writeipsecfiles { foreach my $k (@groups) { if ($comma != 0) { print CONF ","; } else { $comma = 1; } if ($pfs eq "on") { - $modp = "-modp$k"; + my @l = split("", $k); + if ($l[0] eq "e") { + $modp = ""; + } else { + $modp = "-modp$k"; + } } else { $modp = ""; } @@ -411,7 +423,7 @@ sub writeipsecfiles { # Hook to regenerate the configuration files. if ($ENV{"REMOTE_ADDR"} eq "") { - writeipsecfiles; + writeipsecfiles(); exit(0); } @@ -1828,7 +1840,7 @@ END #use default advanced value $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[18]; $cgiparams{'IKE_INTEGRITY'} = 'sha2_256|sha|md5'; #[19]; - $cgiparams{'IKE_GROUPTYPE'} = '8192|6144|4096|3072|2048|1536|1024'; #[20]; + $cgiparams{'IKE_GROUPTYPE'} = '4096|3072|2048|1536|1024'; #[20]; $cgiparams{'IKE_LIFETIME'} = '3'; #[16]; $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[21]; $cgiparams{'ESP_INTEGRITY'} = 'sha2_256|sha1|md5'; #[22]; @@ -2111,7 +2123,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(1024|1536|2048|3072|4096|6144|8192)$/) { + if ($val !~ /^(e521|e384|e256|e224|e192|1024|1536|2048|3072|4096|6144|8192)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2147,6 +2159,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || } } if ($cgiparams{'ESP_GROUPTYPE'} ne '' && + $cgiparams{'ESP_GROUPTYPE'} !~ /^ecp(192|224|256|384|512)$/ && $cgiparams{'ESP_GROUPTYPE'} !~ /^modp(1024|1536|2048|3072|4096|6144|8192)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; @@ -2305,6 +2318,11 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $Lang::tr{'ike grouptype'}