X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/62b3629a76473ae3846860362923b2e180c42e08..5624fec61db977d386ce03ca333241c74ca251b5:/services/api/app/models/collection.rb diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index df969e3315..9b081dbd2e 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -1,6 +1,8 @@ require 'arvados/keep' +require 'sweep_trashed_collections' class Collection < ArvadosModel + extend CurrentApiClient extend DbCurrentTime include HasUuid include KindAndEtag @@ -8,17 +10,21 @@ class Collection < ArvadosModel serialize :properties, Hash + before_validation :set_validation_timestamp before_validation :default_empty_manifest before_validation :check_encoding before_validation :check_manifest_validity before_validation :check_signatures before_validation :strip_signatures_and_update_replication_confirmed + before_validation :ensure_trash_at_not_in_past + before_validation :sync_trash_state + before_validation :default_trash_interval validate :ensure_pdh_matches_manifest_text + validate :validate_trash_and_delete_timing before_save :set_file_names - before_save :expires_at_not_in_past - # Query only undeleted collections by default. - default_scope where("expires_at IS NULL or expires_at > statement_timestamp()") + # Query only untrashed collections by default. + default_scope where("is_trashed = false") api_accessible :user, extend: :common do |t| t.add :name @@ -26,10 +32,18 @@ class Collection < ArvadosModel t.add :properties t.add :portable_data_hash t.add :signed_manifest_text, as: :manifest_text + t.add :manifest_text, as: :unsigned_manifest_text t.add :replication_desired t.add :replication_confirmed t.add :replication_confirmed_at - t.add :expires_at + t.add :delete_at + t.add :trash_at + t.add :is_trashed + end + + after_initialize do + @signatures_checked = false + @computed_pdh_for_manifest_text = false end def self.attributes_required_columns @@ -39,10 +53,18 @@ class Collection < ArvadosModel # expose signed_manifest_text as manifest_text in the # API response, and never let clients select the # manifest_text column. - 'manifest_text' => ['manifest_text'], + # + # We need trash_at and is_trashed to determine the + # correct timestamp in signed_manifest_text. + 'manifest_text' => ['manifest_text', 'trash_at', 'is_trashed'], + 'unsigned_manifest_text' => ['manifest_text'], ) end + def self.ignored_select_attributes + super + ["updated_at", "file_names"] + end + FILE_TOKEN = /^[[:digit:]]+:[[:digit:]]+:/ def check_signatures return false if self.manifest_text.nil? @@ -54,7 +76,9 @@ class Collection < ArvadosModel # subsequent passes without checking any signatures. This is # important because the signatures have probably been stripped off # by the time we get to a second validation pass! - return true if @signatures_checked and @signatures_checked == computed_pdh + if @signatures_checked && @signatures_checked == computed_pdh + return true + end if self.manifest_text_changed? # Check permissions on the collection manifest. @@ -63,7 +87,7 @@ class Collection < ArvadosModel api_token = current_api_client_authorization.andand.api_token signing_opts = { api_token: api_token, - now: db_current_time.to_i, + now: @validation_timestamp.to_i, } self.manifest_text.each_line do |entry| entry.split.each do |tok| @@ -190,7 +214,7 @@ class Collection < ArvadosModel utf8 = manifest_text utf8.force_encoding Encoding::UTF_8 if utf8.valid_encoding? and utf8 == manifest_text.encode(Encoding::UTF_8) - manifest_text = utf8 + self.manifest_text = utf8 return true end rescue @@ -211,16 +235,25 @@ class Collection < ArvadosModel end def signed_manifest_text - if has_attribute? :manifest_text + if !has_attribute? :manifest_text + return nil + elsif is_trashed + return manifest_text + else token = current_api_client_authorization.andand.api_token - @signed_manifest_text = self.class.sign_manifest manifest_text, token + exp = [db_current_time.to_i + Rails.configuration.blob_signature_ttl, + trash_at].compact.map(&:to_i).min + self.class.sign_manifest manifest_text, token, exp end end - def self.sign_manifest manifest, token + def self.sign_manifest manifest, token, exp=nil + if exp.nil? + exp = db_current_time.to_i + Rails.configuration.blob_signature_ttl + end signing_opts = { api_token: token, - expire: db_current_time.to_i + Rails.configuration.blob_signature_ttl, + expire: exp, } m = munge_manifest_locators(manifest) do |match| Blob.sign_locator(match[0], signing_opts) @@ -271,10 +304,10 @@ class Collection < ArvadosModel hash_part = nil size_part = nil uuid.split('+').each do |token| - if token.match /^[0-9a-f]{32,}$/ + if token.match(/^[0-9a-f]{32,}$/) raise "uuid #{uuid} has multiple hash parts" if hash_part hash_part = token - elsif token.match /^\d+$/ + elsif token.match(/^\d+$/) raise "uuid #{uuid} has multiple size parts" if size_part size_part = token end @@ -302,7 +335,7 @@ class Collection < ArvadosModel # looks like a saved Docker image. manifest = Keep::Manifest.new(coll_match.manifest_text) if manifest.exact_file_count?(1) and - (manifest.files[0][1] =~ /^[0-9A-Fa-f]{64}\.tar$/) + (manifest.files[0][1] =~ /^(sha256:)?[0-9A-Fa-f]{64}\.tar$/) return [coll_match] end end @@ -340,6 +373,23 @@ class Collection < ArvadosModel find_all_for_docker_image(search_term, search_tag, readers).first end + # If the given pdh is an old-format docker image, old-format images + # aren't supported by the compute nodes according to site config, + # and a migrated new-format image is available, return the migrated + # image's pdh. Otherwise, just return pdh. + def self.docker_migration_pdh(read_users, pdh) + if Rails.configuration.docker_image_formats.include?('v1') + return pdh + end + Collection.readable_by(*read_users). + joins('INNER JOIN links ON head_uuid=portable_data_hash'). + where('tail_uuid=? AND link_class=? AND links.owner_uuid=?', + pdh, 'docker_image_migration', system_user_uuid). + order('links.created_at desc'). + select('portable_data_hash'). + first.andand.portable_data_hash || pdh + end + def self.searchable_columns operator super - ["manifest_text"] end @@ -348,6 +398,11 @@ class Collection < ArvadosModel super - ["manifest_text"] end + def self.where *args + SweepTrashedCollections.sweep_if_stale + super + end + protected def portable_manifest_text self.class.munge_manifest_locators(manifest_text) do |match| @@ -384,13 +439,65 @@ class Collection < ArvadosModel super end - # If expires_at is being changed to a time in the past, change it to + # Use a single timestamp for all validations, even though each + # validation runs at a different time. + def set_validation_timestamp + @validation_timestamp = db_current_time + end + + # If trash_at is being changed to a time in the past, change it to # now. This allows clients to say "expires {client-current-time}" # without failing due to clock skew, while avoiding odd log entries # like "expiry date changed to {1 year ago}". - def expires_at_not_in_past - if expires_at_changed? and expires_at - self.expires_at = [db_current_time, expires_at].max + def ensure_trash_at_not_in_past + if trash_at_changed? && trash_at + self.trash_at = [@validation_timestamp, trash_at].max end end + + # Caller can move into/out of trash by setting/clearing is_trashed + # -- however, if the caller also changes trash_at, then any changes + # to is_trashed are ignored. + def sync_trash_state + if is_trashed_changed? && !trash_at_changed? + if is_trashed + self.trash_at = @validation_timestamp + else + self.trash_at = nil + self.delete_at = nil + end + end + self.is_trashed = trash_at && trash_at <= @validation_timestamp || false + true + end + + # If trash_at is updated without touching delete_at, automatically + # update delete_at to a sensible value. + def default_trash_interval + if trash_at_changed? && !delete_at_changed? + if trash_at.nil? + self.delete_at = nil + else + self.delete_at = trash_at + Rails.configuration.default_trash_lifetime.seconds + end + end + end + + def validate_trash_and_delete_timing + if trash_at.nil? != delete_at.nil? + errors.add :delete_at, "must be set if trash_at is set, and must be nil otherwise" + end + + earliest_delete = ([@validation_timestamp, trash_at_was].compact.min + + Rails.configuration.blob_signature_ttl.seconds) + if delete_at && delete_at < earliest_delete + errors.add :delete_at, "#{delete_at} is too soon: earliest allowed is #{earliest_delete}" + end + + if delete_at && delete_at < trash_at + errors.add :delete_at, "must not be earlier than trash_at" + end + + true + end end