ipaclient: schema cache: Handle malformed server info data gracefully #363
Conversation
| self._dict = json.load(sc) | ||
| except EnvironmentError as e: | ||
| if e.errno != errno.ENOENT: | ||
| self._dict = json.loads(sc) |
There was a problem hiding this comment.
sc is a file object, so load() was correct, wasn't it?
There was a problem hiding this comment.
Yes, stupid me. I was curious how the file looks like so I had there:
data = sc.read()
json.loads(data)
and printed the data when the error occurred. Obviously, I haven't changed it back properly.
Thanks!
|
Can the corruption also happen for schema files? |
|
@HonzaCholasta Yes, it can happen but it is already handles correctly: https://github.com/freeipa/freeipa/blob/master/ipaclient/remote_plugins/schema.py#L387 |
| @@ -41,8 +41,13 @@ 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 (EnvironmentError, ValueError) as e: | |||
There was a problem hiding this comment.
I guess you should except Exception as e: here, same as in https://github.com/freeipa/freeipa/blob/master/ipaclient/remote_plugins/schema.py#L387
There was a problem hiding this comment.
Ok, I will update it for the sake of consistency. But there will be no difference in behaviour.
|
@dkupka, ok, see inline comment. |
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
HonzaCholasta
added
ack
|
Fixed upstream |
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