Development February 2018

development@lists.ipfire.org

14 participants
33 discussions

[PATCH] Rsyslog: New advanced syslogger [TESTING]
by Erik Kapfer 27 Feb '18

27 Feb '18

Sysklogd are replaced by Rsyslogd. Reduced version with libestr libfastjson and liblogging. Rsyslog configuration: Two modules are used 'imuxsock' and 'imklog' which is the minimum to get the old sysklod ouput. Works in 'RSYSLOG_TraditionalFileFormat' which equals to the log output of the old sysklogd. Process drops his permissions to already existing 'syslogd'. A work directory has been set to /var/spool/rsyslogd. New configuration directory /etc/rsyslog.d has been introduced to. One change of the old sysklogd configuration lines needed to be done whereby ':omusrmsg:*' for emergency messages has been set. Rsyslog initscript: Set a usermod and includes 'syslogd' to 'tty' otherwise the privileges can not be reduced. Bootlog lines from sysklogd has been integrated. ToDo´s: Check if usermod in initscript is practical and if there are possible other ways. Check for really needed modules. Config for encrypted remote log server streams (there are currently no directives for this). Adapted only the configuration name in syslogdctrl.c and if pid file doesn't exists, initscript will be used for restart instead of sysklogd command. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> --- config/etc/rsyslog.conf | 74 +++++++++++++++++++++ config/etc/syslog.conf | 23 ------- config/rootfiles/common/armv5tel/initscripts | 8 +-- config/rootfiles/common/i586/initscripts | 8 +-- config/rootfiles/common/libestr | 6 ++ config/rootfiles/common/libfastjson | 13 ++++ config/rootfiles/common/liblogging | 10 +++ config/rootfiles/common/logwatch | 6 +- config/rootfiles/common/rsyslog | 42 ++++++++++++ config/rootfiles/common/stage2 | 2 +- config/rootfiles/common/sysklogd | 8 --- config/rootfiles/common/x86_64/initscripts | 8 +-- config/rootfiles/common/x86_64/stage2 | 2 +- lfs/initscripts | 6 +- lfs/libestr | 86 ++++++++++++++++++++++++ lfs/libfastjson | 86 ++++++++++++++++++++++++ lfs/liblogging | 86 ++++++++++++++++++++++++ lfs/rsyslog | 98 ++++++++++++++++++++++++++++ make.sh | 5 +- src/initscripts/system/rsyslogd | 84 ++++++++++++++++++++++++ src/initscripts/system/sysklogd | 63 ------------------ src/misc-progs/syslogdctrl.c | 20 +++--- 22 files changed, 619 insertions(+), 125 deletions(-) create mode 100644 config/etc/rsyslog.conf delete mode 100644 config/etc/syslog.conf create mode 100644 config/rootfiles/common/libestr create mode 100644 config/rootfiles/common/libfastjson create mode 100644 config/rootfiles/common/liblogging create mode 100644 config/rootfiles/common/rsyslog delete mode 100644 config/rootfiles/common/sysklogd create mode 100644 lfs/libestr create mode 100644 lfs/libfastjson create mode 100644 lfs/liblogging create mode 100644 lfs/rsyslog create mode 100644 src/initscripts/system/rsyslogd delete mode 100644 src/initscripts/system/sysklogd diff --git a/config/etc/rsyslog.conf b/config/etc/rsyslog.conf new file mode 100644 index 0000000..92a0fe4 --- /dev/null +++ b/config/etc/rsyslog.conf @@ -0,0 +1,74 @@ +# /etc/rsyslog.conf Configuration file for rsyslog. +# +# For more information see +# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html +# + +################# +#### MODULES #### +################# + +# provides support for local system logging +module(load="imuxsock") + +# provides kernel logging support (previously done by rklogd) +module(load="imklog") + +########################### +#### GLOBAL DIRECTIVES #### +########################### + +# +# Use traditional timestamp format. +# To enable high precision timestamps, comment out the following line. +# +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# Filter duplicated messages +#$RepeatedMsgReduction on + +# +# Drop privileges. +# +$PrivDropToUser syslogd +$PrivDropToGroup syslogd + +# +# Where to place spool and state files +# +$WorkDirectory /var/spool/rsyslogd + +# +# Include all config files in /etc/rsyslog.d/ +# +$IncludeConfig /etc/rsyslog.d/*.conf + +############### +#### RULES #### +############### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +# local0.* any dhcpcd log (even debug) in messages +cron.none;daemon.*;local0.*;local2.*;\ +*.info;mail.none;authpriv.* -/var/log/messages + +# Log crons +#cron.* -/var/log/cron.log + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Display logs on tty12 +*.* /dev/tty12 + +# Optionally log to a remote host +#*.* @hostname.domain + +# Postfix logs +mail.* -/var/log/mail + diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf deleted file mode 100644 index cdef756..0000000 --- a/config/etc/syslog.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Log all kernel messages to the console. -# Logging much else clutters up the screen. -#kern.* /dev/console - -# Log anything (except mail) of level info or higher. -# Don't log private authentication messages! -# local0.* any dhcpcd log (even debug) in messages -cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.* -/var/log/messages - -# Log crons -#cron.* -/var/log/cron.log - -# Everybody gets emergency messages -*.emerg * - -# Display logs on tty12 -*.* /dev/tty12 - -# Optionally log to a remote host -#*.* @hostname.domain - -# Postfix logs -mail.* -/var/log/mail diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index d3a3cf8..0d7a99b 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -79,7 +79,7 @@ etc/rc.d/init.d/static-routes etc/rc.d/init.d/swap etc/rc.d/init.d/swconfig etc/rc.d/init.d/sysctl -etc/rc.d/init.d/sysklogd +etc/rc.d/init.d/rsyslogd etc/rc.d/init.d/template etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry @@ -108,7 +108,7 @@ etc/rc.d/rc0.d/K80network etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth #etc/rc.d/rc0.d/K85messagebus -etc/rc.d/rc0.d/K90sysklogd +etc/rc.d/rc0.d/K90rsyslogd etc/rc.d/rc0.d/S60sendsignals etc/rc.d/rc0.d/S70localnet etc/rc.d/rc0.d/S80mountfs @@ -116,7 +116,7 @@ etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d etc/rc.d/rc3.d/S01vnstat -etc/rc.d/rc3.d/S10sysklogd +etc/rc.d/rc3.d/S10rsyslogd etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus @@ -157,7 +157,7 @@ etc/rc.d/rc6.d/K80network etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth #etc/rc.d/rc6.d/K85messagebus -etc/rc.d/rc6.d/K90sysklogd +etc/rc.d/rc6.d/K90rsyslogd etc/rc.d/rc6.d/S60sendsignals etc/rc.d/rc6.d/S70mountfs etc/rc.d/rc6.d/S80swap diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 67e495c..21edcc7 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -79,7 +79,7 @@ etc/rc.d/init.d/sshd etc/rc.d/init.d/static-routes etc/rc.d/init.d/swap etc/rc.d/init.d/sysctl -etc/rc.d/init.d/sysklogd +etc/rc.d/init.d/rsyslogd etc/rc.d/init.d/template etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry @@ -109,7 +109,7 @@ etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K87acpid -etc/rc.d/rc0.d/K90sysklogd +etc/rc.d/rc0.d/K90rsyslogd etc/rc.d/rc0.d/S60sendsignals etc/rc.d/rc0.d/S70localnet etc/rc.d/rc0.d/S80mountfs @@ -117,7 +117,7 @@ etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d etc/rc.d/rc3.d/S01vnstat -etc/rc.d/rc3.d/S10sysklogd +etc/rc.d/rc3.d/S10rsyslogd etc/rc.d/rc3.d/S12acpid etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus @@ -160,7 +160,7 @@ etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K87acpid -etc/rc.d/rc6.d/K90sysklogd +etc/rc.d/rc6.d/K90rsyslogd etc/rc.d/rc6.d/S60sendsignals etc/rc.d/rc6.d/S70mountfs etc/rc.d/rc6.d/S80swap diff --git a/config/rootfiles/common/libestr b/config/rootfiles/common/libestr new file mode 100644 index 0000000..d58e7a9 --- /dev/null +++ b/config/rootfiles/common/libestr @@ -0,0 +1,6 @@ +#usr/include/libestr.h +#usr/lib/libestr.la +#usr/lib/libestr.so +usr/lib/libestr.so.0 +usr/lib/libestr.so.0.0.0 +#usr/lib/pkgconfig/libestr.pc diff --git a/config/rootfiles/common/libfastjson b/config/rootfiles/common/libfastjson new file mode 100644 index 0000000..f7611e1 --- /dev/null +++ b/config/rootfiles/common/libfastjson @@ -0,0 +1,13 @@ +#usr/include/libfastjson +#usr/include/libfastjson/atomic.h +#usr/include/libfastjson/json.h +#usr/include/libfastjson/json_object.h +#usr/include/libfastjson/json_object_iterator.h +#usr/include/libfastjson/json_object_private.h +#usr/include/libfastjson/json_tokener.h +#usr/include/libfastjson/json_util.h +#usr/lib/libfastjson.la +#usr/lib/libfastjson.so +usr/lib/libfastjson.so.4 +usr/lib/libfastjson.so.4.2.0 +#usr/lib/pkgconfig/libfastjson.pc diff --git a/config/rootfiles/common/liblogging b/config/rootfiles/common/liblogging new file mode 100644 index 0000000..e51bfd9 --- /dev/null +++ b/config/rootfiles/common/liblogging @@ -0,0 +1,10 @@ +#usr/bin/stdlogctl +#usr/include/liblogging +#usr/include/liblogging/stdlog.h +#usr/lib/liblogging-stdlog.la +#usr/lib/liblogging-stdlog.so +usr/lib/liblogging-stdlog.so.0 +usr/lib/liblogging-stdlog.so.0.1.0 +#usr/lib/pkgconfig/liblogging-stdlog.pc +#usr/share/man/man1/stdlogctl.1 +#usr/share/man/man3/stdlog.3 diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch index fe67a8c..a6ec26d 100644 --- a/config/rootfiles/common/logwatch +++ b/config/rootfiles/common/logwatch @@ -56,7 +56,7 @@ usr/share/logwatch/default.conf/logfiles/samba.conf #usr/share/logwatch/default.conf/logfiles/secure.conf #usr/share/logwatch/default.conf/logfiles/sonicwall.conf #usr/share/logwatch/default.conf/logfiles/spamassassin.conf -usr/share/logwatch/default.conf/logfiles/syslog.conf +#usr/share/logwatch/default.conf/logfiles/syslog.conf #usr/share/logwatch/default.conf/logfiles/tac_acc.conf #usr/share/logwatch/default.conf/logfiles/tivoli-smc.conf #usr/share/logwatch/default.conf/logfiles/up2date.conf @@ -146,7 +146,7 @@ usr/share/logwatch/default.conf/services/postfix.conf #usr/share/logwatch/default.conf/services/qmail.conf #usr/share/logwatch/default.conf/services/raid.conf usr/share/logwatch/default.conf/services/resolver.conf -#usr/share/logwatch/default.conf/services/rsyslogd.conf +usr/share/logwatch/default.conf/services/rsyslogd.conf #usr/share/logwatch/default.conf/services/rt314.conf usr/share/logwatch/default.conf/services/samba.conf usr/share/logwatch/default.conf/services/saslauthd.conf @@ -290,7 +290,7 @@ usr/share/logwatch/scripts/services/postfix #usr/share/logwatch/scripts/services/qmail-smtpd #usr/share/logwatch/scripts/services/raid usr/share/logwatch/scripts/services/resolver -#usr/share/logwatch/scripts/services/rsyslogd +usr/share/logwatch/scripts/services/rsyslogd #usr/share/logwatch/scripts/services/rt314 usr/share/logwatch/scripts/services/samba usr/share/logwatch/scripts/services/saslauthd diff --git a/config/rootfiles/common/rsyslog b/config/rootfiles/common/rsyslog new file mode 100644 index 0000000..0eb4dd4 --- /dev/null +++ b/config/rootfiles/common/rsyslog @@ -0,0 +1,42 @@ +etc/rc.d/init.d/rsyslogd +etc/rsyslog.conf +etc/rsyslog.d +usr/bin/rscryutil +#usr/lib/rsyslog +#usr/lib/rsyslog/imklog.la +usr/lib/rsyslog/imklog.so +#usr/lib/rsyslog/immark.la +usr/lib/rsyslog/immark.so +#usr/lib/rsyslog/imtcp.la +usr/lib/rsyslog/imtcp.so +#usr/lib/rsyslog/imudp.la +usr/lib/rsyslog/imudp.so +#usr/lib/rsyslog/imuxsock.la +usr/lib/rsyslog/imuxsock.so +#usr/lib/rsyslog/lmcry_gcry.la +usr/lib/rsyslog/lmcry_gcry.so +#usr/lib/rsyslog/lmnet.la +usr/lib/rsyslog/lmnet.so +#usr/lib/rsyslog/lmnetstrms.la +usr/lib/rsyslog/lmnetstrms.so +#usr/lib/rsyslog/lmnsd_ptcp.la +usr/lib/rsyslog/lmnsd_ptcp.so +#usr/lib/rsyslog/lmregexp.la +usr/lib/rsyslog/lmregexp.so +#usr/lib/rsyslog/lmstrmsrv.la +usr/lib/rsyslog/lmstrmsrv.so +#usr/lib/rsyslog/lmtcpclt.la +usr/lib/rsyslog/lmtcpclt.so +#usr/lib/rsyslog/lmtcpsrv.la +usr/lib/rsyslog/lmtcpsrv.so +#usr/lib/rsyslog/lmzlibw.la +usr/lib/rsyslog/lmzlibw.so +#usr/lib/rsyslog/mmexternal.la +usr/lib/rsyslog/mmexternal.so +#usr/lib/rsyslog/omtesting.la +usr/lib/rsyslog/omtesting.so +usr/sbin/rsyslogd +#usr/share/man/man5/rsyslog.conf.5 +#usr/share/man/man8/rsyslogd.8 +var/log/dhcpcd.log +var/log/messages diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a5ba6ae..953255b 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -42,7 +42,7 @@ etc/profile.d/umask.sh etc/resolv.conf etc/securetty etc/sysctl.conf -etc/syslog.conf +etc/rsyslog.conf etc/system-release #home home/nobody diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd deleted file mode 100644 index f5d55c2..0000000 --- a/config/rootfiles/common/sysklogd +++ /dev/null @@ -1,8 +0,0 @@ -usr/sbin/klogd -usr/sbin/syslogd -#usr/share/man/man5/syslog.conf.5 -#usr/share/man/man8/klogd.8 -#usr/share/man/man8/sysklogd.8 -#usr/share/man/man8/syslogd.8 -var/log/dhcpcd.log -var/log/messages diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 67e495c..21edcc7 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -79,7 +79,7 @@ etc/rc.d/init.d/sshd etc/rc.d/init.d/static-routes etc/rc.d/init.d/swap etc/rc.d/init.d/sysctl -etc/rc.d/init.d/sysklogd +etc/rc.d/init.d/rsyslogd etc/rc.d/init.d/template etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry @@ -109,7 +109,7 @@ etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K87acpid -etc/rc.d/rc0.d/K90sysklogd +etc/rc.d/rc0.d/K90rsyslogd etc/rc.d/rc0.d/S60sendsignals etc/rc.d/rc0.d/S70localnet etc/rc.d/rc0.d/S80mountfs @@ -117,7 +117,7 @@ etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d etc/rc.d/rc3.d/S01vnstat -etc/rc.d/rc3.d/S10sysklogd +etc/rc.d/rc3.d/S10rsyslogd etc/rc.d/rc3.d/S12acpid etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus @@ -160,7 +160,7 @@ etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K87acpid -etc/rc.d/rc6.d/K90sysklogd +etc/rc.d/rc6.d/K90rsyslogd etc/rc.d/rc6.d/S60sendsignals etc/rc.d/rc6.d/S70mountfs etc/rc.d/rc6.d/S80swap diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index 70a33d6..b8cb01b 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -42,7 +42,7 @@ etc/profile.d/umask.sh etc/resolv.conf etc/securetty etc/sysctl.conf -etc/syslog.conf +etc/rsyslog.conf etc/system-release #home home/nobody diff --git a/lfs/initscripts b/lfs/initscripts index 9d3a52c..df6f0a5 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -92,13 +92,13 @@ $(TARGET) : install -v -m 755 $$i /etc/rc.d/helper/; \ done - ln -sf ../init.d/sysklogd /etc/rc.d/rc0.d/K90sysklogd + ln -sf ../init.d/rsyslogd /etc/rc.d/rc0.d/K90rsyslogd ln -sf ../init.d/sendsignals /etc/rc.d/rc0.d/S60sendsignals ln -sf ../init.d/localnet /etc/rc.d/rc0.d/S70localnet ln -sf ../init.d/mountfs /etc/rc.d/rc0.d/S80mountfs ln -sf ../init.d/swap /etc/rc.d/rc0.d/S90swap ln -sf ../init.d/halt /etc/rc.d/rc0.d/S99halt - ln -sf ../init.d/sysklogd /etc/rc.d/rc3.d/S10sysklogd + ln -sf ../init.d/rsyslogd /etc/rc.d/rc3.d/S10rsyslogd ln -sf ../init.d/smartenabler /etc/rc.d/rc3.d/S19smartenabler ln -sf ../init.d/messagebus /etc/rc.d/rc3.d/S15messagebus ln -sf ../init.d/messagebus /etc/rc.d/rc0.d/K85messagebus @@ -107,7 +107,7 @@ $(TARGET) : ln -sf ../init.d/bluetooth /etc/rc.d/rc0.d/K84bluetooth ln -sf ../init.d/bluetooth /etc/rc.d/rc6.d/K84bluetooth ln -sf ../init.d/cpufreq /etc/rc.d/rc3.d/S18cpufreq - ln -sf ../init.d/sysklogd /etc/rc.d/rc6.d/K90sysklogd + ln -sf ../init.d/rsyslogd /etc/rc.d/rc6.d/K90rsyslogd ln -sf ../init.d/sendsignals /etc/rc.d/rc6.d/S60sendsignals ln -sf ../init.d/mountfs /etc/rc.d/rc6.d/S70mountfs ln -sf ../init.d/swap /etc/rc.d/rc6.d/S80swap diff --git a/lfs/libestr b/lfs/libestr new file mode 100644 index 0000000..5e2d168 --- /dev/null +++ b/lfs/libestr @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# # +# This program 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. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.1.10 + +THISAPP = libestr-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libestr + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f4c9165a23587e77f7efe65d676d5e8e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static=no + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/libfastjson b/lfs/libfastjson new file mode 100644 index 0000000..80f41af --- /dev/null +++ b/lfs/libfastjson @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# # +# This program 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. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.99.8 + +THISAPP = libfastjson-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libfastjson + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = fe7b4eae1bf40499f6f92b51d7e5899e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static=no + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/liblogging b/lfs/liblogging new file mode 100644 index 0000000..22ae480 --- /dev/null +++ b/lfs/liblogging @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# # +# This program 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. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.6 + +THISAPP = liblogging-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = liblogging + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f215c7e7ac6cfd1f5dabdba08c522b29 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static=no + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/rsyslog b/lfs/rsyslog new file mode 100644 index 0000000..ebb3766 --- /dev/null +++ b/lfs/rsyslog @@ -0,0 +1,98 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# # +# This program 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. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 8.32.0 + +THISAPP = rsyslog-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = rsyslog + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 0811aad3186bcae3b2dcd92063d9eb1d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-largefile \ + --enable-usertools \ + CFLAGS="-L/lib" + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + touch /var/log/{dhcpcd.log,messages} + chmod 664 /var/log/{dhcpcd.log,messages} + chown root:syslogd /var/log/{dhcpcd.log,messages} + + # Add additional configuration directory + mkdir -v /etc/rsyslog.d + chown -R root:root /etc/rsyslog.d + chmod 755 /etc/rsyslog.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index c7b6eb8..043f0e4 100755 --- a/make.sh +++ b/make.sh @@ -1016,7 +1016,6 @@ buildbase() { lfsmake2 patch lfsmake2 psmisc lfsmake2 shadow - lfsmake2 sysklogd lfsmake2 sysvinit lfsmake2 tar lfsmake2 texinfo @@ -1142,6 +1141,10 @@ buildipfire() { lfsmake2 gdbm lfsmake2 pam lfsmake2 curl + lfsmake2 libestr + lfsmake2 liblogging + lfsmake2 libfastjson + lfsmake2 rsyslog lfsmake2 tcl lfsmake2 sqlite lfsmake2 libffi diff --git a/src/initscripts/system/rsyslogd b/src/initscripts/system/rsyslogd new file mode 100644 index 0000000..cb9e6af --- /dev/null +++ b/src/initscripts/system/rsyslogd @@ -0,0 +1,84 @@ +#!/bin/bash + +# +# Startup script for rsyslog. +# +# Short-Description: Enhanced system logging and kernel message trapping BINs +# +# $Author: ummeegge ipfire org +# $Date: 02.02.2018 +############################################################################# +# + +. /etc/sysconfig/rc +. ${rc_functions} + +NAME="rsyslogd" +BIN="/usr/sbin/${NAME}" +CONF="/etc/rsyslog.conf" +lockfile="/var/lock/subsys/${NAME}" +PIDFILE="/var/run/rsyslogd.pid" +DESC="enhanced syslogd" +SYSLOGD_OPTIONS="-i ${PIDFILE}" + +# Exit if the package is not installed +[ -x ${BIN} ] || exit 5 + +# Do not start rsyslog when sysklogd is running +if [ -e /var/run/syslogd.pid ]; then + echo "Shut down sysklogd before you run rsyslog" + exit 1 +fi + +if ! grep -q "^tty:x:5:syslogd$" /etc/group; then + usermod -a -G tty syslogd +fi + +# Add work dir if not presant +if [ ! -e "/var/spool/${NAME}" ]; then + mkdir /var/spool/${NAME} +fi + +case "${1}" in + start) + boot_mesg "Starting ${DESC}... " + loadproc ${BIN} ${SYSLOGD_OPTIONS} + + boot_mesg "Saving Bootlog..." + if [ -e /var/log/bootlog ]; then + mv -f /var/log/bootlog /var/log/bootlog.old + fi + dmesg -c > /var/log/bootlog + + evaluate_retval && touch ${lockfile} + ;; + + stop) + boot_mesg "Stopping ${DESC}... " + killproc ${BIN} + rm -f ${PIDFILE} ${lockfile} + ;; + + reload) + boot_mesg "Reloading ${DESC}..." + reloadproc ${BIN} ${SYSLOGD_OPTIONS} + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc ${BIN} + ;; + + *) + echo "Usage: ${0} {start|stop|reload|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/rsyslog + diff --git a/src/initscripts/system/sysklogd b/src/initscripts/system/sysklogd deleted file mode 100644 index 4482559..0000000 --- a/src/initscripts/system/sysklogd +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/sysklogd -# -# Description : Sysklogd loader -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - boot_mesg "Starting kernel log daemon..." - loadproc klogd -c 1 - - boot_mesg "Starting system log daemon..." - loadproc syslogd -m 0 - - boot_mesg "Saving Bootlog..." - if [ -e /var/log/bootlog ]; then - mv -f /var/log/bootlog /var/log/bootlog.old - fi - dmesg -c > /var/log/bootlog - evaluate_retval - ;; - stop) - boot_mesg "Stopping kernel log daemon..." - killproc klogd - - boot_mesg "Stopping system log daemon..." - killproc syslogd - ;; - - reload) - boot_mesg "Reloading system log daemon config file..." - reloadproc syslogd 1 - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc syslogd - statusproc klogd - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/sysklogd diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c index d73c422..e3d665b 100644 --- a/src/misc-progs/syslogdctrl.c +++ b/src/misc-progs/syslogdctrl.c @@ -106,7 +106,7 @@ int main(void) /* O_CREAT with O_EXCL will make open() fail if the file already exists - * mostly to prevent 2 copies running at once */ - if ((config_fd = open( "/etc/syslog.conf.new", O_WRONLY|O_CREAT|O_EXCL, 0644 )) == -1 ) + if ((config_fd = open( "/etc/rsyslog.conf.new", O_WRONLY|O_CREAT|O_EXCL, 0644 )) == -1 ) { perror("Unable to open new config file"); exit(ERR_CONFIG); @@ -118,18 +118,18 @@ int main(void) if (strcmp(protocol, "tcp") == 0) { /* write line for TCP */ - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+\$@@\\?.\\+$/\\1@@%s/' /etc/syslog.conf >&%d", hostname, config_fd); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+\$@@\\?.\\+$/\\1@@%s/' /etc/rsyslog.conf >&%d", hostname, config_fd); } else { /* write line for UDP */ - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+\$@@\\?.\\+$/\\1@%s/' /etc/syslog.conf >&%d", hostname, config_fd); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+\$@@\\?.\\+$/\\1@%s/' /etc/rsyslog.conf >&%d", hostname, config_fd); } } else { /* if remote syslog has been disabled */ - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@@\\?.\\+\$$/#\\1/' /etc/syslog.conf >&%d", config_fd ); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\$\\*\\.\\*[[:blank:]]\\+@@\\?.\\+\$$/#\\1/' /etc/rsyslog.conf >&%d", config_fd ); } /* if the return code isn't 0 failsafe */ @@ -137,31 +137,31 @@ int main(void) { fprintf(stderr, "sed returned bad exit code: %d\n", rc); close(config_fd); - unlink("/etc/syslog.conf.new"); + unlink("/etc/rsyslog.conf.new"); exit(ERR_CONFIG); } close(config_fd); - if (rename("/etc/syslog.conf.new", "/etc/syslog.conf") == -1) + if (rename("/etc/rsyslog.conf.new", "/etc/rsyslog.conf") == -1) { perror("Unable to replace old config file"); - unlink("/etc/syslog.conf.new"); + unlink("/etc/rsyslog.conf.new"); exit(ERR_CONFIG); } /* Get syslogd to read the new config file */ - if ((fd = open("/var/run/syslogd.pid", O_RDONLY)) == -1) + if ((fd = open("/var/run/rsyslogd.pid", O_RDONLY)) == -1) { if(errno == ENOENT) { /* pid file doesn't exists.. restart syslog */ - if((rc = safe_system("/usr/sbin/syslogd u syslogd -m 0")) == 0 ) + if((rc = safe_system("/etc/init.d/rsyslog restart")) == 0 ) return 0; else { fprintf(stderr, - "Unable to restart syslogd - returned exit code %d\n", rc); + "Unable to restart rsyslogd - returned exit code %d\n", rc); exit(ERR_SYSLOG); } } else { -- 2.7.4

