From 5e1512f717abfb9ad9fc6af897bcf55b86da83b9 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Mon, 23 May 2016 12:20:08 +0100
Subject: [PATCH] Don't reuse contexts on ckan harvester

Reusing the same context on all calls can lead to hard to debug failures
like

Action function organization_show did not call its auth function

In this case that was caused because the first organization/group_show
raised a NotFound so the auth audit was still in the context. When
organization/group_show was called again at the end of
organization/group_create the auth audit exception was raised.

This commit makes sure that each call has its own context.
---
 ckanext/harvest/harvesters/ckanharvester.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ckanext/harvest/harvesters/ckanharvester.py b/ckanext/harvest/harvesters/ckanharvester.py
index c359d24e5..f5331479b 100644
--- a/ckanext/harvest/harvesters/ckanharvester.py
+++ b/ckanext/harvest/harvesters/ckanharvester.py
@@ -369,8 +369,8 @@ def fetch_stage(self, harvest_object):
     def import_stage(self, harvest_object):
         log.debug('In CKANHarvester import_stage')
 
-        context = {'model': model, 'session': model.Session,
-                   'user': self._get_user_name()}
+        base_context = {'model': model, 'session': model.Session,
+                        'user': self._get_user_name()}
         if not harvest_object:
             log.error('No harvest object received')
             return False
@@ -412,7 +412,7 @@ def import_stage(self, harvest_object):
                 for group_ in package_dict['groups']:
                     try:
                         data_dict = {'id': group_['id']}
-                        group = get_action('group_show')(context, data_dict)
+                        group = get_action('group_show')(base_context.copy(), data_dict)
                         validated_groups.append({'id': group['id'], 'name': group['name']})
 
                     except NotFound, e:
@@ -427,14 +427,14 @@ def import_stage(self, harvest_object):
                             for key in ['packages', 'created', 'users', 'groups', 'tags', 'extras', 'display_name']:
                                 group.pop(key, None)
 
-                            get_action('group_create')(context, group)
+                            get_action('group_create')(base_context.copy(), group)
                             log.info('Group %s has been newly created', group_)
                             validated_groups.append({'id': group['id'], 'name': group['name']})
 
                 package_dict['groups'] = validated_groups
 
             # Local harvest source organization
-            source_dataset = get_action('package_show')(context, {'id': harvest_object.source.id})
+            source_dataset = get_action('package_show')(base_context.copy(), {'id': harvest_object.source.id})
             local_org = source_dataset.get('owner_org')
 
             remote_orgs = self.config.get('remote_orgs', None)
@@ -453,7 +453,7 @@ def import_stage(self, harvest_object):
                 if remote_org:
                     try:
                         data_dict = {'id': remote_org}
-                        org = get_action('organization_show')(context, data_dict)
+                        org = get_action('organization_show')(base_context.copy(), data_dict)
                         validated_org = org['id']
                     except NotFound, e:
                         log.info('Organization %s is not available', remote_org)
@@ -468,7 +468,7 @@ def import_stage(self, harvest_object):
 
                                 for key in ['packages', 'created', 'users', 'groups', 'tags', 'extras', 'display_name', 'type']:
                                     org.pop(key, None)
-                                get_action('organization_create')(context, org)
+                                get_action('organization_create')(base_context.copy(), org)
                                 log.info('Organization %s has been newly created', remote_org)
                                 validated_org = org['id']
                             except (RemoteResourceError, ValidationError):