X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4f552c0187f8c31d94ff74485c57ef7f9888597e..6f6c9a2c6e7b871ad9ee592f45ebfdb7f5f26ee1:/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 493cf828d1..25d73178c7 100644 --- a/services/api/app/models/arvados_model.rb +++ b/services/api/app/models/arvados_model.rb @@ -8,11 +8,16 @@ class ArvadosModel < ActiveRecord::Base attr_protected :modified_by_user_uuid attr_protected :modified_by_client_uuid attr_protected :modified_at + after_initialize :log_start_state before_create :ensure_permission_to_create before_update :ensure_permission_to_update before_destroy :ensure_permission_to_destroy - before_validation :maybe_update_modified_by_fields + before_create :update_modified_by_fields + before_update :maybe_update_modified_by_fields + after_create :log_create + after_update :log_update + after_destroy :log_destroy validate :ensure_serialized_attribute_type validate :normalize_collection_uuids validate :ensure_valid_uuids @@ -84,6 +89,10 @@ class ArvadosModel < ActiveRecord::Base user.uuid) end + def logged_attributes + attributes + end + protected def ensure_permission_to_create @@ -145,7 +154,7 @@ class ArvadosModel < ActiveRecord::Base end def update_modified_by_fields - self.created_at ||= Time.now + self.updated_at = Time.now self.owner_uuid ||= current_default_owner if self.respond_to? :owner_uuid= self.modified_at = Time.now self.modified_by_user_uuid = current_user ? current_user.uuid : nil @@ -176,6 +185,10 @@ class ArvadosModel < ActiveRecord::Base %w(modified_by_client_uuid) end + def skip_uuid_existence_check + [] + end + def normalize_collection_uuids foreign_key_attributes.each do |attr| attr_value = send attr @@ -213,22 +226,42 @@ class ArvadosModel < ActiveRecord::Base specials = [system_user_uuid, 'd41d8cd98f00b204e9800998ecf8427e+0'] foreign_key_attributes.each do |attr| - begin - if new_record? or send (attr + "_changed?") - attr_value = send attr - r = ArvadosModel::resource_class_for_uuid attr_value if attr_value - r = r.readable_by(current_user) if r and not skip_uuid_read_permission_check.include? attr - if r and r.where(uuid: attr_value).count == 0 and not specials.include? attr_value - errors.add(attr, "'#{attr_value}' not found") + if new_record? or send (attr + "_changed?") + next if skip_uuid_existence_check.include? attr + attr_value = send attr + next if specials.include? attr_value + if attr_value + if (r = ArvadosModel::resource_class_for_uuid attr_value) + unless skip_uuid_read_permission_check.include? attr + r = r.readable_by(current_user) + end + if r.where(uuid: attr_value).count == 0 + errors.add(attr, "'#{attr_value}' not found") + end end end - rescue Exception => e - bt = e.backtrace.join("\n") - errors.add(attr, "'#{attr_value}' error '#{e}'\n#{bt}\n") end end end + class Email + def self.kind + "email" + end + + def kind + self.class.kind + end + + def self.readable_by (u) + self + end + + def self.where (u) + [{:uuid => u[:uuid]}] + end + end + def self.resource_class_for_uuid(uuid) if uuid.is_a? ArvadosModel return uuid.class @@ -245,7 +278,44 @@ class ArvadosModel < ActiveRecord::Base uuid.match @@UUID_REGEX do |re| return uuid_prefixes[re[1]] if uuid_prefixes[re[1]] end + + if uuid.match /.+@.+/ + return Email + end + nil end + def log_start_state + @old_etag = etag + @old_attributes = logged_attributes + end + + def log_change(event_type) + log = Log.new(event_type: event_type).fill_object(self) + yield log + log.save! + log_start_state + end + + def log_create + log_change('create') do |log| + log.fill_properties('old', nil, nil) + log.update_to self + end + end + + def log_update + log_change('update') do |log| + log.fill_properties('old', @old_etag, @old_attributes) + log.update_to self + end + end + + def log_destroy + log_change('destroy') do |log| + log.fill_properties('old', @old_etag, @old_attributes) + log.update_to nil + end + end end