Re: [PATCH v3 1/5] zabbix_agentd: Update to v5.0.20 (LTS)

[Robin Roevens <robin.roevens@disroot.org>]

[-- Attachment #1: Type: text/plain, Size: 15751 bytes --]

Hi Michael

Michael Tremer schreef op di 15-02-2022 om 13:22 [+0000]:
> Hello Robin,
> 
> Thank you for working on Zabbix and integrating it better into
> IPFire.
> 
> I am very happy with this, but I have my reservations about the
> mechanism with the “new” configuration file. I do not quite see the
> necessity for this since we have a package management system which
> will allow you to start again from scratch if you want by
> uninstalling the package, throwing away the backup and then
> installing the package again.
> 
> It would also create some unique feature around one package, but not
> for others which is probably more confusing than helpful.
> 
> What is your motivation for this?

I do understand your concerns and agree that handling the config of
this pak differently than configs of other paks is bothersome.

However, I understand now that you can start over by removing the
package and the backup but up until I started contributing, I never
knew the config of an addon was backed up automatically on uninstall
and restored on re-install. I would have expected that if I didn't find
the config anymore after an uninstall it would be gone and a re-install
would give me a fresh config. So I would probably be utterly confused
if I found my old config back after a re-install. 
Is this documented somewhere where I could have known this behaviour as
a normal average user ?

The problem I'm having with the current way is that when an addon is
updated, a new version of the config is just discarded due to the
restore of the previous config during install (even if that config was
never changed by the user).
So if settings in the config are added, deprecated or even no longer
valid, the user will never know until a version would no longer start
up or no longer behave as expected due to the old config.
And even if a user would think about checking config changes on an
update he would have to go search the internet for a config example for
this version of the addon.

In this specific case, as we update from a rather old version of zabbix
agent, there are quite a few interesting config changes that can harden
the security of the agent, which I would not want the user to miss out
on. Also one option is deprecated, is currently still supported, but in
the next version it probably will no longer work, possibly breaking
some users' monitoring or causing the agent to fail starting.

For the sudoers file it is even more problematic; the user can of
course modify that file to add additional commands he requires the
agent to execute as root, but possible future additions to the ipfire
specific monitoring that I or other contributors in the future may add,
may also need extra commands in that file to work. (for example the
upcoming services monitoring that would require some form of addonctrl
status)
But I can't update that file with the current behaviour.. or I would
have to try to implement some sed magic after the restore in install.sh
hoping not to damage the file if it has user customizations in it.

So I'm not sure on how to handle this differently at the moment.
I was thinking for the main config maybe just installing a ".example"
version of the latest config so that a user would not have to go search
for it on internet ? And in that case even remove all comments and
defaults from the actual config (on a fresh install) as that is then
provided in the ".example" version as documentation. 

But that still leaves the sudoers file. The only other possibility I
see there is that we don't add this file to the backup and add a
comment in it that a user should not modify it as it will get
overwritten on update. He can then always still create his own sudoers-
file with his own custom rights for the agent.

Of course all this can be solved by managing the config using the
webgui.. and I'm still planning to create a webgui config page for the
agent someday. But we are not there yet :-)

Regards

Robin