3 8

[PATCH] OpenVPN: Introduce new AES-GCM cipher for N2N and RW
by Erik Kapfer 27 Feb '18

27 Feb '18

AES-GCM 128, 196 and 256 bit has been added to Net-to-Net and Roadwarrior section. Cipher menu description has been changed for N2N and RW since AES-GCM uses own authentication encryption (GMAC). More information can be found in here https://tools.ietf.org/html/rfc5288 . Added java script snipped to disable HMAC selection for N2N if AES-GCM has been selected. 'auth *' line in N2N.conf won´t be deleted even if AES-GCM is used so possible individual '--tls-auth' configurations won´t broke. 'auth *' line in N2N.conf will also be ignored if AES-GCM is used and no '--tls-auth' are configured. Left HMAC selection menu for Roadwarriors as it was since the WUI do provides '--tls-auth' which uses the configuered HMAC even AES-GCM has been applied. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> --- config/rootfiles/common/openssl-compat | 2 -- html/cgi-bin/ovpnmain.cgi | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) delete mode 100644 config/rootfiles/common/openssl-compat diff --git a/config/rootfiles/common/openssl-compat b/config/rootfiles/common/openssl-compat deleted file mode 100644 index 7ef11e6..0000000 --- a/config/rootfiles/common/openssl-compat +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libcrypto.so.10 -usr/lib/libssl.so.10 diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 9f5e682..0a18ec7 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4543,6 +4543,9 @@ if ($cgiparams{'TYPE'} eq 'net') { } $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; + $selected{'DCIPHER'}{'AES-256-GCM'} = ''; + $selected{'DCIPHER'}{'AES-192-GCM'} = ''; + $selected{'DCIPHER'}{'AES-128-GCM'} = ''; $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = ''; $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = ''; $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = ''; @@ -4706,7 +4709,10 @@ if ($cgiparams{'TYPE'} eq 'net') { </tr> <tr><td class='boldbase'>$Lang::tr{'cipher'}</td> - <td><select name='DCIPHER'> + <td><select name='DCIPHER' id="n2ncipher" required> + <option value='AES-256-GCM' $selected{'DCIPHER'}{'AES-256-GCM'}>AES-GCM (256 $Lang::tr{'bit'}) with SHA384</option> + <option value='AES-192-GCM' $selected{'DCIPHER'}{'AES-192-GCM'}>AES-GCM (192 $Lang::tr{'bit'}) with SHA256</option> + <option value='AES-128-GCM' $selected{'DCIPHER'}{'AES-128-GCM'}>AES-GCM (128 $Lang::tr{'bit'}) with SHA256</option> <option value='CAMELLIA-256-CBC' $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-CBC (256 $Lang::tr{'bit'})</option> <option value='CAMELLIA-192-CBC' $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-CBC (192 $Lang::tr{'bit'})</option> <option value='CAMELLIA-128-CBC' $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-CBC (128 $Lang::tr{'bit'})</option> @@ -4723,7 +4729,7 @@ if ($cgiparams{'TYPE'} eq 'net') { </td> <td class='boldbase'>$Lang::tr{'ovpn ha'}:</td> - <td><select name='DAUTH'> + <td><select name='DAUTH' id="n2nhmac"> <option value='whirlpool' $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option> <option value='SHA512' $selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang::tr{'bit'})</option> <option value='SHA384' $selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang::tr{'bit'})</option> @@ -4737,6 +4743,22 @@ if ($cgiparams{'TYPE'} eq 'net') { END ; } + +#### JAVA SCRIPT #### +# Validate N2N cipher. If GCM is used, disable HMAC menu +print<<END; + <script> + var disable_options = false; + document.getElementById('n2ncipher').onchange = function () { + if((this.value == "AES-256-GCM"||this.value == "AES-192-GCM"||this.value == "AES-128-GCM")) { + document.getElementById('n2nhmac').setAttribute('disabled', true); + } else { + document.getElementById('n2nhmac').removeAttribute('disabled'); + } + } + </script> +END + #jumper print "<tr><td class='boldbase'>$Lang::tr{'remark title'}</td>"; print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr></table>"; @@ -5108,6 +5130,9 @@ END $selected{'DPROTOCOL'}{'tcp'} = ''; $selected{'DPROTOCOL'}{$cgiparams{'DPROTOCOL'}} = 'SELECTED'; + $selected{'DCIPHER'}{'AES-256-GCM'} = ''; + $selected{'DCIPHER'}{'AES-192-GCM'} = ''; + $selected{'DCIPHER'}{'AES-128-GCM'} = ''; $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = ''; $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = ''; $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = ''; @@ -5204,6 +5229,9 @@ END <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td> <td><select name='DCIPHER'> + <option value='AES-256-GCM' $selected{'DCIPHER'}{'AES-256-GCM'}>AES-GCM (256 $Lang::tr{'bit'}) with SHA384</option> + <option value='AES-192-GCM' $selected{'DCIPHER'}{'AES-192-GCM'}>AES-GCM (192 $Lang::tr{'bit'}) with SHA256</option> + <option value='AES-128-GCM' $selected{'DCIPHER'}{'AES-128-GCM'}>AES-GCM (128 $Lang::tr{'bit'}) with SHA256</option> <option value='CAMELLIA-256-CBC' $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-CBC (256 $Lang::tr{'bit'})</option> <option value='CAMELLIA-192-CBC' $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-CBC (192 $Lang::tr{'bit'})</option> <option value='CAMELLIA-128-CBC' $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-CBC (128 $Lang::tr{'bit'})</option> -- 2.7.4

