Module: check_mk
Branch: master
Commit: 402218b6a4f0303c13da8d053f9f0f75879e4d9c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=402218b6a4f030…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Apr 1 13:57:18 2014 +0200
FIX Signing and verification of WATO snapshot (addresses CVE-2014-2330)
This change addresses possible attacks against Check_MK using the WATO "Backup &
Restore" module,
known as CVE-2014-2330.
In previous versions there were no checksum verifications or signings of the snapshots
contents
implemented. This has been changed now. The files within the snapshot which contain
Check_MK
configuration files and definitions of check commands etc. are now verified using
checksums and
signed.
When you import / export a snapshot on a single site, there is no difference to the former
handling.
When you or someone else modifies the snapshots between import and export, the restore
process will
warn you about the modification and let you decide if you trust the file and restore it
anyways or
terminate the restore process.
In the case you import a snapshot from another site, the singing can not be verified. In
this case,
you get a warning about this and can continue or skip the restore process.
Conflicts:
ChangeLog
modules/automation.py
web/htdocs/wato.py
web/plugins/wato/backup_domains.py
---
.werks/767 | 22 +++
ChangeLog | 3 +
modules/automation.py | 61 ++++++--
web/htdocs/images/icon_snapshot_checksum.png | Bin 0 -> 2992 bytes
web/htdocs/images/icon_snapshot_nchecksum.png | Bin 0 -> 3550 bytes
web/htdocs/images/icon_snapshot_pchecksum.png | Bin 0 -> 3054 bytes
web/htdocs/wato.py | 192 +++++++++++++++++++------
web/plugins/wato/backup_domains.py | 4 +-
8 files changed, 227 insertions(+), 55 deletions(-)
Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=402218b6a4…