Module: check_mk
Branch: master
Commit: 02031117bdaaab8a1221604a200578046d5a363f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02031117bdaaab…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jul 3 09:45:15 2017 +0200
4931 FIX Trusted certificate authorities: Silently ignore dangling symlink errors
Change-Id: Icd68a46873c0f12ae8736f6f6c84774dd30f4310
---
.werks/4931 | 10 ++++++++++
web/htdocs/watolib.py | 11 +++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/.werks/4931 b/.werks/4931
new file mode 100644
index 0000000..9fd4a4b
--- /dev/null
+++ b/.werks/4931
@@ -0,0 +1,10 @@
+Title: Trusted certificate authorities: Silently ignore dangling symlink errors
+Level: 1
+Component: wato
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1499067881
+Class: fix
+
+
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index 70a0a24..109ac1d 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -549,9 +549,16 @@ class ConfigDomainCACertificates(ConfigDomain):
return list(trusted_cas), errors
- def _get_certificates_from_file(self, path):
- return [ match.group(0) for match in self._PEM_RE.finditer(open(path).read()) ]
+ def _get_certificates_from_file(self, path):
+ try:
+ return [ match.group(0) for match in self._PEM_RE.finditer(open(path).read())
]
+ except IOError, e:
+ if e.errno == 2: # No such file or directory
+ # Silently ignore e.g. dangling symlinks
+ return []
+ else:
+ raise
#.