X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/546b44cf5dfba972d2f5f91fa4434e9cb64fa0cd..55bdcab45a5e059ecc218099a30ff5ad231a627f:/apps/workbench/app/controllers/collections_controller.rb diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index e883017070..8b3cc2feb8 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -1,4 +1,6 @@ require "arvados/keep" +require "arvados/collection" +require "uri" class CollectionsController < ApplicationController include ActionController::Live @@ -18,7 +20,7 @@ class CollectionsController < ApplicationController RELATION_LIMIT = 5 def show_pane_list - panes = %w(Files Upload Provenance_graph Used_by Advanced) + panes = %w(Files Upload Tags Provenance_graph Used_by Advanced) panes = panes - %w(Upload) unless (@object.editable? rescue false) panes end @@ -119,18 +121,45 @@ class CollectionsController < ApplicationController # we ask the API server if the file actually exists. This serves two # purposes: it lets us return a useful status code for common errors, and # helps us figure out which token to provide to arv-get. + # The order of searched tokens is important: because the anonymous user + # token is passed along with every API request, we have to check it first. + # Otherwise, it's impossible to know whether any other request succeeded + # because of the reader token. coll = nil - tokens = [Thread.current[:arvados_api_token], + tokens = [(Rails.configuration.anonymous_user_token || nil), params[:reader_token], - (Rails.configuration.anonymous_user_token || nil)].compact + Thread.current[:arvados_api_token]].compact usable_token = find_usable_token(tokens) do coll = Collection.find(params[:uuid]) end + if usable_token.nil? + # Response already rendered. + return + end + + # If we are configured to use a keep-web server, just redirect to + # the appropriate URL. + if Rails.configuration.keep_web_url or + Rails.configuration.keep_web_download_url + opts = {} + if usable_token == params[:reader_token] + opts[:path_token] = usable_token + elsif usable_token == Rails.configuration.anonymous_user_token + # Don't pass a token at all + else + # We pass the current user's real token only if it's necessary + # to read the collection. + opts[:query_token] = usable_token + end + opts[:disposition] = params[:disposition] if params[:disposition] + return redirect_to keep_web_url(params[:uuid], params[:file], opts) + end + + # No keep-web server available. Get the file data with arv-get, + # and serve it through Rails. file_name = params[:file].andand.sub(/^(\.\/|\/|)/, './') - if usable_token.nil? - return # Response already rendered. - elsif file_name.nil? or not coll.manifest.has_file?(file_name) + if file_name.nil? or not coll.manifest.has_file?(file_name) return render_not_found end @@ -192,13 +221,13 @@ class CollectionsController < ApplicationController if params["tab_pane"] == "Provenance_graph" @prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg", {:request => request, - :direction => :bottom_up, + :direction => :top_down, :combine_jobs => :script_only}) rescue nil end if current_user if Keep::Locator.parse params["uuid"] - @same_pdh = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]]) + @same_pdh = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]]).limit(20) if @same_pdh.results.size == 1 redirect_to collection_path(@same_pdh[0]["uuid"]) return @@ -206,15 +235,20 @@ class CollectionsController < ApplicationController owners = @same_pdh.map(&:owner_uuid).to_a.uniq preload_objects_for_dataclass Group, owners preload_objects_for_dataclass User, owners + uuids = @same_pdh.map(&:uuid).to_a.uniq + preload_links_for_objects uuids render 'hash_matches' return else - jobs_with = lambda do |conds| - Job.limit(RELATION_LIMIT).where(conds) - .results.sort_by { |j| j.finished_at || j.created_at } + if Job.api_exists?(:index) + jobs_with = lambda do |conds| + Job.limit(RELATION_LIMIT).where(conds) + .results.sort_by { |j| j.finished_at || j.created_at } + end + @output_of = jobs_with.call(output: @object.portable_data_hash) + @log_of = jobs_with.call(log: @object.portable_data_hash) end - @output_of = jobs_with.call(output: @object.portable_data_hash) - @log_of = jobs_with.call(log: @object.portable_data_hash) + @project_links = Link.limit(RELATION_LIMIT).order("modified_at DESC") .where(head_uuid: @object.uuid, link_class: 'name').results project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).to_hash @@ -223,20 +257,14 @@ class CollectionsController < ApplicationController @permissions = Link.limit(RELATION_LIMIT).order("modified_at DESC") .where(head_uuid: @object.uuid, link_class: 'permission', name: 'can_read').results - @logs = Log.limit(RELATION_LIMIT).order("created_at DESC") - .where(object_uuid: @object.uuid).results - @is_persistent = Link.limit(1) - .where(head_uuid: @object.uuid, tail_uuid: current_user.uuid, - link_class: 'resources', name: 'wants') - .results.any? @search_sharing = search_scopes if params["tab_pane"] == "Used_by" @used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg", {:request => request, - :direction => :top_down, - :combine_jobs => :script_only, - :pdata_only => true}) rescue nil + :direction => :top_down, + :combine_jobs => :script_only, + :pdata_only => true}) rescue nil end end end @@ -266,13 +294,64 @@ class CollectionsController < ApplicationController sharing_popup end + def remove_selected_files + uuids, source_paths = selected_collection_files params + + arv_coll = Arv::Collection.new(@object.manifest_text) + source_paths[uuids[0]].each do |p| + arv_coll.rm "."+p + end + + if @object.update_attributes manifest_text: arv_coll.manifest_text + show + else + self.render_error status: 422 + end + end + def update - @updates ||= params[@object.resource_param_name.to_sym] - if @updates && (@updates.keys - ["name", "description"]).empty? - # exclude manifest_text since only name or description is being updated - @object.manifest_text = nil + updated_attr = params[:collection].each.select {|a| a[0].andand.start_with? 'rename-file-path:'} + + if updated_attr.size > 0 + # Is it file rename? + file_path = updated_attr[0][0].split('rename-file-path:')[-1] + + new_file_path = updated_attr[0][1] + if new_file_path.start_with?('./') + # looks good + elsif new_file_path.start_with?('/') + new_file_path = '.' + new_file_path + else + new_file_path = './' + new_file_path + end + + arv_coll = Arv::Collection.new(@object.manifest_text) + + if arv_coll.exist?(new_file_path) + @errors = 'Duplicate file path. Please use a different name.' + self.render_error status: 422 + else + arv_coll.rename "./"+file_path, new_file_path + + if @object.update_attributes manifest_text: arv_coll.manifest_text + show + else + self.render_error status: 422 + end + end + else + # Not a file rename; use default + super + end + end + + def save_tags + props = @object.properties + props[:tags] = params['tag_data'] + if @object.update_attributes properties: props + else + self.render_error status: 422 end - super end protected @@ -307,6 +386,61 @@ class CollectionsController < ApplicationController return nil end + def keep_web_url(uuid_or_pdh, file, opts) + munged_id = uuid_or_pdh.sub('+', '-') + fmt = {uuid_or_pdh: munged_id} + + tmpl = Rails.configuration.keep_web_url + if Rails.configuration.keep_web_download_url and + (!tmpl or opts[:disposition] == 'attachment') + # Prefer the attachment-only-host when we want an attachment + # (and when there is no preview link configured) + tmpl = Rails.configuration.keep_web_download_url + elsif not Rails.configuration.trust_all_content + check_uri = URI.parse(tmpl % fmt) + if opts[:query_token] and + not check_uri.host.start_with?(munged_id + "--") and + not check_uri.host.start_with?(munged_id + ".") + # We're about to pass a token in the query string, but + # keep-web can't accept that safely at a single-origin URL + # template (unless it's -attachment-only-host). + tmpl = Rails.configuration.keep_web_download_url + if not tmpl + raise ArgumentError, "Download precluded by site configuration" + end + logger.warn("Using download link, even though inline content " \ + "was requested: #{check_uri.to_s}") + end + end + + if tmpl == Rails.configuration.keep_web_download_url + # This takes us to keep-web's -attachment-only-host so there is + # no need to add ?disposition=attachment. + opts.delete :disposition + end + + uri = URI.parse(tmpl % fmt) + uri.path += '/' unless uri.path.end_with? '/' + if opts[:path_token] + uri.path += 't=' + opts[:path_token] + '/' + end + uri.path += '_/' + uri.path += URI.escape(file) + + query = Hash[URI.decode_www_form(uri.query || '')] + { query_token: 'api_token', + disposition: 'disposition' }.each do |opt, param| + if opts.include? opt + query[param] = opts[opt] + end + end + unless query.empty? + uri.query = URI.encode_www_form(query) + end + + uri.to_s + end + # Note: several controller and integration tests rely on stubbing # file_enumerator to return fake file content. def file_enumerator opts