URL: https://github.com/freeipa/freeipa/pull/363 Author: dkupka Title: #363: ipaclient: schema cache: Handle malformed server info data gracefully Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/363/head:pr363 git checkout pr363
From 2618237cbf3a62dc1524b6df412afd37e6b37652 Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Tue, 3 Jan 2017 08:57:21 +0100 Subject: [PATCH] ipaclient: schema cache: Handle malformed server info data gracefully As a part of CLI schema cache some data about each previously contacted server are stored in simple JSON file. The file may get corrupted and became undecodable for various reasons (parallel access, file system error, tampering). Since the data are not necessary we should just warn an continue. https://fedorahosted.org/freeipa/ticket/6578 --- ipaclient/remote_plugins/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ipaclient/remote_plugins/__init__.py b/ipaclient/remote_plugins/__init__.py index 9cf501f..349b874 100644 --- a/ipaclient/remote_plugins/__init__.py +++ b/ipaclient/remote_plugins/__init__.py @@ -41,8 +41,14 @@ def _read(self): try: with open(self._path, 'r') as sc: self._dict = json.load(sc) - except EnvironmentError as e: - if e.errno != errno.ENOENT: + except Exception as e: + if (isinstance(e, EnvironmentError) and + e.errno == errno.ENOENT): # pylint: disable=no-member + # ignore non-existent file, this happens when the cache was + # erased or the server is contacted for the first time + pass + else: + # warn that the file is unreadable, probably corrupted logger.warning('Failed to read server info: {}'.format(e)) def _write(self):
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
