3 Aug
2022
3 Aug
'22
3:53 a.m.
Branch: refs/heads/2.0.0
Home: https://github.com/tribe29/checkmk
Commit: c94cca5b540cf464c4b16514805849306e6ede0a
https://github.com/tribe29/checkmk/commit/c94cca5b540cf464c4b16514805849306…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2022-08-03 (Wed, 03 Aug 2022)
Changed paths:
M omd/packages/omd/omdlib/main.py
Log Message:
-----------
Consolidate system apache related logic
Extracted the logic for writing the apache config hook and applying it
to the system apache to separate functions. Preparte to move them over
to a separate module in the next step.
Change-Id: I6a9e1d81450111ea3f6c024b946d7c1c24d5c4c6
Commit: 639fe9c903a6612ae298ee205a35e8cd553414b0
https://github.com/tribe29/checkmk/commit/639fe9c903a6612ae298ee205a35e8cd5…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2022-08-03 (Wed, 03 Aug 2022)
Changed paths:
A omd/packages/omd/omdlib/console.py
M omd/packages/omd/omdlib/main.py
A omd/packages/omd/omdlib/system_apache.py
M omd/packages/omd/omdlib/tmpfs.py
M omd/packages/omd/omdlib/utils.py
Log Message:
-----------
Move system apache to separate module
Change-Id: I2745c2b094f420b647aa915b4ebf5e167a262b1d
Commit: 84f1021359f13a853dc27486c917ddbf40b09b8b
https://github.com/tribe29/checkmk/commit/84f1021359f13a853dc27486c917ddbf4…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2022-08-03 (Wed, 03 Aug 2022)
Changed paths:
M tests/unit/omdlib/conftest.py
M tests/unit/omdlib/test_omdlib_main.py
M tests/unit/omdlib/test_site_context.py
Log Message:
-----------
Generalize fixtures
Change-Id: I04a498c76564cae8ece6d143d315a01bd55bd6af
Commit: aeb33f665fefae04f18b2c20fd7cadba17132d4c
https://github.com/tribe29/checkmk/commit/aeb33f665fefae04f18b2c20fd7cadba1…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2022-08-03 (Wed, 03 Aug 2022)
Changed paths:
A .werks/14281
M omd/packages/apache-omd/APACHE_TCP_ADDR
M omd/packages/apache-omd/APACHE_TCP_PORT
M omd/packages/omd/hooks/APACHE_MODE
M omd/packages/omd/omd.8
M omd/packages/omd/omdlib/main.py
M omd/packages/omd/omdlib/system_apache.py
A tests/unit/omdlib/test_system_apache.py
Log Message:
-----------
14281 SEC Fix local privilege escalation from site users
Each Checkmk site provides it's HTTP services (UI, APIs) using it's own site
Apache process. Global access to this site Apache is provided via the system
Apache which is opening the 80 and 443 ports for external requests, depending
on your system configuration.
To learn about the site Apache, the system Apache reads a reverse proxy
configuration provided by the site user. This could be used by a site user to
make the system Apache execute code as root user, since the System Apache is
typically started initially with root privileges.
To close this gap, we now need to separate the system Apache configuration from
the site user access.
To eliminate the privilege escalation, you will have to execute the command
<tt>omd update-apache-config [SITE]</tt> once for each of your sites after
the <tt>omd update</tt> command.
Besides the one-time fix, this change has a consequence for the use of <tt>omd
config</tt> and <tt>omd update</tt>. There are two situations where this
is
relevant:
a) If you change the options APACHE_TCP_ADDR, APACHE_TCP_PORT or APACHE_MODE
You will have to call <tt>omd update-apache-config [SITE]</tt> as root user
after
changing one of the site configuration options APACHE_TCP_ADDR, APACHE_TCP_PORT
or APACHE_MODE. This needs to be done to update and apply the system Apache
configuration. If you don't do this and start your site, your UI may be not
available anymore.
The <tt>omd config</tt> command will output a warning to notify you about
this
necessary step in the future.
b) If you execute <tt>omd update</tt> and the proxy configuration changes
The update is performed as site user. Which means that, after this werk, we can
not update and apply the system apache configuration anymore automatically.
To apply the latest apache configuration, the command <tt>omd
update-apache-config [SITE]</tt> needs to be executed after the update.
The <tt>omd update</tt> will automatically detect the need for this
additional
step and show you a confirmation dialog before starting the update to notify
you about this necessary step and giving you the chance to interrupt the
procedure in case you don't have the option to execute the command as root
user.
All maintained versions (>=1.6) are subject to this vulnerability. It is likely
that also previous versions were vulnerable. Users of previous versions are
highly recommended to update or consider other mitigations.
We thank Jan-Philipp Litza (PLUTEX GmbH) for reporting this issue!
Change-Id: I03058d515dc4f53b3e998efd7b9e54389bf5656c
Commit: 5caf25510a9720c861b291ad595f1746fd65ba56
https://github.com/tribe29/checkmk/commit/5caf25510a9720c861b291ad595f1746f…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2022-08-03 (Wed, 03 Aug 2022)
Changed paths:
M omd/packages/omd/omdlib/main.py
M omd/packages/omd/omdlib/system_apache.py
M tests/unit/omdlib/test_system_apache.py
Log Message:
-----------
14288 FIX Fix Apache error message in case site Apache is not started
With 2.1.0p7 and werk #14281 we changed the system Apache configuration which
broke the System Apache error page that is shown to the user in case the site
Apache is not running. It showed a 'Service Unavailable' message instead of the
intended 'Checkmk: Site Not Started'.
To apply this fix, you will have to execute <tt>omd update-apache-config
[site]</tt>
as root user after executing <tt>omd update</tt>.
Change-Id: If13a0323885ae8993e6a655f53c4badc3071033d
Commit: 407c913a3fd38ec706267682d44a7142a7dd76e2
https://github.com/tribe29/checkmk/commit/407c913a3fd38ec706267682d44a7142a…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2022-08-03 (Wed, 03 Aug 2022)
Changed paths:
M omd/packages/omd/omdlib/main.py
M omd/packages/omd/omdlib/system_apache.py
M tests/unit/omdlib/test_system_apache.py
Log Message:
-----------
14289 FIX Fix PermissionError during 'omd update' related to
'/omd/apache' files
When performing 'omd update' to 2.1.0p7 or newer, a PermissionError could occur,
depending
on the umask settings of your system. A traceback like this was visible in this
situation:
C+:
Traceback (most recent call last):
File "/omd/versions/2.1.0p8.cee/bin/omd", line 63, in <module>
omdlib.main.main()
File "/omd/versions/2.1.0p8.cee/lib/python3/omdlib/main.py", line 4665, in
main
command.handler(version_info, site, global_opts, args, command_options)
File "/omd/versions/2.1.0p8.cee/lib/python3/omdlib/main.py", line 2726, in
main_update
not is_apache_hook_up_to_date(site)
File "/omd/versions/2.1.0p8.cee/lib/python3/omdlib/system_apache.py", line 72,
in is_apache_hook_up_to_date
with open(os.path.join(omdlib.utils.omd_base_path(), "omd/apache/%s.conf" %
site.name)) as f:
PermissionError: [Errno 13] Permission denied: '/omd/apache/checkmk_test.conf'
C-:
The issue is fixed with as of this relase. However, you can workaround this issue by
executing <tt>chmod o+r /omd/apache/*.conf</tt> as root before executing
'omd update'.
Change-Id: I34692032f8d2e8536c603668c8b9e476b6ccb99d
Commit: 2629db2aed8cfe67f4f872f6ee5fd952d093e8c3
https://github.com/tribe29/checkmk/commit/2629db2aed8cfe67f4f872f6ee5fd952d…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2022-08-03 (Wed, 03 Aug 2022)
Changed paths:
M omd/packages/omd/omdlib/main.py
R omd/packages/omd/skel/etc/apache/apache-own.conf
Log Message:
-----------
14290 FIX Improve 'omd update' apache config handling
The intended update warning that should be shown in case the
Apache hook was not up-to-date was not shown correctly in 2.1.0p9.
And during update a update warning
<tt>Unwanted etc/apache/apache-own.conf (unchanged, deleted by you)</tt>
was shown which could lead to confusions. This warning has been removed.
Change-Id: I6b4a23d070ff2b9a38d6004790443869da019d32
Compare: https://github.com/tribe29/checkmk/compare/b89b74b4815e...2629db2aed8c