[Need QA Prep] Feature/The Node-Preprint Divorce [PLAT-555][PLAT-480][PLAT-559][PLAT-561][PLAT-1168]

addons/base/views.py

@@ -12,6 +12,7 @@
 import furl
 import jwe
 import jwt
+
 from django.db import transaction
 from django.contrib.contenttypes.models import ContentType
 
@@ -35,7 +36,7 @@
 from addons.base.utils import format_last_known_metadata, get_mfr_url
 from osf import features
 from osf.models import (BaseFileNode, TrashedFileNode,
-                        OSFUser, AbstractNode,
+                        OSFUser, AbstractNode, Preprint,
                         NodeLog, DraftRegistration, RegistrationSchema,
                         Guid, FileVersionUserMetadata, FileVersion)
 from website.profile.utils import get_profile_image_url
@@ -147,7 +148,6 @@ def get_addon_user_config(**kwargs):
     'movefrom': 'write',
 }
 
-
 def check_access(node, auth, action, cas_resp):
     """Verify that user can perform requested action on resource. Raise appropriate
     error code if action cannot proceed.
@@ -158,21 +158,22 @@ def check_access(node, auth, action, cas_resp):
 
     if cas_resp:
         if permission == 'read':
-            if node.is_public:
+            if node.can_view_files(auth=None):
                 return True
-            required_scope = oauth_scopes.CoreScopes.NODE_FILE_READ
+            required_scope = node.file_read_scope
         else:
-            required_scope = oauth_scopes.CoreScopes.NODE_FILE_WRITE
+            required_scope = node.file_write_scope
+
         if not cas_resp.authenticated \
            or required_scope not in oauth_scopes.normalize_scopes(cas_resp.attributes['accessTokenScope']):
             raise HTTPError(httplib.FORBIDDEN)
 
     if permission == 'read':
-        if node.can_view(auth):
+        if node.can_view_files(auth):
             return True
         # The user may have admin privileges on a parent node, in which
         # case they should have read permissions
-        if node.is_registration and node.registered_from.can_view(auth):
+        if getattr(node, 'is_registration', False) and node.registered_from.can_view(auth):
             return True
     if permission == 'write' and node.can_edit(auth):
         return True
@@ -188,33 +189,33 @@ def check_access(node, auth, action, cas_resp):
     # `node.is_registration` == True. However, we have no way of telling if
     # `copyfrom` actions are originating from a node being registered.
     # TODO This is raise UNAUTHORIZED for registrations that have not been archived yet
-    if action == 'copyfrom' or (action == 'upload' and node.is_registration):
-        parent = node.parent_node
-        while parent:
-            if parent.can_edit(auth):
+    if isinstance(node, AbstractNode):
+        if action == 'copyfrom' or (action == 'upload' and node.is_registration):
+            parent = node.parent_node
+            while parent:
+                if parent.can_edit(auth):
+                    return True
+                parent = parent.parent_node
+
+        # Users with the prereg admin permission should be allowed to download files
+        # from prereg challenge draft registrations.
+        try:
+            prereg_schema = RegistrationSchema.objects.get(name='Prereg Challenge', schema_version=2)
+            allowed_nodes = [node] + node.parents
+            prereg_draft_registration = DraftRegistration.objects.filter(
+                branched_from__in=allowed_nodes,
+                registration_schema=prereg_schema
+            )
+            if action == 'download' and \
+                        auth.user is not None and \
+                        prereg_draft_registration.count() > 0 and \
+                        auth.user.has_perm('osf.administer_prereg'):
                 return True
-            parent = parent.parent_node
-
-    # Users with the prereg admin permission should be allowed to download files
-    # from prereg challenge draft registrations.
-    try:
-        prereg_schema = RegistrationSchema.objects.get(name='Prereg Challenge', schema_version=2)
-        allowed_nodes = [node] + node.parents
-        prereg_draft_registration = DraftRegistration.objects.filter(
-            branched_from__in=allowed_nodes,
-            registration_schema=prereg_schema
-        )
-        if action == 'download' and \
-                    auth.user is not None and \
-                    prereg_draft_registration.count() > 0 and \
-                    auth.user.has_perm('osf.administer_prereg'):
-            return True
-    except RegistrationSchema.DoesNotExist:
-        pass
+        except RegistrationSchema.DoesNotExist:
+            pass
 
     raise HTTPError(httplib.FORBIDDEN if auth.user else httplib.UNAUTHORIZED)
 
-
 def make_auth(user):
     if user is not None:
         return {
@@ -264,15 +265,16 @@ def get_auth(auth, **kwargs):
     except KeyError:
         raise HTTPError(httplib.BAD_REQUEST)
 
-    node = AbstractNode.load(node_id)
+    node = AbstractNode.load(node_id) or Preprint.load(node_id)
     if not node:
         raise HTTPError(httplib.NOT_FOUND)
 
     check_access(node, auth, action, cas_resp)
-
-    provider_settings = node.get_addon(provider_name)
-    if not provider_settings:
-        raise HTTPError(httplib.BAD_REQUEST)
+    provider_settings = None
+    if hasattr(node, 'get_addon'):
+        provider_settings = node.get_addon(provider_name)
+        if not provider_settings:
+            raise HTTPError(httplib.BAD_REQUEST)
 
     try:
         path = data.get('path')
@@ -303,13 +305,13 @@ def get_auth(auth, **kwargs):
                 region = fileversion.region
                 credentials = region.waterbutler_credentials
                 waterbutler_settings = fileversion.serialize_waterbutler_settings(
-                    node_id=provider_settings.owner._id,
-                    root_id=provider_settings.root_node._id,
+                    node_id=provider_settings.owner._id if provider_settings else node._id,
+                    root_id=provider_settings.root_node._id if provider_settings else node.root_folder._id,
                 )
         # If they haven't been set by version region, use the NodeSettings region
         if not (credentials and waterbutler_settings):
-            credentials = provider_settings.serialize_waterbutler_credentials()
-            waterbutler_settings = provider_settings.serialize_waterbutler_settings()
+            credentials = node.serialize_waterbutler_credentials(provider_name)
+            waterbutler_settings = node.serialize_waterbutler_settings(provider_name)
     except exceptions.AddonError:
         log_exception()
         raise HTTPError(httplib.BAD_REQUEST)
@@ -321,10 +323,10 @@ def get_auth(auth, **kwargs):
             'credentials': credentials,
             'settings': waterbutler_settings,
             'callback_url': node.api_url_for(
-                ('create_waterbutler_log' if not node.is_registration else 'registration_callbacks'),
+                ('create_waterbutler_log' if not getattr(node, 'is_registration', False) else 'registration_callbacks'),
                 _absolute=True,
                 _internal=True
-            ),
+            )
         }
     }, settings.WATERBUTLER_JWT_SECRET, algorithm=settings.WATERBUTLER_JWT_ALGORITHM), WATERBUTLER_JWE_KEY)}
 
@@ -362,14 +364,16 @@ def mark_file_version_as_seen(user, path, version):
 
 @must_be_signed
 @no_auto_transaction
-@must_be_valid_project(quickfiles_valid=True)
+@must_be_valid_project(quickfiles_valid=True, preprints_valid=True)
 def create_waterbutler_log(payload, **kwargs):
     with transaction.atomic():
         try:
             auth = payload['auth']
             # Don't log download actions, but do update analytics
             if payload['action'] in DOWNLOAD_ACTIONS:
-                node = AbstractNode.load(payload['metadata']['nid'])
+                guid = Guid.load(payload['metadata'].get('nid'))
+                if guid:
+                    node = guid.referent
                 return {'status': 'success'}
 
             user = OSFUser.load(auth['id'])
@@ -381,7 +385,7 @@ def create_waterbutler_log(payload, **kwargs):
             raise HTTPError(httplib.BAD_REQUEST)
 
         auth = Auth(user=user)
-        node = kwargs['node'] or kwargs['project']
+        node = kwargs.get('node') or kwargs.get('project') or Preprint.load(kwargs.get('nid')) or Preprint.load(kwargs.get('pid'))
 
         if action in (NodeLog.FILE_MOVED, NodeLog.FILE_COPIED):
 
@@ -408,14 +412,19 @@ def create_waterbutler_log(payload, **kwargs):
                     action = LOG_ACTION_MAP['rename']
 
             destination_node = node  # For clarity
-            source_node = AbstractNode.load(payload['source']['nid'])
+            source_node = AbstractNode.load(src['nid']) or Preprint.load(src['nid'])
 
-            source = source_node.get_addon(payload['source']['provider'])
-            destination = node.get_addon(payload['destination']['provider'])
+            # We return provider fullname so we need to load node settings, if applicable
+            source = None
+            if hasattr(source_node, 'get_addon'):
+                source = source_node.get_addon(payload['source']['provider'])
+            destination = None
+            if hasattr(node, 'get_addon'):
+                destination = node.get_addon(payload['destination']['provider'])
 
             payload['source'].update({
                 'materialized': payload['source']['materialized'].lstrip('/'),
-                'addon': source.config.full_name,
+                'addon': source.config.full_name if source else 'osfstorage',
                 'url': source_node.web_url_for(
                     'addon_view_or_download_file',
                     path=payload['source']['path'].lstrip('/'),
@@ -430,7 +439,7 @@ def create_waterbutler_log(payload, **kwargs):
 
             payload['destination'].update({
                 'materialized': payload['destination']['materialized'].lstrip('/'),
-                'addon': destination.config.full_name,
+                'addon': destination.config.full_name if destination else 'osfstorage',
                 'url': destination_node.web_url_for(
                     'addon_view_or_download_file',
                     path=payload['destination']['path'].lstrip('/'),
@@ -443,11 +452,6 @@ def create_waterbutler_log(payload, **kwargs):
                 }
             })
 
-            payload.update({
-                'node': destination_node._id,
-                'project': destination_node.parent_id,
-            })
-
             if not payload.get('errors'):
                 destination_node.add_log(
                     action=action,
@@ -475,18 +479,7 @@ def create_waterbutler_log(payload, **kwargs):
                 return {'status': 'success'}
 
         else:
-            try:
-                metadata = payload['metadata']
-                node_addon = node.get_addon(payload['provider'])
-            except KeyError:
-                raise HTTPError(httplib.BAD_REQUEST)
-
-            if node_addon is None:
-                raise HTTPError(httplib.BAD_REQUEST)
-
-            metadata['path'] = metadata['path'].lstrip('/')
-
-            node_addon.create_waterbutler_log(auth, action, metadata)
+            node.create_waterbutler_log(auth, action, payload)
 
     with transaction.atomic():
         file_signals.file_updated.send(target=node, user=user, event_type=action, payload=payload)
@@ -673,26 +666,28 @@ def addon_view_or_download_file(auth, path, provider, **kwargs):
     if not path:
         raise HTTPError(httplib.BAD_REQUEST)
 
-    node_addon = target.get_addon(provider)
+    if hasattr(target, 'get_addon'):
 
-    if not isinstance(node_addon, BaseStorageAddon):
-        object_text = markupsafe.escape(getattr(target, 'project_or_component', 'this object'))
-        raise HTTPError(httplib.BAD_REQUEST, data={
-            'message_short': 'Bad Request',
-            'message_long': 'The {} add-on containing {} is no longer connected to {}.'.format(provider_safe, path_safe, object_text)
-        })
+        node_addon = target.get_addon(provider)
 
-    if not node_addon.has_auth:
-        raise HTTPError(httplib.UNAUTHORIZED, data={
-            'message_short': 'Unauthorized',
-            'message_long': 'The {} add-on containing {} is no longer authorized.'.format(provider_safe, path_safe)
-        })
+        if not isinstance(node_addon, BaseStorageAddon):
+            object_text = markupsafe.escape(getattr(target, 'project_or_component', 'this object'))
+            raise HTTPError(httplib.BAD_REQUEST, data={
+                'message_short': 'Bad Request',
+                'message_long': 'The {} add-on containing {} is no longer connected to {}.'.format(provider_safe, path_safe, object_text)
+            })
 
-    if not node_addon.complete:
-        raise HTTPError(httplib.BAD_REQUEST, data={
-            'message_short': 'Bad Request',
-            'message_long': 'The {} add-on containing {} is no longer configured.'.format(provider_safe, path_safe)
-        })
+        if not node_addon.has_auth:
+            raise HTTPError(httplib.UNAUTHORIZED, data={
+                'message_short': 'Unauthorized',
+                'message_long': 'The {} add-on containing {} is no longer authorized.'.format(provider_safe, path_safe)
+            })
+
+        if not node_addon.complete:
+            raise HTTPError(httplib.BAD_REQUEST, data={
+                'message_short': 'Bad Request',
+                'message_long': 'The {} add-on containing {} is no longer configured.'.format(provider_safe, path_safe)
+            })
 
     savepoint_id = transaction.savepoint()
     file_node = BaseFileNode.resolve_class(provider, BaseFileNode.FILE).get_or_create(target, path)
@@ -753,6 +748,10 @@ def addon_view_or_download_file(auth, path, provider, **kwargs):
     if len(request.path.strip('/').split('/')) > 1:
         guid = file_node.get_guid(create=True)
         return redirect(furl.furl('/{}/'.format(guid._id)).set(args=extras).url)
+    if isinstance(target, Preprint):
+        # Redirecting preprint file guids to the preprint detail page
+        return redirect('/{}/'.format(target._id))
+
     return addon_view_file(auth, target, file_node, version)
 
 

addons/osfstorage/models.py

@@ -153,7 +153,7 @@ def _check_delete_allowed(self):
 
     @property
     def is_preprint_primary(self):
-        return getattr(self.target, 'preprint_file', None) == self and not getattr(self.target, '_has_abandoned_preprint', None)
+        return getattr(self.target, 'primary_file', None) == self
 
     def delete(self, user=None, parent=None, **kwargs):
         self._path = self.path
@@ -431,9 +431,9 @@ def is_checked_out(self):
 
     @property
     def is_preprint_primary(self):
-        if hasattr(self.target, 'preprint_file') and self.target.preprint_file:
+        if hasattr(self.target, 'primary_file') and self.target.primary_file:
             for child in self.children.all():
-                if getattr(child.target, 'preprint_file', None):
+                if getattr(child.target, 'primary_file', None):
                     if child.is_preprint_primary:
                         return True
         return False