[checkmk-commits] 3745 FIX MIB uploads: Handle latin-1 encoded MIBs

Module: check_mk Branch: master Commit: 9b0e652d76f5e0947add6044a19d445984b61e6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b0e652d76f5e0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 14 11:52:26 2016 +0200 3745 FIX MIB uploads: Handle latin-1 encoded MIBs --- .werks/3745 | 8 ++++++++ ChangeLog | 1 + web/plugins/wato/mkeventd.py | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/.werks/3745 b/.werks/3745 new file mode 100644 index 0000000..411eee2 --- /dev/null +++ b/.werks/3745 @@ -0,0 +1,8 @@ +Title: MIB uploads: Handle latin-1 encoded MIBs +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i1 +Date: 1473846563 +Class: fix + diff --git a/ChangeLog b/ChangeLog index d1a7724..ef36208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -675,6 +675,7 @@ * 3568 FIX: Fixed broken link in "Access to event status via TCP" help text * 3589 FIX: Fixed processing of RFC 5424 syslog messages * 3771 FIX: Fixed exception on edit rule page in case of special URLs + * 3745 FIX: MIB uploads: Handle latin-1 encoded MIBs Livestatus: * 3644 Fixed 'source' column in 'comments' table. diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 2561a9d..f127d79 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2036,6 +2036,13 @@ def validate_and_compile_mib(mibname, content): PySnmpCodeGen(), PyFileWriter(mkeventd.compiled_mibs_dir)) + # FIXME: This is a temporary local fix that should be removed once + # handling of file contents uses a uniformly encoded representation + try: + content = content.decode("utf-8") + except: + content = content.decode("latin-1") + # Provides the just uploaded MIB module compiler.addSources( CallbackReader(lambda m,c: m==mibname and c or '', content)