X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/05729d26f0d71620bb7151b443f628a92d3ec78d..8a0e9c549595e114a0eadc9d6792a17fb59d0f3e:/services/api/app/models/collection.rb diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index 525a80b9ee..46da37afd4 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -14,9 +14,11 @@ class Collection < ArvadosModel include CommonApiTemplate include Trashable - serialize :properties, Hash - serialize :storage_classes_desired, Array - serialize :storage_classes_confirmed, Array + # Posgresql JSONB columns should NOT be declared as serialized, Rails 5 + # already know how to properly treat them. + attribute :properties, :jsonbHash, default: {} + attribute :storage_classes_desired, :jsonbArray, default: ["default"] + attribute :storage_classes_confirmed, :jsonbArray, default: [] before_validation :default_empty_manifest before_validation :default_storage_classes, on: :create @@ -27,7 +29,11 @@ class Collection < ArvadosModel validate :ensure_pdh_matches_manifest_text validate :ensure_storage_classes_desired_is_not_empty validate :ensure_storage_classes_contain_non_empty_strings + validate :versioning_metadata_updates, on: :update + validate :past_versions_cannot_be_updated, on: :update + after_validation :set_file_count_and_total_size before_save :set_file_names + around_update :manage_versioning api_accessible :user, extend: :common do |t| t.add :name @@ -45,6 +51,11 @@ class Collection < ArvadosModel t.add :delete_at t.add :trash_at t.add :is_trashed + t.add :version + t.add :current_version_uuid + t.add :preserve_version + t.add :file_count + t.add :file_size_total end after_initialize do @@ -77,7 +88,7 @@ class Collection < ArvadosModel FILE_TOKEN = /^[[:digit:]]+:[[:digit:]]+:/ def check_signatures - return false if self.manifest_text.nil? + throw(:abort) if self.manifest_text.nil? return true if current_user.andand.is_admin @@ -114,7 +125,7 @@ class Collection < ArvadosModel # Signature provided, but verify_signature did not like it. logger.warn "Invalid signature on locator #{tok}" raise ArvadosModel::PermissionDeniedError - elsif Rails.configuration.permit_create_collection_with_unsigned_manifest + elsif !Rails.configuration.Collections["BlobSigning"] # No signature provided, but we are running in insecure mode. logger.debug "Missing signature on locator #{tok} ignored" elsif Blob.new(tok).empty? @@ -189,6 +200,20 @@ class Collection < ArvadosModel true end + def set_file_count_and_total_size + # Only update the file stats if the manifest changed + if self.manifest_text_changed? + m = Keep::Manifest.new(self.manifest_text) + self.file_size_total = m.files_size + self.file_count = m.files_count + # If the manifest didn't change but the attributes did, ignore the changes + elsif self.file_count_changed? || self.file_size_total_changed? + self.file_count = self.file_count_was + self.file_size_total = self.file_size_total_was + end + true + end + def manifest_files return '' if !self.manifest_text @@ -211,10 +236,106 @@ class Collection < ArvadosModel self.manifest_text ||= '' end + def skip_uuid_existence_check + # Avoid checking the existence of current_version_uuid, as it's + # assigned on creation of a new 'current version' collection, so + # the collection's UUID only lives on memory when the validation check + # is performed. + ['current_version_uuid'] + end + + def manage_versioning + should_preserve_version = should_preserve_version? # Time sensitive, cache value + return(yield) unless (should_preserve_version || syncable_updates.any?) + + # Put aside the changes because with_lock forces a record reload + changes = self.changes + snapshot = nil + with_lock do + # Copy the original state to save it as old version + if should_preserve_version + snapshot = self.dup + snapshot.uuid = nil # Reset UUID so it's created as a new record + snapshot.created_at = self.created_at + end + + # Restore requested changes on the current version + changes.keys.each do |attr| + if attr == 'preserve_version' && changes[attr].last == false + next # Ignore false assignment, once true it'll be true until next version + end + self.attributes = {attr => changes[attr].last} + if attr == 'uuid' + # Also update the current version reference + self.attributes = {'current_version_uuid' => changes[attr].last} + end + end + + if should_preserve_version + self.version += 1 + self.preserve_version = false + end + + yield + + sync_past_versions if syncable_updates.any? + if snapshot + snapshot.attributes = self.syncable_updates + snapshot.manifest_text = snapshot.signed_manifest_text + snapshot.save + end + end + end + + def syncable_updates + updates = {} + (syncable_attrs & self.changes.keys).each do |attr| + if attr == 'uuid' + # Point old versions to current version's new UUID + updates['current_version_uuid'] = self.changes[attr].last + else + updates[attr] = self.changes[attr].last + end + end + return updates + end + + def sync_past_versions + updates = self.syncable_updates + Collection.where('current_version_uuid = ? AND uuid != ?', self.uuid_was, self.uuid_was).each do |c| + c.attributes = updates + # Use a different validation context to skip the 'old_versions_cannot_be_updated' + # validator, as on this case it is legal to update some fields. + leave_modified_by_user_alone do + leave_modified_at_alone do + c.save(context: :update_old_versions) + end + end + end + end + + def versionable_updates?(attrs) + (['manifest_text', 'description', 'properties', 'name'] & attrs).any? + end + + def syncable_attrs + ['uuid', 'owner_uuid', 'delete_at', 'trash_at', 'is_trashed', 'replication_desired', 'storage_classes_desired'] + end + + def should_preserve_version? + return false unless (Rails.configuration.Collections["CollectionVersioning"] && versionable_updates?(self.changes.keys)) + + idle_threshold = Rails.configuration.Collections["PreserveVersionIfIdle"] + if !self.preserve_version_was && + (idle_threshold < 0 || + (idle_threshold > 0 && self.modified_at_was > db_current_time-idle_threshold.seconds)) + return false + end + return true + end + def check_encoding - if manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding? - true - else + if !(manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding?) begin # If Ruby thinks the encoding is something else, like 7-bit # ASCII, but its stored bytes are equal to the (valid) UTF-8 @@ -229,7 +350,7 @@ class Collection < ArvadosModel rescue end errors.add :manifest_text, "must use UTF-8 encoding" - false + throw(:abort) end end @@ -239,7 +360,7 @@ class Collection < ArvadosModel true rescue ArgumentError => e errors.add :manifest_text, e.message - false + throw(:abort) end end @@ -250,7 +371,7 @@ class Collection < ArvadosModel return manifest_text else token = Thread.current[:token] - exp = [db_current_time.to_i + Rails.configuration.blob_signature_ttl, + exp = [db_current_time.to_i + Rails.configuration.Collections["BlobSigningTTL"], trash_at].compact.map(&:to_i).min self.class.sign_manifest manifest_text, token, exp end @@ -258,7 +379,7 @@ class Collection < ArvadosModel def self.sign_manifest manifest, token, exp=nil if exp.nil? - exp = db_current_time.to_i + Rails.configuration.blob_signature_ttl + exp = db_current_time.to_i + Rails.configuration.Collections["BlobSigningTTL"] end signing_opts = { api_token: token, @@ -368,7 +489,7 @@ class Collection < ArvadosModel # # If filter_compatible_format is true (the default), only return image # collections which are support by the installation as indicated by - # Rails.configuration.docker_image_formats. Will follow + # Rails.configuration.Containers["SupportedDockerImageFormats"]. Will follow # 'docker_image_migration' links if search_term resolves to an incompatible # image, but an equivalent compatible image is available. def self.find_all_for_docker_image(search_term, search_tag=nil, readers=nil, filter_compatible_format: true) @@ -379,15 +500,17 @@ class Collection < ArvadosModel joins("JOIN collections ON links.head_uuid = collections.uuid"). order("links.created_at DESC") - if (Rails.configuration.docker_image_formats.include? 'v1' and - Rails.configuration.docker_image_formats.include? 'v2') or filter_compatible_format == false + docker_image_formats = Rails.configuration.Containers["SupportedDockerImageFormats"] + + if (docker_image_formats.include? 'v1' and + docker_image_formats.include? 'v2') or filter_compatible_format == false pattern = /^(sha256:)?[0-9A-Fa-f]{64}\.tar$/ - elsif Rails.configuration.docker_image_formats.include? 'v2' + elsif docker_image_formats.include? 'v2' pattern = /^(sha256:)[0-9A-Fa-f]{64}\.tar$/ - elsif Rails.configuration.docker_image_formats.include? 'v1' + elsif docker_image_formats.include? 'v1' pattern = /^[0-9A-Fa-f]{64}\.tar$/ else - raise "Unrecognized configuration for docker_image_formats #{Rails.configuration.docker_image_formats}" + raise "Unrecognized configuration for docker_image_formats #{docker_image_formats}" end # If the search term is a Collection locator that contains one file @@ -395,7 +518,14 @@ class Collection < ArvadosModel if loc = Keep::Locator.parse(search_term) loc.strip_hints! coll_match = readable_by(*readers).where(portable_data_hash: loc.to_s).limit(1) - return get_compatible_images(readers, pattern, coll_match) + if coll_match.any? or Rails.configuration.RemoteClusters.length > 1 + return get_compatible_images(readers, pattern, coll_match) + else + # Allow bare pdh that doesn't exist in the local database so + # that federated container requests which refer to remotely + # stored containers will validate. + return [Collection.new(portable_data_hash: loc.to_s)] + end end if search_tag.nil? and (n = search_term.index(":")) @@ -443,7 +573,7 @@ class Collection < ArvadosModel end def self.full_text_searchable_columns - super - ["manifest_text", "storage_classes_desired", "storage_classes_confirmed"] + super - ["manifest_text", "storage_classes_desired", "storage_classes_confirmed", "current_version_uuid"] end def self.where *args @@ -516,4 +646,32 @@ class Collection < ArvadosModel end end end + + def past_versions_cannot_be_updated + # We check for the '_was' values just in case the update operation + # includes a change on current_version_uuid or uuid. + if current_version_uuid_was != uuid_was + errors.add(:base, "past versions cannot be updated") + false + end + end + + def versioning_metadata_updates + valid = true + if (current_version_uuid_was == uuid_was) && current_version_uuid_changed? + errors.add(:current_version_uuid, "cannot be updated") + valid = false + end + if version_changed? + errors.add(:version, "cannot be updated") + valid = false + end + valid + end + + def assign_uuid + super + self.current_version_uuid ||= self.uuid + true + end end