8177: Expand trust_all_content comments.

[arvados.git] / apps / workbench / app / controllers / actions_controller.rb

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 22f3a09ff6462c861b85fbb62f50ee3981013b3a..58b8cdc54f018e6dae20ba7b9c182bfbaef909c0 100644 (file)
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -2,6 +2,14 @@ require "arvados/collection"
 
 class ActionsController < ApplicationController
 
+  # Skip require_thread_api_token if this is a show action
+  # for an object uuid that supports anonymous access.
+  skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+    Rails.configuration.anonymous_user_token and
+    'show' == ctrl.action_name and
+    params['uuid'] and
+    model_class.in?([Collection, Group, Job, PipelineInstance, PipelineTemplate])
+  }
   skip_filter :require_thread_api_token, only: [:report_issue_popup, :report_issue]
   skip_filter :check_user_agreements, only: [:report_issue_popup, :report_issue]
 
@@ -21,6 +29,8 @@ class ActionsController < ApplicationController
         @object.link_class == 'name' and
         ArvadosBase::resource_class_for_uuid(@object.head_uuid) == Collection
       redirect_to collection_path(id: @object.uuid)
+    elsif @object.is_a?(Group) and @object.group_class == 'project'
+      redirect_to project_path(id: @object.uuid)
     elsif @object
       redirect_to @object
     else
@@ -228,29 +238,6 @@ You can try recreating the collection to get a copy with full provenance data."
     end
   end
 
-  # webshell action is used to login to an arvados shell using workbench
-  # https://code.google.com/p/shellinabox/source/browse/#git%2Fshellinabox
-  expose_action :webshell do
-    shell_in_a_box_url_config = Rails.configuration.shell_in_a_box_url
-
-    return render_not_found if not shell_in_a_box_url_config
-
-    return unprocessable "Missing parameters" if not params['login'] or not params['hostname']
-
-    @webshell_login = params['login']
-    @webshell_hostname = params['hostname'].chomp('.shell')
-
-    if not shell_in_a_box_url_config.end_with?('/')
-      shell_in_a_box_url_config += '/'
-    end
-    @webshell_url = shell_in_a_box_url_config + @webshell_hostname
-
-    respond_to do |format|
-      render partial: 'virtual_machines/webshell'
-      return
-    end
-  end
-
   protected
 
   def derive_unique_filename filename, manifest_files