Errbit | Fixing permissions | handling already queued errors for indexing

Author: snyaggarwal

core/collections/views.py

@@ -1164,7 +1164,7 @@ class CollectionVersionProcessingView(CollectionBaseView, ConceptContainerProces
 
 class CollectionVersionExportView(ConceptContainerExportMixin, CollectionVersionBaseView):
     entity = 'Collection'
-    permission_classes = (CanViewConceptDictionary,)
+    permission_classes = (CanViewConceptDictionary, IsAuthenticated)
     serializer_class = CollectionVersionExportSerializer
 
     def handle_export_version(self):

core/common/mixins.py

@@ -16,6 +16,7 @@
 from pydash import compact, get
 from rest_framework import status
 from rest_framework.mixins import ListModelMixin, CreateModelMixin
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from core.common.constants import HEAD, ACCESS_TYPE_NONE, INCLUDE_FACETS, \
@@ -954,7 +955,7 @@ def save_as_new_version(self, user, **kwargs):  # pylint: disable=too-many-branc
 
 
 class ConceptContainerExportMixin:
-    permission_classes = (CanViewConceptDictionaryVersion, )
+    permission_classes = (CanViewConceptDictionaryVersion, IsAuthenticated)
 
     def get_object(self):
         queryset = self.get_queryset()
@@ -1033,7 +1034,7 @@ def delete(self, request, *args, **kwargs):  # pylint: disable=unused-argument
 class ConceptContainerProcessingMixin:
     def get_permissions(self):
         if self.request.method == 'POST':
-            return [HasOwnership(), ]
+            return [HasOwnership(), IsAuthenticated()]
 
         return [CanViewConceptDictionary(), ]
 

core/integration_tests/tests_sources.py

@@ -1130,6 +1130,20 @@ def test_post_202_version(self, s3_has_path_mock, export_source_mock):
         s3_has_path_mock.assert_called_once_with("users/username/username_source1_v1.")
         export_source_mock.apply_async.assert_called_once_with((self.source_v1.id,), queue='default', task_id=ANY)
 
+    @patch('core.sources.views.export_source')
+    @patch('core.services.storages.cloud.aws.S3.has_path')
+    def test_post_401_version_anonymous(self, s3_has_path_mock, export_source_mock):
+        export_source_mock.__name__ = 'export_source'
+        s3_has_path_mock.return_value = False
+        response = self.client.post(
+            self.source_v1.uri + 'export/',
+            format='json'
+        )
+
+        self.assertEqual(response.status_code, 401)
+        s3_has_path_mock.assert_not_called()
+        export_source_mock.apply_async.assert_not_called()
+
     @patch('core.sources.views.export_source')
     @patch('core.services.storages.cloud.aws.S3.exists')
     def test_post_409_head(self, s3_exists_mock, export_source_mock):
@@ -1208,6 +1222,20 @@ def test_delete_204(self, s3_remove_mock, has_export_mock, export_path_mock):
         self.assertEqual(response.status_code, 204)
         s3_remove_mock.assert_called_once_with('v1/export/path')
 
+    @patch('core.sources.models.Source.version_export_path', new_callable=PropertyMock)
+    @patch('core.sources.models.Source.has_export')
+    @patch('core.services.storages.cloud.aws.S3.remove')
+    def test_delete_401_anonymous(self, s3_remove_mock, has_export_mock, export_path_mock):
+        has_export_mock.return_value = True
+        export_path_mock.return_value = 'v1/export/path'
+        response = self.client.delete(
+            self.source_v1.uri + 'export/',
+            format='json'
+        )
+
+        self.assertEqual(response.status_code, 401)
+        s3_remove_mock.assert_not_called()
+
 
 class ExportSourceTaskTest(OCLAPITestCase):
     @patch('core.common.utils.get_export_service')

core/sources/models.py

@@ -1,6 +1,7 @@
 import uuid
 from collections import OrderedDict
 
+from celery_once import AlreadyQueued
 from dirtyfields import DirtyFieldsMixin
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
@@ -484,13 +485,19 @@ def index_mappings_async(self, user):
         user = user or self.updated_by
 
         task = Task.new(queue='indexing', user=user, name=index_source_mappings.__name__)
-        index_source_mappings.apply_async((self.id,), queue='indexing', persist_args=True, task_id=task.id)
+        try:
+            index_source_mappings.apply_async((self.id,), queue='indexing', persist_args=True, task_id=task.id)
+        except AlreadyQueued:
+            pass
 
     def index_concepts_async(self, user):
         user = user or self.updated_by
 
         task = Task.new(queue='indexing', user=user, name=index_source_concepts.__name__)
-        index_source_concepts.apply_async((self.id,), queue='indexing', persist_args=True, task_id=task.id)
+        try:
+            index_source_concepts.apply_async((self.id,), queue='indexing', persist_args=True, task_id=task.id)
+        except AlreadyQueued:
+            pass
 
     def get_export_task(self):
         return Task.find(name__iendswith='export_source', args__contains=[self.id])

core/sources/views.py

@@ -530,7 +530,7 @@ class SourceVersionProcessingView(SourceBaseView, ConceptContainerProcessingMixi
 
 class SourceVersionExportView(ConceptContainerExportMixin, SourceVersionBaseView):
     entity = 'Source'
-    permission_classes = (CanViewConceptDictionary,)
+    permission_classes = (CanViewConceptDictionary, IsAuthenticated)
     serializer_class = SourceVersionExportSerializer
 
     def handle_export_version(self):