projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20846: Remove deprecated Random::DEFAULT usage.
[arvados.git]
/
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 0a7f22b95789edc163198fbf32ab55045317f298..812b80b8ce739a93066771cdd488243c84da5187 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-9,17
+9,17
@@
require "uri"
class CollectionsController < ApplicationController
include ActionController::Live
class CollectionsController < ApplicationController
include ActionController::Live
- skip_around_
filter
:require_thread_api_token, if: proc { |ctrl|
-
Rails.configuration.anonymous_user_token
and
+ skip_around_
action
:require_thread_api_token, if: proc { |ctrl|
+
!Rails.configuration.Users.AnonymousUserToken.empty?
and
'show' == ctrl.action_name
}
'show' == ctrl.action_name
}
- skip_around_
filter
(:require_thread_api_token,
+ skip_around_
action
(:require_thread_api_token,
only: [:show_file, :show_file_links])
only: [:show_file, :show_file_links])
- skip_before_
filter
(:find_object_by_uuid,
+ skip_before_
action
(:find_object_by_uuid,
only: [:provenance, :show_file, :show_file_links])
# We depend on show_file to display the user agreement:
only: [:provenance, :show_file, :show_file_links])
# We depend on show_file to display the user agreement:
- skip_before_
filter
:check_user_agreements, only: :show_file
- skip_before_
filter
:check_user_profile, only: :show_file
+ skip_before_
action
:check_user_agreements, only: :show_file
+ skip_before_
action
:check_user_profile, only: :show_file
RELATION_LIMIT = 5
RELATION_LIMIT = 5
@@
-36,7
+36,7
@@
class CollectionsController < ApplicationController
['link_class', '=', 'resources'],
['name', '=', 'wants'],
['tail_uuid', '=', current_user.uuid],
['link_class', '=', 'resources'],
['name', '=', 'wants'],
['tail_uuid', '=', current_user.uuid],
- ['head_uuid', '=', @object.uuid]])
+ ['head_uuid', '=', @object.uuid]])
.with_count("none")
logger.debug persist_links.inspect
else
return unprocessable "Invalid value #{value.inspect}"
logger.debug persist_links.inspect
else
return unprocessable "Invalid value #{value.inspect}"
@@
-65,7
+65,7
@@
class CollectionsController < ApplicationController
@select ||= Collection.columns.map(&:name)
base_search = Collection.select(@select)
if params[:search].andand.length.andand > 0
@select ||= Collection.columns.map(&:name)
base_search = Collection.select(@select)
if params[:search].andand.length.andand > 0
- tags = Link.where(any: ['contains', params[:search]])
+ tags = Link.where(any: ['contains', params[:search]])
.with_count("none")
@objects = (base_search.where(uuid: tags.collect(&:head_uuid)) |
base_search.where(any: ['contains', params[:search]])).
uniq { |c| c.uuid }
@objects = (base_search.where(uuid: tags.collect(&:head_uuid)) |
base_search.where(any: ['contains', params[:search]])).
uniq { |c| c.uuid }
@@
-84,7
+84,7
@@
class CollectionsController < ApplicationController
@objects = base_search.limit(limit).offset(offset)
end
@objects = base_search.limit(limit).offset(offset)
end
- @links = Link.where(head_uuid: @objects.collect(&:uuid))
+ @links = Link.where(head_uuid: @objects.collect(&:uuid))
.with_count("none")
@collection_info = {}
@objects.each do |c|
@collection_info[c.uuid] = {
@collection_info = {}
@objects.each do |c|
@collection_info[c.uuid] = {
@@
-124,7
+124,8
@@
class CollectionsController < ApplicationController
# Otherwise, it's impossible to know whether any other request succeeded
# because of the reader token.
coll = nil
# Otherwise, it's impossible to know whether any other request succeeded
# because of the reader token.
coll = nil
- tokens = [(Rails.configuration.anonymous_user_token || nil),
+ tokens = [(if !Rails.configuration.Users.AnonymousUserToken.empty? then
+ Rails.configuration.Users.AnonymousUserToken else nil end),
params[:reader_token],
Thread.current[:arvados_api_token]].compact
usable_token = find_usable_token(tokens) do
params[:reader_token],
Thread.current[:arvados_api_token]].compact
usable_token = find_usable_token(tokens) do
@@
-138,7
+139,7
@@
class CollectionsController < ApplicationController
opts = {}
if usable_token == params[:reader_token]
opts[:path_token] = usable_token
opts = {}
if usable_token == params[:reader_token]
opts[:path_token] = usable_token
- elsif usable_token == Rails.configuration.
anonymous_user_t
oken
+ elsif usable_token == Rails.configuration.
Users.AnonymousUserT
oken
# Don't pass a token at all
else
# We pass the current user's real token only if it's necessary
# Don't pass a token at all
else
# We pass the current user's real token only if it's necessary
@@
-175,7
+176,7
@@
class CollectionsController < ApplicationController
if params["tab_pane"] == "Provenance_graph"
@prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg",
{:request => request,
if params["tab_pane"] == "Provenance_graph"
@prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg",
{:request => request,
- :direction =>
:top_down
,
+ :direction =>
"RL"
,
:combine_jobs => :script_only}) rescue nil
end
:combine_jobs => :script_only}) rescue nil
end
@@
-196,19
+197,19
@@
class CollectionsController < ApplicationController
else
if Job.api_exists?(:index)
jobs_with = lambda do |conds|
else
if Job.api_exists?(:index)
jobs_with = lambda do |conds|
- Job.limit(RELATION_LIMIT).where(conds)
+ Job.limit(RELATION_LIMIT).w
ith_count("none").w
here(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
.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
- @project_links = Link.limit(RELATION_LIMIT).order("modified_at DESC")
+ @project_links = Link.limit(RELATION_LIMIT).
with_count("none").
order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'name').results
.where(head_uuid: @object.uuid, link_class: 'name').results
- project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).to_hash
+ project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).
with_count("none").
to_hash
@projects = project_hash.values
@projects = project_hash.values
- @permissions = Link.limit(RELATION_LIMIT).order("modified_at DESC")
+ @permissions = Link.limit(RELATION_LIMIT).
with_count("none").
order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'permission',
name: 'can_read').results
@search_sharing = search_scopes
.where(head_uuid: @object.uuid, link_class: 'permission',
name: 'can_read').results
@search_sharing = search_scopes
@@
-216,7
+217,7
@@
class CollectionsController < ApplicationController
if params["tab_pane"] == "Used_by"
@used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg",
{:request => request,
if params["tab_pane"] == "Used_by"
@used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg",
{:request => request,
- :direction =>
:top_down
,
+ :direction =>
"LR"
,
:combine_jobs => :script_only,
:pdata_only => true}) rescue nil
end
:combine_jobs => :script_only,
:pdata_only => true}) rescue nil
end
@@
-257,7
+258,7
@@
class CollectionsController < ApplicationController
arv_coll.rm "."+p
end
arv_coll.rm "."+p
end
- if @object.update
_attributes
manifest_text: arv_coll.manifest_text
+ if @object.update manifest_text: arv_coll.manifest_text
show
else
self.render_error status: 422
show
else
self.render_error status: 422
@@
-265,7
+266,7
@@
class CollectionsController < ApplicationController
end
def update
end
def update
- updated_attr = params[:collection].each.select {|a| a[0].andand.start_with? 'rename-file-path:'}
+ updated_attr = params[:collection].
to_unsafe_hash.
each.select {|a| a[0].andand.start_with? 'rename-file-path:'}
if updated_attr.size > 0
# Is it file rename?
if updated_attr.size > 0
# Is it file rename?
@@
-288,7
+289,7
@@
class CollectionsController < ApplicationController
else
arv_coll.rename "./"+file_path, new_file_path
else
arv_coll.rename "./"+file_path, new_file_path
- if @object.update
_attributes
manifest_text: arv_coll.manifest_text
+ if @object.update manifest_text: arv_coll.manifest_text
show
else
self.render_error status: 422
show
else
self.render_error status: 422
@@
-334,24
+335,25
@@
class CollectionsController < ApplicationController
def keep_web_url(uuid_or_pdh, file, opts)
munged_id = uuid_or_pdh.sub('+', '-')
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')
+ tmpl = Rails.configuration.Services.WebDAV.ExternalURL.to_s
+
+ if Rails.configuration.Services.WebDAVDownload.ExternalURL != URI("") and
+ (tmpl.empty? or opts[:disposition] == 'attachment')
# Prefer the attachment-only-host when we want an attachment
# (and when there is no preview link configured)
# 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_c
ontent
- check_uri = URI.parse(tmpl
% fmt
)
+ tmpl = Rails.configuration.
Services.WebDAVDownload.ExternalURL.to_s
+ elsif not Rails.configuration.
Collections.TrustAllC
ontent
+ check_uri = URI.parse(tmpl
.sub("*", munged_id)
)
if opts[:query_token] and
if opts[:query_token] and
+ (check_uri.host.nil? or (
not check_uri.host.start_with?(munged_id + "--") and
not check_uri.host.start_with?(munged_id + "--") and
- not check_uri.host.start_with?(munged_id + ".")
+ 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).
# 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
+ tmpl = Rails.configuration.
Services.WebDAVDownload.ExternalURL.to_s
+ if
tmpl.empty?
raise ArgumentError, "Download precluded by site configuration"
end
logger.warn("Using download link, even though inline content " \
raise ArgumentError, "Download precluded by site configuration"
end
logger.warn("Using download link, even though inline content " \
@@
-359,19
+361,22
@@
class CollectionsController < ApplicationController
end
end
end
end
- if tmpl == Rails.configuration.
keep_web_download_url
+ if tmpl == Rails.configuration.
Services.WebDAVDownload.ExternalURL.to_s
# This takes us to keep-web's -attachment-only-host so there is
# no need to add ?disposition=attachment.
opts.delete :disposition
end
# 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 = URI.parse(tmpl.sub("*", munged_id))
+ if tmpl.index("*").nil?
+ uri.path = "/c=#{munged_id}"
+ end
uri.path += '/' unless uri.path.end_with? '/'
if opts[:path_token]
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
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
) if file
+ uri.path +=
ERB::Util.url_encode(file).gsub('%2F', '/'
) if file
query = Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',
query = Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',