3 16

[ipfire] Patch notification: 1 patch updated
by Patchwork 26 Feb '18

26 Feb '18

Hello, The following patch (submitted by you) has been updated in Patchwork: * ipfire: OpenVPN: Ship missing OpenSSL configuration file for update - http://patchwork.ipfire.org/patch/1675/ - for: IPFire was: New now: Staged This email is a notification only - you do not need to respond. Happy patchworking. -- This is an automated mail sent by the Patchwork system at patchwork.ipfire.org. To stop receiving these notifications, edit your mail settings at: http://patchwork.ipfire.org/mail/

2 1

[PATCH] OpenVPN: Ship missing OpenSSL configuration file for update
by Erik Kapfer 26 Feb '18

26 Feb '18

Core 115 delivered a patch which prevents the '--ns-cert-type server is deprecated' message and introduced also '--remote-cert-tls server' --> https://patchwork.ipfire.org/patch/1441/ whereby the changed ovpn.cnf has not been delivered. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> --- config/rootfiles/core/120/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files index 4baf08e..9369453 100644 --- a/config/rootfiles/core/120/filelists/files +++ b/config/rootfiles/core/120/filelists/files @@ -3,3 +3,4 @@ etc/issue etc/fcron.daily/openvpn-crl-updater srv/web/ipfire/cgi-bin/ovpnmain.cgi var/ipfire/langs +var/ipfire/ovpn/openssl/ovpn.cnf -- 2.7.4

