X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/425836b285a32c31ef643f8c5d4b48b8b42b7ac4..8a0e9c549595e114a0eadc9d6792a17fb59d0f3e:/services/api/app/models/collection.rb diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index 578f25a62f..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 @@ -86,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 @@ -123,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? @@ -321,9 +323,9 @@ class Collection < ArvadosModel end def should_preserve_version? - return false unless (Rails.configuration.collection_versioning && versionable_updates?(self.changes.keys)) + return false unless (Rails.configuration.Collections["CollectionVersioning"] && versionable_updates?(self.changes.keys)) - idle_threshold = Rails.configuration.preserve_version_if_idle + 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)) @@ -333,9 +335,7 @@ class Collection < ArvadosModel 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 @@ -350,7 +350,7 @@ class Collection < ArvadosModel rescue end errors.add :manifest_text, "must use UTF-8 encoding" - false + throw(:abort) end end @@ -360,7 +360,7 @@ class Collection < ArvadosModel true rescue ArgumentError => e errors.add :manifest_text, e.message - false + throw(:abort) end end @@ -371,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 @@ -379,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, @@ -489,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) @@ -500,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 @@ -516,7 +518,7 @@ 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) - if coll_match.any? or Rails.configuration.remote_hosts.length == 0 + 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