> 
> -Michael
> 
> > On 9 Feb 2022, at 23:26, Robin Roevens <robin.roevens(a)disroot.org>
> > wrote:
> > 
> > - Update from 4.2.6 to latest LTS version 5.0.20
> >  See release notes: https://www.zabbix.com/rn/rn5.0.20
> > 
> > Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> > ---
> > config/zabbix_agentd/zabbix_agentd.conf | 135
> > ++++++++++++++++++++++--
> > lfs/zabbix_agentd                       |  11 +-
> > 2 files changed, 132 insertions(+), 14 deletions(-)
> > 
> > diff --git a/config/zabbix_agentd/zabbix_agentd.conf
> > b/config/zabbix_agentd/zabbix_agentd.conf
> > index 21b8e0122..aa8b899dc 100644
> > --- a/config/zabbix_agentd/zabbix_agentd.conf
> > +++ b/config/zabbix_agentd/zabbix_agentd.conf
> > @@ -63,14 +63,33 @@ LogFileSize=0
> > # Default:
> > # SourceIP=
> > 
> > -### Option: EnableRemoteCommands
> > -#      Whether remote commands from Zabbix server are allowed.
> > -#      0 - not allowed
> > -#      1 - allowed
> > +### Option: AllowKey
> > +#      Allow execution of item keys matching pattern.
> > +#      Multiple keys matching rules may be defined in combination
> > with DenyKey.
> > +#      Key pattern is wildcard expression, which support "*"
> > character to match any number of any characters in certain
> > position. It might be used in both key name and key arguments.
> > +#      Parameters are processed one by one according their
> > appearance order.
> > +#      If no AllowKey or DenyKey rules defined, all keys are
> > allowed.
> > +#
> > +# Mandatory: no
> > +
> > +### Option: DenyKey
> > +#      Deny execution of items keys matching pattern.
> > +#      Multiple keys matching rules may be defined in combination
> > with AllowKey.
> > +#      Key pattern is wildcard expression, which support "*"
> > character to match any number of any characters in certain
> > position. It might be used in both key name and key arguments.
> > +#      Parameters are processed one by one according their
> > appearance order.
> > +#      If no AllowKey or DenyKey rules defined, all keys are
> > allowed.
> > +#       Unless another system.run[*] rule is specified
> > DenyKey=system.run[*] is added by default.
> > #
> > # Mandatory: no
> > # Default:
> > -# EnableRemoteCommands=0
> > +# DenyKey=system.run[*]
> > +
> > +### Option: EnableRemoteCommands - Deprecated, use
> > AllowKey=system.run[*] or DenyKey=system.run[*] instead
> > +#      Internal alias for AllowKey/DenyKey parameters depending on
> > value:
> > +#      0 - DenyKey=system.run[*]
> > +#      1 - AllowKey=system.run[*]
> > +#
> > +# Mandatory: no
> > 
> > ### Option: LogRemoteCommands
> > #       Enable logging of executed shell commands as warnings.
> > @@ -177,6 +196,28 @@ ServerActive=127.0.0.1
> > # Default:
> > # HostMetadataItem=
> > 
> > +### Option: HostInterface
> > +#      Optional parameter that defines host interface.
> > +#      Host interface is used at host auto-registration process.
> > +#      An agent will issue an error and not start if the value is
> > over limit of 255 characters.
> > +#      If not defined, value will be acquired from
> > HostInterfaceItem.
> > +#
> > +# Mandatory: no
> > +# Range: 0-255 characters
> > +# Default:
> > +# HostInterface=
> > +
> > +### Option: HostInterfaceItem
> > +#      Optional parameter that defines an item used for getting
> > host interface.
> > +#      Host interface is used at host auto-registration process.
> > +#      During an auto-registration request an agent will log a
> > warning message if
> > +#      the value returned by specified item is over limit of 255
> > characters.
> > +#      This option is only used when HostInterface is not defined.
> > +#
> > +# Mandatory: no
> > +# Default:
> > +# HostInterfaceItem=
> > +
> > ### Option: RefreshActiveChecks
> > #       How often list of active checks is refreshed, in seconds.
> > #
> > @@ -265,7 +306,6 @@ ServerActive=127.0.0.1
> > 
> > Include=/etc/zabbix_agentd/zabbix_agentd.d/*.conf
> > 
> > -
> > ####### USER-DEFINED MONITORED PARAMETERS #######
> > 
> > ### Option: UnsafeUserParameters
> > @@ -299,7 +339,7 @@
> > Include=/etc/zabbix_agentd/zabbix_agentd.d/*.conf
> > #
> > # Mandatory: no
> > # Default:
> > -# LoadModulePath=/usr/lib/modules
> > +# LoadModulePath=${libdir}/modules
> > 
> > LoadModulePath=/usr/lib/zabbix
> > 
> > @@ -357,14 +397,14 @@ LoadModulePath=/usr/lib/zabbix
> > # TLSCRLFile=
> > 
> > ### Option: TLSServerCertIssuer
> > -#      Allowed server certificate issuer.
> > +#              Allowed server certificate issuer.
> > #
> > # Mandatory: no
> > # Default:
> > # TLSServerCertIssuer=
> > 
> > ### Option: TLSServerCertSubject
> > -#      Allowed server certificate subject.
> > +#              Allowed server certificate subject.
> > #
> > # Mandatory: no
> > # Default:
> > @@ -397,3 +437,80 @@ LoadModulePath=/usr/lib/zabbix
> > # Mandatory: no
> > # Default:
> > # TLSPSKFile=
> > +
> > +####### For advanced users - TLS ciphersuite selection criteria
> > #######
> > +
> > +### Option: TLSCipherCert13
> > +#      Cipher string for OpenSSL 1.1.1 or newer in TLS 1.3.
> > +#      Override the default ciphersuite selection criteria for
> > certificate-based encryption.
> > +#
> > +# Mandatory: no
> > +# Default:
> > +# TLSCipherCert13=
> > +
> > +### Option: TLSCipherCert
> > +#      GnuTLS priority string or OpenSSL (TLS 1.2) cipher string.
> > +#      Override the default ciphersuite selection criteria for
> > certificate-based encryption.
> > +#      Example for GnuTLS:
> > +#              NONE:+VERS-TLS1.2:+ECDHE-RSA:+RSA:+AES-128-
> > GCM:+AES-128-CBC:+AEAD:+SHA256:+SHA1:+CURVE-ALL:+COMP-NULL:+SIGN-
> > ALL:+CTYPE-X.509
> > +#      Example for OpenSSL:
> > +#              EECDH+aRSA+AES128:RSA+aRSA+AES128
> > +#
> > +# Mandatory: no
> > +# Default:
> > +# TLSCipherCert=
> > +
> > +### Option: TLSCipherPSK13
> > +#      Cipher string for OpenSSL 1.1.1 or newer in TLS 1.3.
> > +#      Override the default ciphersuite selection criteria for
> > PSK-based encryption.
> > +#      Example:
> > +#              TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256
> > +#
> > +# Mandatory: no
> > +# Default:
> > +# TLSCipherPSK13=
> > +
> > +### Option: TLSCipherPSK
> > +#      GnuTLS priority string or OpenSSL (TLS 1.2) cipher string.
> > +#      Override the default ciphersuite selection criteria for
> > PSK-based encryption.
> > +#      Example for GnuTLS:
> > +#              NONE:+VERS-TLS1.2:+ECDHE-PSK:+PSK:+AES-128-
> > GCM:+AES-128-CBC:+AEAD:+SHA256:+SHA1:+CURVE-ALL:+COMP-NULL:+SIGN-
> > ALL
> > +#      Example for OpenSSL:
> > +#              kECDHEPSK+AES128:kPSK+AES128
> > +#
> > +# Mandatory: no
> > +# Default:
> > +# TLSCipherPSK=
> > +
> > +### Option: TLSCipherAll13
> > +#      Cipher string for OpenSSL 1.1.1 or newer in TLS 1.3.
> > +#      Override the default ciphersuite selection criteria for
> > certificate- and PSK-based encryption.
> > +#      Example:
> > +#              TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256
> > :TLS_AES_128_GCM_SHA256
> > +#
> > +# Mandatory: no
> > +# Default:
> > +# TLSCipherAll13=
> > +
> > +### Option: TLSCipherAll
> > +#      GnuTLS priority string or OpenSSL (TLS 1.2) cipher string.
> > +#      Override the default ciphersuite selection criteria for
> > certificate- and PSK-based encryption.
> > +#      Example for GnuTLS:
> > +#              NONE:+VERS-TLS1.2:+ECDHE-RSA:+RSA:+ECDHE-
> > PSK:+PSK:+AES-128-GCM:+AES-128-CBC:+AEAD:+SHA256:+SHA1:+CURVE-
> > ALL:+COMP-NULL:+SIGN-ALL:+CTYPE-X.509
> > +#      Example for OpenSSL:
> > +#              EECDH+aRSA+AES128:RSA+aRSA+AES128:kECDHEPSK+AES128:
> > kPSK+AES128
> > +#
> > +# Mandatory: no
> > +# Default:
> > +# TLSCipherAll=
> > +
> > +####### For advanced users - TCP-related fine-tuning parameters
> > #######
> > +
> > +## Option: ListenBacklog
> > +#       The maximum number of pending connections in the queue.
> > This parameter is passed to
> > +#       listen() function as argument 'backlog' (see "man
> > listen").
> > +#
> > +# Mandatory: no
> > +# Range: 0 - INT_MAX (depends on system, too large values may be
> > silently truncated to implementation-specified maximum)
> > +# Default: SOMAXCONN (hard-coded constant, depends on system)
> > +# ListenBacklog=
> > diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
> > index c69643a54..28fe97b4f 100644
> > --- a/lfs/zabbix_agentd
> > +++ b/lfs/zabbix_agentd
> > @@ -1,7 +1,7 @@
> > ###################################################################
> > ############
> > #                                                                  
> >            #
> > # IPFire.org - A linux based
> > firewall                                         #
> > -# Copyright (C) 2007-2019  IPFire Team 
> > <info(a)ipfire.org>                     #
> > +# Copyright (C) 2007-2022  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        #
> > @@ -24,7 +24,7 @@
> > 
> > include Config
> > 
> > -VER        = 4.2.6
> > +VER        = 5.0.20
> > 
> > THISAPP    = zabbix-$(VER)
> > DL_FILE    = $(THISAPP).tar.gz
> > @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> > DIR_APP    = $(DIR_SRC)/$(THISAPP)
> > TARGET     = $(DIR_INFO)/$(THISAPP)
> > PROG       = zabbix_agentd
> > -PAK_VER    = 4
> > +PAK_VER    = 5
> > DEPS       =
> > 
> > ###################################################################
> > ############
> > @@ -43,7 +43,7 @@ objects = $(DL_FILE)
> > 
> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > 
> > -$(DL_FILE)_MD5 = 6cd55cd743d416d9ffbf2e6fdee680ee
> > +$(DL_FILE)_MD5 = 52df25394f9a4cf83ff55278b23e6295
> > 
> > install : $(TARGET)
> > 
> > @@ -80,7 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> >                 --prefix=/usr \
> >                 --enable-agent \
> >                 --sysconfdir=/etc/zabbix_agentd \
> > -               --with-openssl
> > +               --with-openssl \
> > +               --with-libcurl
> > 
> >         cd $(DIR_APP) && make
> >         cd $(DIR_APP) && make install
> > -- 
> > 2.34.1
> > 
> > 
> > -- 
> > Dit bericht is gescanned op virussen en andere gevaarlijke
> > inhoud door MailScanner en lijkt schoon te zijn.
> > 
> 
> 

-- 
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.