2 1

[ipfire] Patch notification: 1 patch updated
by Patchwork 25 Feb '18

25 Feb '18

Hello, The following patch (submitted by you) has been updated in Patchwork: * ipfire: [v3] OpenVPN: New AES-GCM cipher for N2N and RW - http://patchwork.ipfire.org/patch/1674/ - for: IPFire was: New now: Staged This email is a notification only - you do not need to respond. Happy patchworking. -- This is an automated mail sent by the Patchwork system at patchwork.ipfire.org. To stop receiving these notifications, edit your mail settings at: http://patchwork.ipfire.org/mail/

1 0

Plans for the upcoming Core Updates
by Michael Tremer 22 Feb '18

22 Feb '18

Hello guys, it has been a bit quiet this week on this list. So here is an update for everyone on where we are with the upcoming Core Updates. I would also like to remind you that we have a monthly telephone conference for further information that is a bit too much to be written down. So Core Update 119 is branched and ready to be uploaded into testing very soon. I did not merge OpenSSL into it because I thought that the update would a) get too large, b) is harder to test and c) we have some things in C119 already that should be released very very soon because of security reasons. So basically C119 updates the toolchain, GCC, glibc on all systems. It has some smaller bug fixes and improvements and that is about it. It is a maintenance and housekeeping update, but that's kind of good that we have that isolated from any new features. We should be able to ship this soon without much friction. I openend C120 and merged OpenSSL 1.1.0 into it. With that, we should now look at all applications that use OpenSSL and make sure that we get the best out of it. That means, that we should add all new ciphers that we can use now. We should update cipher suites where ever we ship pre-configured ones, etc. So please everyone review your patches that you have submitted, update them if necessary and post them (again) to this list within the next week. Again, I do not think that we should allow a long time to pass before this being uploaded into testing. Best, -Michael

2 2

Missing patch for 'openssl-compat'?
by Matthias Fischer 22 Feb '18

22 Feb '18

Hi, Last build 'next'-failed: ... /bin/sh: /usr/src/src/patches/openssl-1.0.2a_auto_enable_padlock.patch: No such file or directory make: *** [openssl-compat:122: /usr/src/log/openssl-1.0.2n] Error 1 ... This patch is missing. Bug or feature? Best, Matthias

2 1

[PATCH] WIO: Update to Version 1.3.2 several changes in many files
by Stephan Feddersen 20 Feb '18

20 Feb '18

