Merge remote-tracking branch 'origin/master' into origin-2608-websocket-event-bus...

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

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 449a061cc9165e5dfdeca89d4b9ca3d0a8f095e5..097b8db9df134c14a908e22667ee102d43fd84eb 100644 (file)
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -47,9 +47,7 @@ class ArvadosModel < ActiveRecord::Base
   def self.searchable_columns operator
     textonly_operator = !operator.match(/[<=>]/)
     self.columns.collect do |col|
-      if col.name == 'owner_uuid'
-        nil
-      elsif [:string, :text].index(col.type)
+      if [:string, :text].index(col.type)
         col.name
       elsif !textonly_operator and [:datetime, :integer].index(col.type)
         col.name
@@ -75,27 +73,39 @@ class ArvadosModel < ActiveRecord::Base
   # end
 
   def self.readable_by user
+    if user.is_admin
+      # Admins can read anything, so return immediately.
+      return self
+    end
+
     uuid_list = [user.uuid, *user.groups_i_can(:read)]
     sanitized_uuid_list = uuid_list.
       collect { |uuid| sanitize(uuid) }.join(', ')
     or_references_me = ''
 
-    if self == Link and user
+    if self == User
+      or_row_is_me = "OR (#{table_name}.uuid=#{sanitize user.uuid})"
+    end
+
+    if self == Link
       or_references_me = "OR (#{table_name}.link_class in (#{sanitize 'permission'}, #{sanitize 'resources'}) AND #{sanitize user.uuid} IN (#{table_name}.head_uuid, #{table_name}.tail_uuid))"
     end
 
-    if self == Log and user
-      object_owner = ", #{table_name}.object_owner_uuid"
+    if self == Log
+      or_object_uuid = ", #{table_name}.object_uuid"
       or_object_owner = "OR (#{table_name}.object_owner_uuid in (#{sanitized_uuid_list}))"
     end
 
-    # Link head points to this row, or to the owner of this row
-    # (or owner of object described by this row, for logs table only)
-    # Link tail originates from this user, or a group that is readable by this user
-    # Link is any permission link ('write' and 'manage' implicitly grant 'read')
+    # Link head points to this row, or to the owner of this row (the thing to be read)
+    # (or the object described by this row, for logs table only)
+    # Link tail originates from this user, or a group that is readable by this
+    # user (the identity with authorization to read)
+    # Link is any permission link ('write' and 'manage' implicitly include 'read')
+    # The existence of such a link is tested in the where clause as permissions.head_uuid IS NOT NULL.
     # or
     # This row is owned by this user, or owned by a group readable by this user
     # or
+    # This is the users table
     # This row uuid is equal this user uuid
     # or
     # This is the links table
@@ -104,11 +114,10 @@ class ArvadosModel < ActiveRecord::Base
     # or
     # This is the logs table
     # This object described by this row is owned by this user, or owned by a group readable by this user
-    joins("LEFT JOIN links permissions ON permissions.head_uuid in (#{table_name}.owner_uuid, #{table_name}.uuid #{object_owner}) AND permissions.tail_uuid in (#{sanitized_uuid_list}) AND permissions.link_class='permission'").
-      where("?=? OR #{table_name}.owner_uuid in (?) OR #{table_name}.uuid=? OR permissions.head_uuid IS NOT NULL #{or_references_me} #{or_object_owner}",
-            true, user.is_admin,
-            uuid_list,
-            user.uuid)
+
+    joins("LEFT JOIN links permissions ON permissions.head_uuid in (#{table_name}.owner_uuid, #{table_name}.uuid #{or_object_uuid}) AND permissions.tail_uuid in (#{sanitized_uuid_list}) AND permissions.link_class='permission'").
+      where("permissions.head_uuid IS NOT NULL OR #{table_name}.owner_uuid in (?) #{or_row_is_me} #{or_references_me} #{or_object_owner}",
+            uuid_list).uniq
   end
 
   def logged_attributes