X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b91db14a4dced9d6ea124e86be3c796e6f2c8e8c..5bbd6abc7a32c6912db5f36f0af5a923ac4b7c79:/services/api/app/models/collection.rb?ds=sidebyside diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index 600c07511b..a50c47b6a3 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -1,5 +1,5 @@ class Collection < ArvadosModel - include AssignUuid + include HasUuid include KindAndEtag include CommonApiTemplate @@ -29,26 +29,38 @@ class Collection < ArvadosModel end def assign_uuid - if self.manifest_text.nil? and self.uuid.nil? - super - elsif self.manifest_text and self.uuid + if not self.manifest_text + errors.add :manifest_text, 'not supplied' + return false + end + expect_uuid = Digest::MD5.hexdigest(self.manifest_text) + if self.uuid self.uuid.gsub! /\+.*/, '' - if self.uuid == Digest::MD5.hexdigest(self.manifest_text) - self.uuid.gsub! /$/, '+' + self.manifest_text.length.to_s - true - else - errors.add :uuid, 'does not match checksum of manifest_text' - false + if self.uuid != expect_uuid + errors.add :uuid, 'must match checksum of manifest_text' + return false end - elsif self.manifest_text - errors.add :uuid, 'not supplied (must match checksum of manifest_text)' - false else - errors.add :manifest_text, 'not supplied' - false + self.uuid = expect_uuid end + self.uuid.gsub! /$/, '+' + self.manifest_text.length.to_s + true end + # TODO (#3036/tom) replace above assign_uuid method with below assign_uuid and self.generate_uuid + # def assign_uuid + # # Even admins cannot assign collection uuids. + # self.uuid = self.class.generate_uuid + # end + # def self.generate_uuid + # # The last 10 characters of a collection uuid are the last 10 + # # characters of the base-36 SHA256 digest of manifest_text. + # [Server::Application.config.uuid_prefix, + # self.uuid_prefix, + # rand(2**256).to_s(36)[-5..-1] + Digest::SHA256.hexdigest(self.manifest_text).to_i(16).to_s(36)[-10..-1], + # ].join '-' + # end + def data_size inspect_manifest_text if @data_size.nil? or manifest_text_changed? @data_size @@ -66,15 +78,6 @@ class Collection < ArvadosModel return end - #normalized_manifest = "" - #IO.popen(['arv-normalize'], 'w+b') do |io| - # io.write manifest_text - # io.close_write - # while buf = io.read(2**20) - # normalized_manifest += buf - # end - #end - @data_size = 0 tmp = {} @@ -147,4 +150,53 @@ class Collection < ArvadosModel raise "uuid #{uuid} has no hash part" if !hash_part [hash_part, size_part].compact.join '+' end + + def self.uuids_for_docker_image(search_term, search_tag=nil, readers=nil) + readers ||= [Thread.current[:user]] + base_search = Link. + readable_by(*readers). + readable_by(*readers, table_name: "collections"). + joins("JOIN collections ON links.head_uuid = collections.uuid"). + order("links.created_at DESC") + + # If the search term is a Collection locator with an associated + # Docker image hash link, return that Collection. + coll_matches = base_search. + where(link_class: "docker_image_hash", collections: {uuid: search_term}) + if match = coll_matches.first + return [match.head_uuid] + end + + # Find Collections with matching Docker image repository+tag pairs. + matches = base_search. + where(link_class: "docker_image_repo+tag", + name: "#{search_term}:#{search_tag || 'latest'}") + + # If that didn't work, find Collections with matching Docker image hashes. + if matches.empty? + matches = base_search. + where("link_class = ? and name LIKE ?", + "docker_image_hash", "#{search_term}%") + end + + # Generate an order key for each result. We want to order the results + # so that anything with an image timestamp is considered more recent than + # anything without; then we use the link's created_at as a tiebreaker. + uuid_timestamps = {} + matches.find_each do |link| + uuid_timestamps[link.head_uuid] = + [(-link.properties["image_timestamp"].to_datetime.to_i rescue 0), + -link.created_at.to_i] + end + uuid_timestamps.keys.sort_by { |uuid| uuid_timestamps[uuid] } + end + + def self.for_latest_docker_image(search_term, search_tag=nil, readers=nil) + image_uuid = uuids_for_docker_image(search_term, search_tag, readers).first + if image_uuid.nil? + nil + else + find_by_uuid(image_uuid) + end + end end