--- lfs/wio | 4 +- src/misc-progs/wiohelper.c | 2 +- src/wio/lang/wio.de.pl | 48 +++++++------- src/wio/lang/wio.en.pl | 112 ++++++++++++++++---------------- src/wio/main/wio.pl | 4 +- src/wio/main/wiovpn.pl | 59 ++++++++--------- src/wio/wio-graphs.pl | 4 +- src/wio/wio-lib.pl | 4 +- src/wio/wio.cgi | 157 +++++++++++++++++++++++++++++++-------------- src/wio/wiographs.cgi | 4 +- 10 files changed, 228 insertions(+), 170 deletions(-) diff --git a/lfs/wio b/lfs/wio index d70b12b..9ae11b8 100644 --- a/lfs/wio +++ b/lfs/wio @@ -9,13 +9,13 @@ include Config -VER = 1.3.1 +VER = 1.3.2 THISAPP = wio-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio -PAK_VER = 3 +PAK_VER = 1 ############################################################################### # Top-level Rules diff --git a/src/misc-progs/wiohelper.c b/src/misc-progs/wiohelper.c index 0f7fd86..a1e0168 100644 --- a/src/misc-progs/wiohelper.c +++ b/src/misc-progs/wiohelper.c @@ -8,7 +8,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * IPFire.org - A linux based firewall - * Copyright (C) 2017 Stephan Feddersen <addons(a)h-loit.de> + * Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> * * All Rights Reserved. * diff --git a/src/wio/lang/wio.de.pl b/src/wio/lang/wio.de.pl index fd82ff0..a71aefc 100644 --- a/src/wio/lang/wio.de.pl +++ b/src/wio/lang/wio.de.pl @@ -1,7 +1,7 @@ %tr = (%tr, 'wio' => 'Who Is Online?', 'wio stat' => 'Status:', -'wio checked' => 'zuletzt überprüft', +'wio checked' => 'Zuletzt überprüft', 'wio name' => 'Hostname / FQDN', 'wio ipadress' => 'IP-Adresse', 'wio image' => 'Zustand', @@ -12,21 +12,21 @@ 'wio_import_csv' => 'CSV Datei', 'wio_import_hosts' => 'Hosts Datei (var/ipfire/main/hosts)', 'wio_import_data' => 'Einstellungen für ', -'wio_import_data1' => ' bearbeiten:', -'wio_import_data2' => ' importieren:', +'wio_import_data1' => ' Bearbeiten:', +'wio_import_data2' => ' Importieren:', 'wio_import' => 'Importieren', 'wio_import_info' => 'Mitteilung:', 'wio_import_file' => 'Client(s) importieren aus:', 'wio_import_info_csv' => 'Es gibt keine neuen Einstellungen zu importieren!', 'wio settings' => 'Konfiguration:', -'wio enabled' => 'aktivieren?', +'wio enabled' => 'Aktivieren?', 'wio min' => 'Minute(n)', 'wio cron' => 'Zeitintervall für die Überprüfung:', 'wio_ovpn_cron' => 'Zeitintervall für die Überprüfung des OpenVPN RW und IPSec Status:', -'wio_save' => 'speichern', +'wio_save' => 'Speichern', 'wio_error' => 'Fehlermeldung:', 'wio_info' => 'Meldung:', -'wio_back' => 'zurück', +'wio_back' => 'Zurück', 'wio_use' => 'Diese Einstellungen importieren?', 'wio_ip_error' => 'Ungültige IP-Adresse!', 'wio_host_error' => 'Ungültiger Hostname!', @@ -34,7 +34,7 @@ 'wio_host_empty' => 'Es wurde kein Hostname eingetragen!', 'wio_ip_exists' => 'IP-Adresse wird schon benutzt!', 'wio_ip_empty' => 'Es wurde keine IP-Adresse eingetragen!', -'wio_import_fixleases' => 'DHCP Datei (var/ipfire/dhcp/fixleases)', +'wio_import_fixleases' => 'DHCP-Datei (var/ipfire/dhcp/fixleases)', 'wio_import_leases' => 'Einstellungen importieren:', 'wio network' => 'Netzwerk', 'wio_refresh' => 'alle Clients aktualisieren', @@ -60,7 +60,7 @@ 'wio_edit_settings' => 'Client hinzufügen:', 'wio_edit_client' => 'Client bearbeiten:', 'wio_graphs' => 'Graphen anzeigen', -'wio_no_graphs' => 'keine Graphen vorhanden', +'wio_no_graphs' => 'Keine Graphen vorhanden', 'wio_graphs_stat' => 'Diagramme für', 'wio_vpn_con' => 'VPN - Verbindung(en):', 'wio_wan_con' => 'WAN - Verbindung:', @@ -74,13 +74,13 @@ 'wio_net_scan_green' => 'grünes', 'wio_net_scan_blue' => 'blaues', 'wio_net_scan_orange' => 'oranges', -'wio_net_scan_run' => 'starten', -'wio_sort_host' => 'nach Hostnamen (FQDN) sortieren', -'wio_sort_ip' => 'nach IP Adressen sortieren', +'wio_net_scan_run' => 'Starten', +'wio_sort_host' => 'Nach Hostnamen (FQDN) sortieren', +'wio_sort_ip' => 'Nach IP Adressen sortieren', 'wio_logging' => 'Logging (/var/log/messages) aktivieren?', 'wio_no_image' => 'KEIN STATUS', 'wio_ovpn_con' => 'OpenVPN - Verbindung(en):', -'wio_ovpn_connected' => 'verbunden seit', +'wio_ovpn_connected' => 'Verbunden seit', 'wio_wan_up' => 'VERBUNDEN', 'wio_wan_down' => 'GETRENNT', 'wio_n2n' => 'Netz-zu-Netz Verbindung', @@ -96,17 +96,17 @@ 'wio_hwaddress' => 'HW-Adresse', 'wio_iface' => 'Schnittstelle', 'wio_client_enable' => 'Client aktivieren?', -'wio_ping_send' => 'überprüfen per', +'wio_ping_send' => 'Überprüfen per', 'wio_link_open' => 'Link öffnen per', 'enable disable client' => 'Client aktivieren oder deaktivieren', 'wio_client_on' => 'Überwachung aktiviert (klicken, um zu deaktivieren)', 'wio_client_off' => 'Überwachung deaktiviert (klicken, um zu aktivieren)', 'wio_webinterface' => 'LINK', 'wio_webinterface_link' => 'Link öffnen', -'wio_ip' => 'überprüfen per IP aktiviert', -'wio_fqdn' => 'überprüfen per FQDN aktiviert', -'wio_ip_on' => 'überprüfen per IP aktiviert (klicken, um per FQDN zu aktivieren)', -'wio_fqdn_on' => 'überprüfen per FQDN aktiviert (klicken, um per IP zu aktivieren)', +'wio_ip' => 'Überprüfen per IP aktiviert', +'wio_fqdn' => 'Überprüfen per FQDN aktiviert', +'wio_ip_on' => 'Überprüfen per IP aktiviert (klicken, um per FQDN zu aktivieren)', +'wio_fqdn_on' => 'Überprüfen per FQDN aktiviert (klicken, um per IP zu aktivieren)', 'wio_client_add' => 'Eingaben anwenden', 'wio_config' => 'Client(s) konfigurieren:', 'wio_settings_msg' => 'Einstellungen bearbeiten:', @@ -117,8 +117,8 @@ 'wio_add' => 'Client hinzufügen:', 'wio_no_add' => 'Client ist vorhanden', 'wio_id' => '#', -'wio_online' => 'online', -'wio_offline' => 'offline', +'wio_online' => 'Online', +'wio_offline' => 'Offline', 'wio_status' => 'WIO Client-Status', 'wio_mail_style' => 'WIO Client Statusmails versenden als', 'wio_mail_smail' => 'Sammelmail', @@ -127,13 +127,13 @@ 'wio_edit_set' => 'Konfiguration', 'wio_service' => 'Service:', 'wio_dyndns_success' => 'DynDNS IP ermittelt und eingetragen!', -'wio_remove_all' => 'alle Clients löschen', +'wio_remove_all' => 'Alle Clients löschen', 'wio_remove_all_hint' => 'Möchten Sie wirklich alle Clients löschen?', 'wio_remove_client' => 'Client löschen', 'wio_remove_client_hint' => 'Möchten Sie den Client wirklich löschen?', 'wio_arp_table_entries' => 'Client aus der ARP-Tabelle hinzufügen:', -'wio_activ' => 'aktiv', -'wio_check' => 'prüfen', +'wio_activ' => 'Aktiv', +'wio_check' => 'Prüfen', 'wio_common_name' => 'Remote Host / IP', 'wio_msg_left' => 'Das', 'wio_msg_green' => 'grüne', @@ -142,7 +142,7 @@ 'wio_msg_center' => 'Netzwerk an', 'wio_msg_right' => 'wird durchsucht.', 'wio_msg_hint' => 'Einen Moment bitte ...', -'wio_last_update' => 'zuletzt aktualisiert', +'wio_last_update' => 'Zuletzt aktualisiert', 'wio_disable_hint' => 'Achtung! Es werden alle Einstellungen incl. der zu überprüfenden Clients zurückgesetzt!', 'wio_clientremark' => 'Anmerkung anzeigen?', 'wio_already_running' => 'Die Prüfung wird bereits durchgeführt!', @@ -154,4 +154,6 @@ 'wio_answer' => 'Antwort', 'wio_answer_time' => 'Antwortzeit', 'wio_scriptruntime' => 'Scriptlaufzeit', +'wio_show_table_off' => 'Tabelle ausblenden', +'wio_show_table_on' => 'Tabelle einblenden', ); diff --git a/src/wio/lang/wio.en.pl b/src/wio/lang/wio.en.pl index 52793b9..f981eee 100644 --- a/src/wio/lang/wio.en.pl +++ b/src/wio/lang/wio.en.pl @@ -10,8 +10,8 @@ 'wio err' => 'Error', 'wio warn' => 'Warning', 'wio_import_csv' => 'CSV file:', -'wio_import_hosts' => 'hosts configuration (var/ipfire/main/hosts) ?', -'wio_import_data' => 'import settings for ', +'wio_import_hosts' => 'Hosts configuration (var/ipfire/main/hosts)?', +'wio_import_data' => 'Import settings for ', 'wio_import_data1' => ' correct:', 'wio_import_data2' => ' import:', 'wio_import' => 'Importing', @@ -19,7 +19,7 @@ 'wio_import_file' => 'Import settings from:', 'wio_import_info_csv' => 'There are no new settings to import!', 'wio settings' => 'configuration:', -'wio enabled' => 'enable ?', +'wio enabled' => 'Enable?', 'wio min' => 'Minute(s)', 'wio cron' => 'Time interval for checking:', 'wio_ovpn_cron' => 'Time interval for checking the OpenVPN RW and IPSec Status:', @@ -34,12 +34,12 @@ 'wio_host_empty' => 'No Hostname was registered!', 'wio_ip_exists' => 'IP Address is already used.', 'wio_ip_empty' => 'No IP Address was registered!', -'wio_import_fixleases' => 'DHCP configuration (var/ipfire/dhcp/fixleases) ?', +'wio_import_fixleases' => 'DHCP configuration (var/ipfire/dhcp/fixleases)?', 'wio_import_leases' => 'Import settings:', 'wio network' => 'Network', -'wio_refresh' => 'update all clients now', +'wio_refresh' => 'Update all clients now', 'wio_fqdn_error' => 'Invalid Fully Qualified Domain Name (FQDN)! Please do not use special characters or blanks in the FQDN.', -'wio_edit' => 'change settings:', +'wio_edit' => 'Change settings:', 'wio_dyndns' => 'DynDNS', 'wio_dyndns_hosts' => 'DynDNS Name(s)', 'wio_dyndns_refresh' => 'DynDNS Host IP update', @@ -55,85 +55,85 @@ 'wio_msg' => 'Condition of the examining Client(s) are updated ...', 'wio_lanname' => 'LAN Hostname', 'wio_wanname' => 'WAN Hostname', -'wio_wancheck' => 'connected since', -'wio_sc_refresh' => 'update client now', -'wio_edit_settings' => 'add client:', -'wio_edit_client' => 'edit client:', -'wio_graphs' => 'show graphs', -'wio_no_graphs' => 'no graphs available', -'wio_graphs_stat' => 'Diagramm for', +'wio_wancheck' => 'Connected since', +'wio_sc_refresh' => 'Update client now', +'wio_edit_settings' => 'Add client:', +'wio_edit_client' => 'Edit client:', +'wio_graphs' => 'Show graphs', +'wio_no_graphs' => 'No graphs available', +'wio_graphs_stat' => 'Diagram for', 'wio_vpn_con' => 'VPN - Connection(s):', 'wio_wan_con' => 'WAN - Connection:', 'wio_clients' => 'clients:', 'wio click to disable' => 'Activated', 'wio click to enable' => 'Deactivated', -'wio_net_scan' => 'Scan Network(s):', -'wio_net_scan_vl' => 'scan', -'wio_net_scan_l' => 'Network on', +'wio_net_scan' => 'Scan network(s):', +'wio_net_scan_vl' => 'Scan', +'wio_net_scan_l' => 'network on', 'wio_net_scan_r' => '', 'wio_net_scan_green' => 'green', 'wio_net_scan_blue' => 'blue', 'wio_net_scan_orange' => 'orange', -'wio_net_scan_run' => 'start', -'wio_sort_host' => 'sort Hostnames (FQDN)', -'wio_sort_ip' => 'sort IP-Adresses', -'wio_logging' => 'activate Logging (/var/log/messages) ?', +'wio_net_scan_run' => 'Start', +'wio_sort_host' => 'Sort Hostnames (FQDN)', +'wio_sort_ip' => 'Sort IP-Adresses', +'wio_logging' => 'Activate logging (/var/log/messages)?', 'wio_no_image' => 'NO STATUS', 'wio_ovpn_con' => 'OpenVPN - Connection(s):', -'wio_ovpn_connected' => 'connected since', +'wio_ovpn_connected' => 'Connected since', 'wio_wan_up' => 'CONNECTED', 'wio_wan_down' => 'NOT CONNECTED', 'wio_n2n' => 'Net-to-Net Connection', 'wio_rw' => 'Host-to-Net Connection', -'wio_mailremark_enabled' => 'Add Remark from client to mailbody ?', -'wio_mail_online_on' => 'online email enabled (click to disable)', -'wio_mail_online_off' => 'online email disabled (click to enable)', -'wio_mail_offline_on' => 'offline email enabled (click to disable)', -'wio_mail_offline_off' => 'offline emaildisabled (click to enable)', -'wio_mail_online' => 'enable or disable online email', -'wio_mail_offline' => 'enable or disable offline email', -'wio_sendemail' => 'send email', +'wio_mailremark_enabled' => 'Add Remark from client to mailbody?', +'wio_mail_online_on' => 'Online email enabled (click to disable)', +'wio_mail_online_off' => 'Online email disabled (click to enable)', +'wio_mail_offline_on' => 'Offline email enabled (click to disable)', +'wio_mail_offline_off' => 'Offline emaildisabled (click to enable)', +'wio_mail_online' => 'Enable or disable online email', +'wio_mail_offline' => 'Enable or disable offline email', +'wio_sendemail' => 'Send email', 'wio_hwaddress' => 'HW-Adresse', 'wio_iface' => 'Interface', -'wio_client_enable' => 'enable Host ?', -'wio_ping_send' => 'send ping to', -'wio_link_open' => 'open link via', -'enable disable client' => 'enable or disable client', +'wio_client_enable' => 'Enable Host?', +'wio_ping_send' => 'Send ping to', +'wio_link_open' => 'Open link via', +'enable disable client' => 'Enable or disable client', 'wio_client_on' => 'Client enabled (click to disable)', 'wio_client_off' => 'Client disabled (click to enable)', 'wio_webinterface' => 'LINK', -'wio_webinterface_link' => 'follow link', -'wio_ip' => 'send ping to IP enabled', -'wio_fqdn' => 'send ping to FQDN enabled', -'wio_ip_on' => 'send ping to IP enabled (click to enable FQDN)', -'wio_fqdn_on' => 'send ping to FQDN enabled (click to enable IP)', -'wio_client_add' => 'use settings', -'wio_config' => 'configurate Client(s):', -'wio_settings_msg' => 'configurate settings:', +'wio_webinterface_link' => 'Follow link', +'wio_ip' => 'Send ping to IP enabled', +'wio_fqdn' => 'Send ping to FQDN enabled', +'wio_ip_on' => 'Send ping to IP enabled (click to enable FQDN)', +'wio_fqdn_on' => 'Send ping to FQDN enabled (click to enable IP)', +'wio_client_add' => 'Use settings', +'wio_config' => 'Configurate Client(s):', +'wio_settings_msg' => 'Configurate settings:', 'wio_settings_msg_hint' => 'Here you have to set some values to get the addon started.', 'wio_sub' => 'WIO Client-Status-Mail', 'wio timeout' => 'Ping Timeout:', 'wio sec' => 'Second(s)', -'wio_add' => 'add Client:', +'wio_add' => 'Add Client:', 'wio_no_add' => 'Client is available', 'wio_id' => '#', -'wio_online' => 'online', -'wio_offline' => 'offline', +'wio_online' => 'Online', +'wio_offline' => 'Offline', 'wio_status' => 'WIO Client-Status', -'wio_mail_style' => 'send WIO Client Statusmails as', -'wio_mail_smail' => 'collected mail', -'wio_mail_email' => 'single mails', -'wio_mail_ovpnrw' => 'enable OpenVPN RW and IPSec Statusmails ?', +'wio_mail_style' => 'Send WIO client statusmails as', +'wio_mail_smail' => 'Collected mail', +'wio_mail_email' => 'Single mails', +'wio_mail_ovpnrw' => 'Enable OpenVPN RW and IPSec Statusmails?', 'wio_edit_set' => 'Configuration', 'wio_service' => 'Service:', 'wio_dyndns_success' => 'DynDNS IP identified and registered!', -'wio_remove_all' => 'remove all clients', +'wio_remove_all' => 'Remove all clients', 'wio_remove_all_hint' => 'Are you sure to delete all the clients?', -'wio_remove_client' => 'remove client', +'wio_remove_client' => 'Remove client', 'wio_remove_client_hint' => 'Are you sure to delete the client?', -'wio_arp_table_entries' => 'add client from ARP-Table:', -'wio_activ' => 'activ', -'wio_check' => 'check', +'wio_arp_table_entries' => 'Add client from ARP-Table:', +'wio_activ' => 'Activ', +'wio_check' => 'Check', 'wio_common_name' => 'Remote Host/IP', 'wio_msg_left' => 'Searching on the', 'wio_msg_green' => 'green', @@ -142,9 +142,9 @@ 'wio_msg_center' => 'Interface on', 'wio_msg_right' => 'is being examined.', 'wio_msg_hint' => 'One moment please ...', -'wio_last_update' => 'last update', +'wio_last_update' => 'Last update', 'wio_disable_hint' => 'Attention! It will reset all settings including the client to be checked!', -'wio_clientremark' => 'show remark?', +'wio_clientremark' => 'Show remark?', 'wio_already_running' => 'This check is already running!', 'wio_error_function' => 'This function is temporarily unavailable, because in the background client states are being updated (active/inactive).', 'wio_shutdown' => 'Shutdown when all clients are "offline"?', @@ -154,4 +154,6 @@ 'wio_answer' => 'Answer', 'wio_answer_time' => 'Response Time', 'wio_scriptruntime' => 'Script Execution Time', +'wio_show_table_off' => 'Show table', +'wio_show_table_on' => 'Hide table', ); diff --git a/src/wio/main/wio.pl b/src/wio/main/wio.pl index 985900d..b846fea 100644 --- a/src/wio/main/wio.pl +++ b/src/wio/main/wio.pl @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 Stephan Feddersen <addons(a)h-loit.de> # +# Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> # # All Rights Reserved. # # # # This program is free software: you can redistribute it and/or modify # @@ -21,7 +21,7 @@ # # ############################################################################### # -# id: wio.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen +# Version: 2017/08/04 18:55:23 # # This wio.pl is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. diff --git a/src/wio/main/wiovpn.pl b/src/wio/main/wiovpn.pl index f22bd7a..c4c6b57 100644 --- a/src/wio/main/wiovpn.pl +++ b/src/wio/main/wiovpn.pl @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 Stephan Feddersen <addons(a)h-loit.de> # +# Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> # # All Rights Reserved. # # # # This program is free software: you can redistribute it and/or modify # @@ -21,7 +21,7 @@ # # ############################################################################### # -# id: wioovpn.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen +# Version: 2018/01/05 12:32:23 # # This wioovpn.pl is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -93,8 +93,7 @@ else { close (FILE); } -foreach (@ovpncfg) -{ +foreach (@ovpncfg) { chomp; if ( $_ =~ "server" ) { next; } @@ -106,8 +105,7 @@ foreach (@ovpncfg) unless ( grep (/$name/, @ovpncache) ) { push (@ovpncache, "$name,$remark,$status\n"); } } -foreach (@ovpncache) -{ +foreach (@ovpncache) { chomp; ( $name, $remark, $status ) = split (/\,/, $_); @@ -115,18 +113,16 @@ foreach (@ovpncache) if ( grep (/,$name,/, @ovpncfg) ) { push (@ovpnarray, "$name,$remark,$status\n"); } } -foreach (@ovpnarray) -{ +foreach (@ovpnarray) { chomp; + ( $name, $remark, $status ) = split (/\,/, $_); if ( $name =~ m/_/ ) { $nameul = $name; } else { ($nameul = $name) =~ s/ /_/g; } - if ( grep (/$name/, @ovpnstatus) || grep (/$nameul/, @ovpnstatus) ) - { - foreach (@ovpnstatus) - { + if ( grep (/$name/, @ovpnstatus) || grep (/$nameul/, @ovpnstatus) ) { + foreach (@ovpnstatus) { chomp; if ( $_ =~ "ROUTING TABLE" ) { last; } @@ -151,8 +147,7 @@ foreach (@ovpnarray) if ( $nameul eq $ovpnclt || $name eq $ovpnclt ) { push (@ovpnwrite, "$name,$remark,$status\n"); } - if ( $togglestat == 1 && ($name eq $ovpnclt || $nameul eq $ovpnclt) ) - { + if ( $togglestat == 1 && ($name eq $ovpnclt || $nameul eq $ovpnclt) ) { $ovpnmailsub = "WIO OVPN - $name - $ovpnrwstatus - $now"; $logmsg = "Client: WIO OVPN $name - IP: $ovpncltip - Status: $ovpnrwstatus"; $ovpnmailmsg = "Client : $name\nLogin : $ovpnrwlogin\nIP : $ovpncltip\nStatus : $ovpnrwstatus\n"; @@ -177,11 +172,10 @@ foreach (@ovpnarray) $logmsg = "Client: WIO OVPN $name - Status: $ovpnrwstatus"; $ovpnmailmsg = "Client : $name\nLogout : $now\nStatus : $ovpnrwstatus\n"; - if ( $mailremark eq 'on' ) { - $ovpnmailmsg .= "Remark : $remark\n\n"; - } + if ( $mailremark eq 'on' ) { $ovpnmailmsg .= "Remark : $remark\n\n"; } &WIO::mailsender($ovpnmailsub, $ovpnmailmsg); + if ( $logging eq 'on' ) { &General::log("wio","$logmsg"); } undef ($ovpnmailsub); undef ($ovpnmailmsg); @@ -220,11 +214,10 @@ else { close (FILE); } -foreach (@vpncfg) -{ +foreach (@vpncfg) { chomp; - ( $activ, $name, $remark ) = (split (/\,/, $_))[1, 2, 25]; + ( $activ, $name, $remark ) = (split (/\,/, $_))[1, 2, 26]; if ( $remark eq 'off' ) { $remark = '-'; } @@ -235,8 +228,7 @@ foreach (@vpncfg) unless ( grep (/$name/, @vpncache) ) { push (@vpncache, "$name,$remark,$status\n"); } } -foreach (@vpncache) -{ +foreach (@vpncache) { chomp; ( $name, $remark, $status ) = split (/\,/, $_); @@ -244,14 +236,12 @@ foreach (@vpncache) if ( grep (/,$name,/, @vpncfg) ) { push (@vpnarray, "$name,$remark,$status\n"); } } -foreach (@vpnarray) -{ +foreach (@vpnarray) { chomp; ( $name, $remark, $status ) = split (/\,/, $_); - if ( grep (/$name\{.*INSTALLED/ , @vpnstatus) ) - { + if ( grep (/$name\{.*INSTALLED/ , @vpnstatus) ) { $vpnrwstatus = "$Lang::tr{'wio up'}"; $togglestat = ( $status ne 'on' ) ? 1 : 0; $status = 'on'; @@ -264,21 +254,24 @@ foreach (@vpnarray) push (@vpnwrite, "$name,$remark,$status\n"); - if ( $togglestat == 1 ) - { + if ( $togglestat == 1 ) { $vpnmailsub = "WIO VPN - $name - $vpnrwstatus - $now"; $logmsg = "Client: WIO VPN $name - Status: $vpnrwstatus $now"; + $vpnmailmsg = "Client : $name\n"; - if ( $mailremark eq 'on' ) { - if ( $status eq 'on' ) { $vpnmailmsg = "Client : $name\nLogin : $now\nStatus : $vpnrwstatus\nRemark : $remark\n"; } - else { $vpnmailmsg = "Client : $name\nLogout : $now\nStatus : $vpnrwstatus\nRemark : $remark\n"; } + if ( $status eq 'on' ) { + $vpnmailmsg .= "Login : $now\n"; } else { - if ( $status eq 'on' ) { $vpnmailmsg = "Client : $name\nLogin : $now\nStatus : $vpnrwstatus\n"; } - else { $vpnmailmsg = "Client : $name\nLogout : $now\nStatus : $vpnrwstatus\n"; } + $vpnmailmsg .= "Logout : $now\n"; } + $vpnmailmsg .= "Status : $vpnrwstatus\n"; + + if ( $mailremark eq 'on' ) { $vpnmailmsg .= "Remark : $remark\n\n"; } + &WIO::mailsender($vpnmailsub, $vpnmailmsg); + if ( $logging eq 'on' ) { &General::log("wio","$logmsg"); } undef ($vpnmailsub); undef ($vpnmailmsg); diff --git a/src/wio/wio-graphs.pl b/src/wio/wio-graphs.pl index a5a58b4..af5c520 100644 --- a/src/wio/wio-graphs.pl +++ b/src/wio/wio-graphs.pl @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 Stephan Feddersen <addons(a)h-loit.de> # +# Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> # # All Rights Reserved. # # # # This program is free software: you can redistribute it and/or modify # @@ -21,7 +21,7 @@ # # ############################################################################### # -# id: wio-graphs.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen +# Version: 2017/07/11 21:32:23 # # This wio-graphs.pl is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. diff --git a/src/wio/wio-lib.pl b/src/wio/wio-lib.pl index 2f23c1d..bbaf0bf 100644 --- a/src/wio/wio-lib.pl +++ b/src/wio/wio-lib.pl @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 Stephan Feddersen <addons(a)h-loit.de> # +# Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> # # All Rights Reserved. # # # # This program is free software: you can redistribute it and/or modify # @@ -21,7 +21,7 @@ # # ############################################################################### # -# id: wio-lib.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen +# Version: 2017/07/11 21:32:23 # # This wio-lib.pl is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 4fbf34a..8c43b04 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 Stephan Feddersen <addons(a)h-loit.de> # +# Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> # # All Rights Reserved. # # # # This program is free software: you can redistribute it and/or modify # @@ -21,7 +21,7 @@ # # ############################################################################### # -# id: wio.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen +# Version: 2018/01/05 14:34:23 # # This wio.cgi is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -105,6 +105,10 @@ my $nr = 0; my $count = 0; my $showcount = 0; +my $arpbuttontext = "$Lang::tr{'wio_show_table_on'}"; +my $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; +my $networksearchbuttontext = "$Lang::tr{'wio_show_table_on'}"; + my ( $infomessage, $errormessage, $importmessage, $message ) = ''; my ( $buttontext, $host, $timestamp, $ipadr, $on, $remark, $dyndns, $dyndnsip, $sendemailon, $net, $dev, $iprange, $output, $write, $webinterface, @@ -153,6 +157,9 @@ $wiosettings{'MAILREMARK'} = 'off'; $wiosettings{'MAILSTYLE'} = 'email'; $wiosettings{'OVPNRWMAIL'} = 'off'; $wiosettings{'SHUTDOWN'} = 'off'; +$wiosettings{'WIOGUISHOWARPTABLE'} = ''; +$wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} = ''; +$wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = ''; &Header::getcgihash(\%wiosettings); &Header::getcgihash(\%mainsettings); @@ -219,7 +226,6 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_save'}.'2' ) { $wiosettings{'SENDEMAILOFF'} = $wiosettings{"SENDEMAILOFF$count"}; $wiosettings{'PINGMETHODE'} = $wiosettings{"PINGMETHODE$count"}; $wiosettings{'ONLINE'} = $wiosettings{"ONLINE$count"}; - $wiosettings{'WEBINTERFACE'} = $wiosettings{"WEBINTERFACE$count"}; &validSave(); @@ -272,6 +278,45 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_client_add'} ) { } } +## show / hide arptable + +if ($wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable') { + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { + $wiosettings{'WIOGUISHOWARPTABLE'} = 'off'; + $arpbuttontext = "$Lang::tr{'wio_show_table_on'}"; + } + else { + $wiosettings{'WIOGUISHOWARPTABLE'} = 'on'; + $arpbuttontext = "$Lang::tr{'wio_show_table_off'}"; + } +} + +## show / hide clientimporttable + +if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'clientimport' ) { + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { + $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} = 'off'; + $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; + } + else { + $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} = 'on'; + $clientimportbuttontext = "$Lang::tr{'wio_show_table_off'}"; + } +} + +## show / hide networksearchtable + +if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'networksearch' ) { + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { + $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'off'; + $clientimportbuttontext = "$Lang::tr{'wio_show_table_on'}"; + } + else { + $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} = 'on'; + $clientimportbuttontext = "$Lang::tr{'wio_show_table_off'}"; + } +} + ## add arp client if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_add'} ) { @@ -376,6 +421,7 @@ exit 0; } else { $infomessage = "$Lang::tr{'wio_already_running'}"; + unlink($onoffip); } } @@ -842,7 +888,7 @@ if ( $debug ) { print"infomessage: $infomessage<br />\n"; &hrline(); - + my $wiodebug = 0; foreach (sort keys %wiosettings) { print"$_ = $wiosettings{$_}<br />\n"; @@ -881,9 +927,9 @@ print" <form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'> <table width='100%'> <tr> - <td width='45%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_settings_msg'}</b></td> + <td width='55%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_settings_msg'}</b></td> <td width='2%'> </td> - <td width='53%'> </td> + <td width='43%'> </td> </tr> <tr><td colspan='3'> </td></tr> <tr> @@ -953,7 +999,6 @@ print" <td align='left'><input type='checkbox' name='CLIENTREMARK' $checked{'CLIENTREMARK'}{'on'} /></td> </tr> <tr><td colspan='3'> </td></tr> - "; if ( $wiosettings{'SENDEMAIL'} eq 'on' ) { @@ -1062,9 +1107,9 @@ if ( $wiosettings{'ENABLE'} eq 'on') { print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> -<tr height='20'> - <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_wan_con'}</b></td> - <td width='72%' align='right'> </td> +<tr height='25'> + <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_wan_con'}</b></td> + <td width='67%' align='right'> </td> </tr> <tr><td colspan='2'> </td></tr> </table> @@ -1137,9 +1182,9 @@ if ( -e "$vpnpid" ) { print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> -<tr height='20'> - <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_vpn_con'}</b></td> - <td width='72%'> </td> +<tr height='25'> + <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_vpn_con'}</b></td> + <td width='67%'> </td> </tr> <tr><td colspan='2'> </td></tr> </table> @@ -1219,9 +1264,9 @@ if ( -e "$ovpnpid" ) { print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> -<tr height='20'> - <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_ovpn_con'}</b></td> - <td width='72%'> </td> +<tr height='25'> + <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_ovpn_con'}</b></td> + <td width='67%'> </td> </tr> <tr><td colspan='2'> </td></tr> </table> @@ -1346,9 +1391,9 @@ print" print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> -<tr height='20'> - <td width='28%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_clients'}</b></td> - <td width='72%'> </td> +<tr height='25'> + <td width='33%' bgcolor='$color{'color20'}' align='left'><b> $Lang::tr{'wio_clients'}</b></td> + <td width='67%'> </td> </tr> <tr><td colspan='2'> </td></tr> </table> @@ -1471,29 +1516,12 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } } - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { - my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; - my @rednet = split ("/", $redipadr); - chomp ($rednet[1]); - my $red_netmask = General::iporsubtodec($rednet[1]); - my $red_netaddress = Network::get_netaddress("$rednet[0]/$red_netmask"); - - if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask) ) { - print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>"; - last SWITCH; - } - else { - print"<td align='center'><img align='middle' src='$imgstatic/white.png' alt='$Lang::tr{'wio_unknown_lan'}' title='$Lang::tr{'wio_unknown_lan'}' /></td>"; - last SWITCH; - } - } - if ( -e "$vpnpid" ) { foreach $key (keys(%vpnconfighash)) { next unless ($vpnconfighash{$key}[3] eq 'net'); my $convertip = &General::ipcidr2msk($vpnconfighash{$key}[11]); - + my @net = split ("/", $convertip); $vpnn2nip = $net[0]; @@ -1532,6 +1560,23 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } } + + if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { + my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; + my @rednet = split ("/", $redipadr); + chomp ($rednet[1]); + my $red_netmask = General::iporsubtodec($rednet[1]); + my $red_netaddress = Network::get_netaddress("$rednet[0]/$red_netmask"); + + if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask) ) { + print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>"; + last SWITCH; + } + else { + print"<td align='center'><img align='middle' src='$imgstatic/white.png' alt='$Lang::tr{'wio_unknown_lan'}' title='$Lang::tr{'wio_unknown_lan'}' /></td>"; + last SWITCH; + } + } } if ( $webinterface[$a] eq 'HTTP' ) { @@ -1662,8 +1707,8 @@ if (! defined($errormessage) && $wiosettings{'ACTION'} ne $Lang::tr{'edit'} ) { print" <table width='100%' border='0' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> <tr> - <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_add'}</b></td> - <td width='72%' align='right'> </td> + <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_add'}</b></td> + <td width='67%' align='right'> </td> </tr> <tr> <td> </td> @@ -1755,13 +1800,17 @@ if ( $wiosettings{'ENABLE'} eq 'on' && !$errormessage && $wiosettings{'ACTION'} print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> <tr> - <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_arp_table_entries'}</b></td> - <td width='72%'> </td> + <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_arp_table_entries'}</b></td> + <td width='67%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='WIOGUISHOWARPTABLE' value='arptable' /><input type='submit' name='ACTION' value='$arpbuttontext' /></form></td> </tr> -<tr><td colspan='2'> </td></tr> </table> +"; + +if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'on' ) { +print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> +<tr><td colspan='2'> </td></tr> <tr bgcolor='$color{'color20'}'> <td width='5%' align='center' height='20'><b>$Lang::tr{'wio_id'}</b></td> <td width='20%' align='center' height='20'><b>$Lang::tr{'wio_hwaddress'}</b></td> @@ -1865,18 +1914,24 @@ $idarp++ print" </table> "; +} &hrline(); print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> <tr> - <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_import_file'}</b></td> - <td width='72%'> </td> + <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_import_file'}</b></td> + <td width='67%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='WIOGUISHOWCLIENTIMPORTTABLE' value='clientimport' /><input type='submit' name='ACTION' value='$clientimportbuttontext' /></form></td> </tr> -<tr><td colspan='2'> </td></tr> </table> +"; + +if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'on' ) { + +print" <table width='100%' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> +<tr><td colspan='3'> </td></tr> <tr bgcolor='$color{'color22'}'> <form method='post' action='/cgi-bin/wio.cgi' enctype='multipart/form-data'> <td width='35%' align='right'>$Lang::tr{'wio_import_csv'} </td> @@ -1902,16 +1957,22 @@ print" </tr> </table> "; +} &hrline; print" <table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> <tr> - <td width='28%' bgcolor='$color{'color20'}' align='left' height='20'><b> $Lang::tr{'wio_net_scan'}</b></td> - <td width='72%'> </td> + <td width='33%' bgcolor='$color{'color20'}' align='left' height='25'><b> $Lang::tr{'wio_net_scan'}</b></td> + <td width='67%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='WIOGUISHOWNETWORKSEARCHTABLE' value='networksearch' /><input type='submit' name='ACTION' value='$networksearchbuttontext' /></form></td> </tr> </table> +"; + +if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'on' ) { + +print" <table width='100%' cellspacing='0' cellpadding='0' style='border-collapse: collapse'> <tr> <td colspan='3'> </td> @@ -1944,7 +2005,7 @@ print" </table> </form> "; - +} &Header::closebox(); } diff --git a/src/wio/wiographs.cgi b/src/wio/wiographs.cgi index 06b6946..e1a7475 100644 --- a/src/wio/wiographs.cgi +++ b/src/wio/wiographs.cgi @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 Stephan Feddersen <addons(a)h-loit.de> # +# Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> # # All Rights Reserved. # # # # This program is free software: you can redistribute it and/or modify # @@ -21,7 +21,7 @@ # # ############################################################################### # -# id: wiographs.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen +# Version: 2017/08/27 14:07:23 # # This wiographs.cgi is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. -- 2.7.4

