X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/274ca7a6c2f1f600de4242eee6cb4e8465d4440c..c4fa80c6ed2445e1e384455944eb6c4108906cad:/services/api/app/models/collection.rb diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index accd2cc62c..89ad874cd7 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -5,10 +5,15 @@ class Collection < ArvadosModel include KindAndEtag include CommonApiTemplate + serialize :properties, Hash + + before_validation :check_encoding before_validation :check_signatures before_validation :strip_manifest_text before_validation :set_portable_data_hash + before_validation :maybe_clear_replication_confirmed validate :ensure_hash_matches_manifest_text + before_save :set_file_names # Query only undeleted collections by default. default_scope where("expires_at IS NULL or expires_at > CURRENT_TIMESTAMP") @@ -18,7 +23,21 @@ class Collection < ArvadosModel t.add :description t.add :properties t.add :portable_data_hash - t.add :manifest_text + t.add :signed_manifest_text, as: :manifest_text + t.add :replication_desired + t.add :replication_confirmed + t.add :replication_confirmed_at + end + + def self.attributes_required_columns + super.merge( + # If we don't list manifest_text explicitly, the + # params[:select] code gets confused by the way we + # expose signed_manifest_text as manifest_text in the + # API response, and never let clients select the + # manifest_text column. + 'manifest_text' => ['manifest_text'], + ) end def check_signatures @@ -26,6 +45,13 @@ class Collection < ArvadosModel return true if current_user.andand.is_admin + # Provided the manifest_text hasn't changed materially since an + # earlier validation, it's safe to pass this validation on + # 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 == compute_pdh + if self.manifest_text_changed? # Check permissions on the collection manifest. # If any signature cannot be verified, raise PermissionDeniedError @@ -61,13 +87,13 @@ class Collection < ArvadosModel end end end - true + @signatures_checked = compute_pdh end def strip_manifest_text if self.manifest_text_changed? # Remove any permission signatures from the manifest. - Collection.munge_manifest_locators(self[:manifest_text]) do |loc| + self.class.munge_manifest_locators!(self[:manifest_text]) do |loc| loc.without_signature.to_s end end @@ -75,16 +101,20 @@ class Collection < ArvadosModel end def set_portable_data_hash - if (self.portable_data_hash.nil? or (self.portable_data_hash == "") or (manifest_text_changed? and !portable_data_hash_changed?)) - self.portable_data_hash = "#{Digest::MD5.hexdigest(manifest_text)}+#{manifest_text.length}" + if (portable_data_hash.nil? or + portable_data_hash == "" or + (manifest_text_changed? and !portable_data_hash_changed?)) + @need_pdh_validation = false + self.portable_data_hash = compute_pdh elsif portable_data_hash_changed? + @need_pdh_validation = true begin loc = Keep::Locator.parse!(self.portable_data_hash) loc.strip_hints! if loc.size self.portable_data_hash = loc.to_s else - self.portable_data_hash = "#{loc.hash}+#{self.manifest_text.length}" + self.portable_data_hash = "#{loc.hash}+#{portable_manifest_text.bytesize}" end rescue ArgumentError => e errors.add(:portable_data_hash, "#{e}") @@ -95,37 +125,89 @@ class Collection < ArvadosModel end def ensure_hash_matches_manifest_text - if manifest_text_changed? or portable_data_hash_changed? - computed_hash = "#{Digest::MD5.hexdigest(manifest_text)}+#{manifest_text.length}" - unless computed_hash == portable_data_hash - logger.debug "(computed) '#{computed_hash}' != '#{portable_data_hash}' (provided)" - errors.add(:portable_data_hash, "does not match hash of manifest_text") - return false - end + return true unless manifest_text_changed? or portable_data_hash_changed? + # No need verify it if :set_portable_data_hash just computed it! + return true if not @need_pdh_validation + expect_pdh = compute_pdh + if expect_pdh != portable_data_hash + errors.add(:portable_data_hash, + "does not match computed hash #{expect_pdh}") + return false + end + end + + def set_file_names + if self.manifest_text_changed? + self.file_names = manifest_files end true end - def redundancy_status - if redundancy_confirmed_as.nil? - 'unconfirmed' - elsif redundancy_confirmed_as < redundancy - 'degraded' + def manifest_files + names = '' + if self.manifest_text + self.manifest_text.scan(/ \d+:\d+:(\S+)/) do |name| + names << name.first.gsub('\040',' ') + "\n" + break if names.length > 2**12 + end + end + + if self.manifest_text and names.length < 2**12 + self.manifest_text.scan(/^\.\/(\S+)/m) do |stream_name| + names << stream_name.first.gsub('\040',' ') + "\n" + break if names.length > 2**12 + end + end + + names[0,2**12] + end + + def check_encoding + if manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding? + true else - if redundancy_confirmed_at.nil? - 'unconfirmed' - elsif Time.now - redundancy_confirmed_at < 7.days - 'OK' - else - 'stale' + begin + # If Ruby thinks the encoding is something else, like 7-bit + # ASCII, but its stored bytes are equal to the (valid) UTF-8 + # encoding of the same string, we declare it to be a UTF-8 + # string. + utf8 = manifest_text + utf8.force_encoding Encoding::UTF_8 + if utf8.valid_encoding? and utf8 == manifest_text.encode(Encoding::UTF_8) + manifest_text = utf8 + return true + end + rescue end + errors.add :manifest_text, "must use UTF-8 encoding" + false + end + end + + def signed_manifest_text + if has_attribute? :manifest_text + token = current_api_client_authorization.andand.api_token + @signed_manifest_text = self.class.sign_manifest manifest_text, token + end + end + + def self.sign_manifest manifest, token + signing_opts = { + key: Rails.configuration.blob_signing_key, + api_token: token, + ttl: Rails.configuration.blob_signing_ttl, + } + m = manifest.dup + munge_manifest_locators!(m) do |loc| + Blob.sign_locator(loc.to_s, signing_opts) end + return m end - def self.munge_manifest_locators(manifest) + def self.munge_manifest_locators! manifest # Given a manifest text and a block, yield each locator, # and replace it with whatever the block returns. - manifest.andand.gsub!(/ [[:xdigit:]]{32}(\+[[:digit:]]+)?(\+\S+)/) do |word| + manifest.andand.gsub!(/ [[:xdigit:]]{32}(\+\S+)?/) do |word| if loc = Keep::Locator.parse(word.strip) " " + yield(loc) else @@ -134,6 +216,15 @@ class Collection < ArvadosModel end end + def self.each_manifest_locator manifest + # Given a manifest text and a block, yield each locator. + manifest.andand.scan(/ ([[:xdigit:]]{32}(\+\S+)?)/) do |word, _| + if loc = Keep::Locator.parse(word) + yield loc + end + end + end + def self.normalize_uuid uuid hash_part = nil size_part = nil @@ -206,4 +297,60 @@ class Collection < ArvadosModel def self.for_latest_docker_image(search_term, search_tag=nil, readers=nil) find_all_for_docker_image(search_term, search_tag, readers).first end + + def self.searchable_columns operator + super - ["manifest_text"] + end + + def self.full_text_searchable_columns + super - ["manifest_text"] + end + + protected + def portable_manifest_text + portable_manifest = self[:manifest_text].dup + self.class.munge_manifest_locators!(portable_manifest) do |loc| + if loc.size + loc.hash + '+' + loc.size.to_s + else + loc.hash + end + end + portable_manifest + end + + def compute_pdh + portable_manifest = portable_manifest_text + (Digest::MD5.hexdigest(portable_manifest) + + '+' + + portable_manifest.bytesize.to_s) + end + + def maybe_clear_replication_confirmed + if manifest_text_changed? + # If the new manifest_text contains locators whose hashes + # weren't in the old manifest_text, storage replication is no + # longer confirmed. + in_old_manifest = {} + self.class.each_manifest_locator(manifest_text_was) do |loc| + in_old_manifest[loc.hash] = true + end + self.class.each_manifest_locator(manifest_text) do |loc| + if not in_old_manifest[loc.hash] + self.replication_confirmed_at = nil + self.replication_confirmed = nil + break + end + end + end + end + + def ensure_permission_to_save + if (not current_user.andand.is_admin and + (replication_confirmed_at_changed? or replication_confirmed_changed?) and + not (replication_confirmed_at.nil? and replication_confirmed.nil?)) + raise ArvadosModel::PermissionDeniedError.new("replication_confirmed and replication_confirmed_at attributes cannot be changed, except by setting both to nil") + end + super + end end