diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2017-03-10 09:33:15 +0000 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-03-13 15:44:44 +0100 |
| commit | 8295848bfec6f96410ab8383107fdaf565f02974 (patch) | |
| tree | f752d105e365f9e530fe300b6bd91035f880bbbc /ipalib | |
| parent | 2fc9feddd02bb17c3a9eb7efde83277fcf93252c (diff) | |
| download | freeipa-8295848bfec6f96410ab8383107fdaf565f02974.tar.gz freeipa-8295848bfec6f96410ab8383107fdaf565f02974.tar.xz freeipa-8295848bfec6f96410ab8383107fdaf565f02974.zip | |
rpc: fix crash in verbose mode
Fix a crash caused by feeding incorrect data to `json.dumps()` in
`JSONServerProxy.__request()` introduced by commit
8159c2883bf66980582d1227c364df4e592bdd7e.
https://pagure.io/freeipa/issue/6734
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/rpc.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py index 3a589cb52..16ffb8b54 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -1136,16 +1136,17 @@ class JSONServerProxy(object): verbose=self.__verbose >= 3, ) + if print_json: + root_logger.info( + 'Response: %s', + json.dumps(json.loads(response), sort_keys=True, indent=4) + ) + try: response = json_decode_binary(response) except ValueError as e: raise JSONError(error=str(e)) - if print_json: - root_logger.info( - 'Response: %s', - json.dumps(response, sort_keys=True, indent=4) - ) error = response.get('error') if error: try: |