2 1

[PATCH] squid: Add RAM-only Proxy functionality
by Daniel Weismüller 16 Feb '18

16 Feb '18

As suggested by Oliver "giller" Fieker <oli(a)new-lan.de> in bug 10592 I added the functionality to use the squid as ram-only cache. Further it defines the maximum_object_size_in_memory as 2% of the in the webif defined "Memory cache size". The maximum_object_size_in_memory should have a useful size of the defined memory cache and I don't want to create another variable which muste be fulled in by the user. Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> Suggested-by: Oliver "giller" Fieker <oli(a)new-lan.de> Suggested-by: Kim Wölfel <xaver4all(a)gmx.de> Acked-by: Michael Tremer <michael.tremer(a)ipfire.org> Cc: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> --- html/cgi-bin/proxy.cgi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 6aa14e15a..8379cf86d 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -401,8 +401,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'} $errormessage = $Lang::tr{'proxy errmsg filedescriptors'}; goto ERROR; } - if (!($proxysettings{'CACHE_MEM'} =~ /^\d+/) || - ($proxysettings{'CACHE_MEM'} < 1)) + if (!($proxysettings{'CACHE_MEM'} =~ /^\d+/)) { $errormessage = $Lang::tr{'advproxy errmsg mem cache size'}; goto ERROR; @@ -3174,7 +3173,7 @@ END } } - if ($proxysettings{'CACHE_SIZE'} > 0) + if (($proxysettings{'CACHE_SIZE'} > 0) || ($proxysettings{'CACHE_MEM'} > 0)) { print FILE "\n"; @@ -3271,7 +3270,12 @@ cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DI END ; } else { - print FILE "cache deny all\n\n"; + if ($proxysettings{'CACHE_MEM'} > 0) { + # always 2% of CACHE_MEM defined as max object size + print FILE "maximum_object_size_in_memory " . int($proxysettings{'CACHE_MEM'} * 1024 * 0.02) . " KB\n\n"; + } else { + print FILE "cache deny all\n\n"; + } } print FILE <<END -- 2.14.3

1 0

[PATCH] OpenVPN: Added needed directive for v2.4 update
by Erik Kapfer 15 Feb '18

15 Feb '18

script-security: The support for the 'system' flag has been removed due to security implications with shell expansions when executing scripts via system() call. For more informations: https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage . ncp-disable: Negotiable crypto parameters has been disabled for the first. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 0a18ec7..a7daf89 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -216,7 +216,7 @@ sub writeserverconf { print CONF "dev tun\n"; print CONF "proto $sovpnsettings{'DPROTOCOL'}\n"; print CONF "port $sovpnsettings{'DDEST_PORT'}\n"; - print CONF "script-security 3 system\n"; + print CONF "script-security 3\n"; print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n"; print CONF "client-config-dir /var/ipfire/ovpn/ccd\n"; print CONF "tls-server\n"; @@ -289,6 +289,7 @@ sub writeserverconf { } print CONF "status-version 1\n"; print CONF "status /var/run/ovpnserver.log 30\n"; + print CONF "ncp-disable\n"; print CONF "cipher $sovpnsettings{DCIPHER}\n"; if ($sovpnsettings{'DAUTH'} eq '') { print CONF ""; -- 2.7.4

3 4

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2018