Update tests and user setup methods. refs #3525

[arvados.git] / services / api / app / models / link.rb

diff --git a/services/api/app/models/link.rb b/services/api/app/models/link.rb
index 3de536ef075604cafd35c873a560d345afa13b41..3058081c1e85b46f29060e35b138c205255d8545 100644 (file)
--- a/services/api/app/models/link.rb
+++ b/services/api/app/models/link.rb
@@ -52,7 +52,7 @@ class Link < ArvadosModel
     return true if current_user.is_admin
 
     # All users can grant permissions on objects they own or can manage
-    head_obj = ArvadosModel.lookup_by_uuid(head_uuid)
+    head_obj = ArvadosModel.find_by_uuid(head_uuid)
     return true if current_user.can?(manage: head_obj)
 
     # Default = deny.
@@ -95,7 +95,7 @@ class Link < ArvadosModel
   #
   def ensure_owner_uuid_is_permitted
     if link_class == 'permission'
-      ob = ArvadosModel.lookup_by_uuid(head_uuid)
+      ob = ArvadosModel.find_by_uuid(head_uuid)
       raise PermissionDeniedError unless current_user.can?(manage: ob)
       # All permission links should be owned by the system user.
       self.owner_uuid = system_user_uuid
@@ -104,4 +104,15 @@ class Link < ArvadosModel
       super
     end
   end
+
+  # A user can give all other users permissions on projects.
+  def skip_uuid_read_permission_check
+    skipped_attrs = super
+    if link_class == "permission" and
+        (ArvadosModel.resource_class_for_uuid(head_uuid) == Group) and
+        (ArvadosModel.resource_class_for_uuid(tail_uuid) == User)
+      skipped_attrs << "tail_uuid"
+    end
+    skipped_attrs
+  end
 end