From 602fbe80824a17c66e0993b59e4a5c2b074d4eed Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Thu, 19 Dec 2019 16:00:43 +0100 Subject: [PATCH 1/3] utils: avoid crash on invalid import json (#15269) --- passerelle/utils/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/passerelle/utils/__init__.py b/passerelle/utils/__init__.py index fcf4bb4c..ff213d44 100644 --- a/passerelle/utils/__init__.py +++ b/passerelle/utils/__init__.py @@ -338,10 +338,10 @@ def import_site(d, if_empty=False, clean=False, overwrite=False, import_users=Fa with transaction.atomic(): if import_users: - for apiuser in d['apiusers']: + for apiuser in d.get('apiusers', []): ApiUser.import_json(apiuser, overwrite=overwrite) - for resource in d['resources']: + for resource in d.get('resources', []): BaseResource.import_json(resource, overwrite=overwrite, import_users=import_users) -- 2.20.1