require "arvados/keep"
class Arvados::V1::CollectionsController < ApplicationController
+ def self.limit_index_columns_read
+ ["manifest_text"]
+ end
+
def create
if resource_attrs[:uuid] and (loc = Keep::Locator.parse(resource_attrs[:uuid]))
resource_attrs[:portable_data_hash] = loc.to_s
@object = {
uuid: c.portable_data_hash,
portable_data_hash: c.portable_data_hash,
- manifest_text: c.manifest_text,
+ manifest_text: c.signed_manifest_text,
}
end
else
end
def show
- sign_manifests(@object[:manifest_text])
if @object.is_a? Collection
- render json: @object.as_api_response
+ super
else
- render json: @object
+ send_json @object
end
end
- def index
- sign_manifests(*@objects.map { |c| c[:manifest_text] })
- super
- end
-
def find_collections(visited, sp, &b)
case sp
when ArvadosModel
when String
if m = /[a-f0-9]{32}\+\d+/.match(sp)
yield m[0], nil
- elsif m = /[0-9a-z]{5}-4zz18-[0-9a-z]{15}/.match(sp)
+ elsif m = Collection.uuid_regex.match(sp)
yield nil, m[0]
end
end
if loc
# uuid is a portable_data_hash
- c = Collection.readable_by(*@read_users).where(portable_data_hash: loc.to_s).all
+ collections = Collection.readable_by(*@read_users).where(portable_data_hash: loc.to_s)
+ c = collections.limit(2).all
if c.size == 1
visited[loc.to_s] = c[0]
elsif c.size > 1
- named = c.select {|n| not n.name.nil? and not n.name.empty? }
- if named.any?
+ name = collections.limit(1).where("name <> ''").first
+ if name
visited[loc.to_s] = {
portable_data_hash: c[0].portable_data_hash,
- name: "#{named[0].name} + #{c.size-1} more"
+ name: "#{name.name} + #{collections.count-1} more"
}
else
visited[loc.to_s] = {
visited = {}
search_edges(visited, @object[:portable_data_hash], :search_up)
search_edges(visited, @object[:uuid], :search_up)
- render json: visited
+ send_json visited
end
def used_by
visited = {}
search_edges(visited, @object[:uuid], :search_down)
search_edges(visited, @object[:portable_data_hash], :search_down)
- render json: visited
+ send_json visited
end
protected
- def apply_filters
+ def load_limit_offset_order_params *args
if action_name == 'index'
# Omit manifest_text from index results unless expressly selected.
- @select ||= model_class.api_accessible_attributes(:user).
- map { |attr_spec| attr_spec.first.to_s } - ["manifest_text"]
+ @select ||= model_class.selectable_attributes - ["manifest_text"]
end
super
end
-
- def sign_manifests(*manifests)
- if current_api_client_authorization
- signing_opts = {
- key: Rails.configuration.blob_signing_key,
- api_token: current_api_client_authorization.api_token,
- ttl: Rails.configuration.blob_signing_ttl,
- }
- manifests.each do |text|
- Collection.munge_manifest_locators(text) do |loc|
- Blob.sign_locator(loc.to_s, signing_opts)
- end
- end
- end
- end
end