X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a11c56ef66604a9117e3db8c2fa2273c98f88b51..eb03fb3ad316a637f032f911af7d69950482ead3:/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 e5665e8670..936f823a5e 100644 --- a/services/api/app/models/arvados_model.rb +++ b/services/api/app/models/arvados_model.rb @@ -4,6 +4,7 @@ class ArvadosModel < ActiveRecord::Base self.abstract_class = true include CurrentApiClient # current_user, current_api_client, etc. + include DbCurrentTime attr_protected :created_at attr_protected :modified_by_user_uuid @@ -56,6 +57,12 @@ class ArvadosModel < ActiveRecord::Base "#{current_api_base}/#{self.class.to_s.pluralize.underscore}/#{self.uuid}" end + def self.selectable_attributes(template=:user) + # Return an array of attribute name strings that can be selected + # in the given template. + api_accessible_attributes(template).map { |attr_spec| attr_spec.first.to_s } + end + def self.searchable_columns operator textonly_operator = !operator.match(/[<=>]/) self.columns.select do |col| @@ -96,6 +103,17 @@ class ArvadosModel < ActiveRecord::Base api_column_map end + def self.columns_for_attributes(select_attributes) + # Given an array of attribute names to select, return an array of column + # names that must be fetched from the database to satisfy the request. + api_column_map = attributes_required_columns + select_attributes.flat_map { |attr| api_column_map[attr] }.uniq + end + + def self.default_orders + ["#{table_name}.modified_at desc", "#{table_name}.uuid"] + end + # If current user can manage the object, return an array of uuids of # users and groups that have permission to write the object. The # first two elements are always [self.owner_uuid, current user's @@ -297,8 +315,13 @@ class ArvadosModel < ActiveRecord::Base # Verify "write" permission on new owner # default fail unless one of: # current_user is this object - # current user can_write new owner - unless current_user == self or current_user.can? write: owner_uuid + # current user can_write new owner, or this object if owner unchanged + if new_record? or owner_uuid_changed? or is_a?(ApiClientAuthorization) + write_target = owner_uuid + else + write_target = uuid + end + unless current_user == self or current_user.can? write: write_target logger.warn "User #{current_user.uuid} tried to modify #{self.class.to_s} #{uuid} but does not have permission to write new owner_uuid #{owner_uuid}" errors.add :owner_uuid, "cannot be changed without write permission on new owner" raise PermissionDeniedError @@ -348,9 +371,10 @@ class ArvadosModel < ActiveRecord::Base end def update_modified_by_fields - self.updated_at = Time.now + current_time = db_current_time + self.updated_at = current_time self.owner_uuid ||= current_default_owner if self.respond_to? :owner_uuid= - self.modified_at = Time.now + self.modified_at = current_time self.modified_by_user_uuid = current_user ? current_user.uuid : nil self.modified_by_client_uuid = current_api_client ? current_api_client.uuid : nil true