10585: Merge branch 'master' into 10587-python-cli-version

[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..649a6f80c281fc83f2d6eaf4b0fc80fe82c28ce6 100644 (file)
--- a/services/api/app/models/link.rb
+++ b/services/api/app/models/link.rb
@@ -8,9 +8,7 @@ class Link < ArvadosModel
   after_update :maybe_invalidate_permissions_cache
   after_create :maybe_invalidate_permissions_cache
   after_destroy :maybe_invalidate_permissions_cache
-  attr_accessor :head_kind, :tail_kind
-  validate :name_link_has_valid_name
-  validate :name_link_owner_is_tail
+  validate :name_links_are_obsolete
 
   api_accessible :user, extend: :common do |t|
     t.add :tail_uuid
@@ -52,7 +50,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.
@@ -67,35 +65,28 @@ class Link < ArvadosModel
       # permissions for head_uuid and tail_uuid, and invalidate the
       # cache for only those users. (This would require a browseable
       # cache.)
-      User.invalidate_permissions_cache
+      User.invalidate_permissions_cache db_current_time.to_i
     end
   end
 
-  def name_link_has_valid_name
+  def name_links_are_obsolete
     if link_class == 'name'
-      unless name.is_a? String and !name.empty?
-        errors.add('name', 'must be a non-empty string')
-      end
+      errors.add('name', 'Name links are obsolete')
+      false
     else
       true
     end
   end
 
-  def name_link_owner_is_tail
-    if link_class == 'name'
-      self.owner_uuid = tail_uuid
-      ensure_owner_uuid_is_permitted
-    end
-  end
-
   # A user is permitted to create, update or modify a permission link
-  # if and only if they have "manage" permission on the destination
-  # object.
+  # if and only if they have "manage" permission on the object
+  # indicated by the permission link's head_uuid.
+  #
   # All other links are treated as regular ArvadosModel objects.
   #
   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 +95,5 @@ class Link < ArvadosModel
       super
     end
   end
+
 end