X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/43773cb247a1fb744b57070b715bfa5d53a00822..73e1bfac301b9285f734374abe84d8146897c585:/services/api/app/controllers/application_controller.rb diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb index a80d93e42f..434b09572b 100644 --- a/services/api/app/controllers/application_controller.rb +++ b/services/api/app/controllers/application_controller.rb @@ -2,18 +2,56 @@ class ApplicationController < ActionController::Base include CurrentApiClient protect_from_forgery - before_filter :uncamelcase_params_hash_keys around_filter :thread_with_auth_info, :except => [:render_error, :render_not_found] before_filter :remote_ip - before_filter :login_required, :except => :render_not_found + before_filter :require_auth_scope_all, :except => :render_not_found before_filter :catch_redirect_hint + before_filter :load_where_param, :only => :index before_filter :find_objects_for_index, :only => :index before_filter :find_object_by_uuid, :except => [:index, :create] attr_accessor :resource_attrs + def index + @objects.uniq!(&:id) + if params[:eager] and params[:eager] != '0' and params[:eager] != 0 and params[:eager] != '' + @objects.each(&:eager_load_associations) + end + render_list + end + + def show + if @object + render json: @object.as_api_response + else + render_not_found("object not found") + end + end + + def create + @object = model_class.new resource_attrs + @object.save + show + end + + def update + attrs_to_update = resource_attrs.reject { |k,v| + [:kind, :etag, :href].index k + } + if @object.update_attributes attrs_to_update + show + else + render json: { errors: @object.errors.full_messages }, status: 422 + end + end + + def destroy + @object.destroy + show + end + def catch_redirect_hint if !current_user if params.has_key?('redirect_to') then @@ -22,7 +60,7 @@ class ApplicationController < ActionController::Base end end - unless Rails.application.config.consider_all_requests_local + begin rescue_from Exception, :with => :render_error rescue_from ActiveRecord::RecordNotFound, @@ -31,19 +69,22 @@ class ApplicationController < ActionController::Base :with => :render_not_found rescue_from ActionController::UnknownController, :with => :render_not_found - rescue_from ActionController::UnknownAction, + rescue_from AbstractController::ActionNotFound, :with => :render_not_found + rescue_from ArvadosModel::PermissionDeniedError, + :with => :render_error end def render_error(e) logger.error e.inspect logger.error e.backtrace.collect { |x| x + "\n" }.join('') if e.backtrace - if @object and @object.errors and @object.errors.full_messages + if @object and @object.errors and @object.errors.full_messages and not @object.errors.full_messages.empty? errors = @object.errors.full_messages else errors = [e.inspect] end - render json: { errors: errors }, status: 422 + status = e.respond_to?(:http_status) ? e.http_status : 422 + render json: { errors: errors }, status: status end def render_not_found(e=ActionController::RoutingError.new("Path not found")) @@ -51,25 +92,52 @@ class ApplicationController < ActionController::Base render json: { errors: ["Path not found"] }, status: 404 end + protected + + def load_where_param + if params[:where].nil? or params[:where] == "" + @where = {} + elsif params[:where].is_a? Hash + @where = params[:where] + elsif params[:where].is_a? String + begin + @where = Oj.load(params[:where]) + rescue + raise ArgumentError.new("Could not parse \"where\" param as an object") + end + end + end + def find_objects_for_index uuid_list = [current_user.uuid, *current_user.groups_i_can(:read)] sanitized_uuid_list = uuid_list. collect { |uuid| model_class.sanitize(uuid) }.join(', ') + or_references_me = '' + if model_class == Link and current_user + or_references_me = "OR (#{table_name}.link_class in (#{model_class.sanitize 'permission'}, #{model_class.sanitize 'resources'}) AND #{model_class.sanitize current_user.uuid} IN (#{table_name}.head_uuid, #{table_name}.tail_uuid))" + end @objects ||= model_class. - joins("LEFT JOIN links permissions ON permissions.head_uuid=#{table_name}.owner AND permissions.tail_uuid in (#{sanitized_uuid_list}) AND permissions.link_class='permission'"). - where("?=? OR #{table_name}.owner in (?) OR #{table_name}.uuid=? OR permissions.head_uuid IS NOT NULL", + joins("LEFT JOIN links permissions ON permissions.head_uuid in (#{table_name}.owner_uuid, #{table_name}.uuid) AND permissions.tail_uuid in (#{sanitized_uuid_list}) AND permissions.link_class='permission'"). + where("?=? OR #{table_name}.owner_uuid in (?) OR #{table_name}.uuid=? OR permissions.head_uuid IS NOT NULL #{or_references_me}", true, current_user.is_admin, uuid_list, current_user.uuid) - @where = params[:where] || {} - @where = Oj.load(@where) if @where.is_a?(String) - if params[:where] + if !@where.empty? conditions = ['1=1'] @where.each do |attr,value| - if (!value.nil? and - attr.to_s.match(/^[a-z][_a-z0-9]+$/) and - model_class.columns.collect(&:name).index(attr)) - if value.is_a? Array + if attr == 'any' or attr == :any + if value.is_a?(Array) and + value[0] == 'contains' and + model_class.columns.collect(&:name).index('name') then + conditions[0] << " and #{table_name}.name ilike ?" + conditions << "%#{value[1]}%" + end + elsif attr.to_s.match(/^[a-z][_a-z0-9]+$/) and + model_class.columns.collect(&:name).index(attr.to_s) + if value.nil? + conditions[0] << " and #{table_name}.#{attr} is ?" + conditions << nil + elsif value.is_a? Array conditions[0] << " and #{table_name}.#{attr} in (?)" conditions << value elsif value.is_a? String or value.is_a? Fixnum or value == true or value == false @@ -84,11 +152,6 @@ class ApplicationController < ActionController::Base end end end - elsif (!value.nil? and attr == 'any' and - value.is_a?(Array) and value[0] == 'contains' and - model_class.columns.collect(&:name).index('name')) then - conditions[0] << " and #{table_name}.name ilike ?" - conditions << "%#{value[1]}%" end end if conditions.length > 1 @@ -101,91 +164,100 @@ class ApplicationController < ActionController::Base begin @objects = @objects.limit(params[:limit].to_i) rescue - raise "invalid argument (limit)" + raise ArgumentError.new("Invalid value for limit parameter") end else @objects = @objects.limit(100) end - @objects = @objects.order("#{table_name}.modified_at desc") - end - - def index - @objects.uniq!(&:id) - if params[:eager] and params[:eager] != '0' and params[:eager] != 0 and params[:eager] != '' - @objects.each(&:eager_load_associations) + orders = [] + if params[:order] + params[:order].split(',').each do |order| + attr, direction = order.strip.split " " + direction ||= 'asc' + if attr.match /^[a-z][_a-z0-9]+$/ and + model_class.columns.collect(&:name).index(attr) and + ['asc','desc'].index direction.downcase + orders << "#{table_name}.#{attr} #{direction.downcase}" + end + end end - render_list - end - - def show - if @object - render json: @object.as_api_response(:superuser) - else - render_not_found("object not found") + if orders.empty? + orders << "#{table_name}.modified_at desc" end + @objects = @objects.order(orders.join ", ") end - def create - @object = model_class.new resource_attrs - @object.save - show - end - - def update - @object.update_attributes resource_attrs - show - end - - def destroy - @object.destroy - show - end - - protected - def resource_attrs return @attrs if @attrs @attrs = params[resource_name] if @attrs.is_a? String - @attrs = uncamelcase_hash_keys(Oj.load @attrs) + @attrs = Oj.load @attrs end unless @attrs.is_a? Hash - raise "no #{resource_name} (or #{resource_name.camelcase(:lower)}) hash provided with request #{params.inspect}" + message = "No #{resource_name}" + if resource_name.index('_') + message << " (or #{resource_name.camelcase(:lower)})" + end + message << " hash provided with request" + raise ArgumentError.new(message) end - %w(created_at modified_by_client modified_by_user modified_at).each do |x| + %w(created_at modified_by_client_uuid modified_by_user_uuid modified_at).each do |x| @attrs.delete x end @attrs end # Authentication - def login_required - if !current_user + def require_login + if current_user + true + else respond_to do |format| + format.json { + render :json => { errors: ['Not logged in'] }.to_json, status: 401 + } format.html { redirect_to '/auth/joshid' } - format.json { - render :json => { errors: ['Not logged in'] }.to_json - } end + false + end + end + + def admin_required + unless current_user and current_user.is_admin + render :json => { errors: ['Forbidden'] }.to_json, status: 403 + end + end + + def require_auth_scope_all + require_login and require_auth_scope(['all']) + end + + def require_auth_scope(ok_scopes) + unless current_api_client_auth_has_scope(ok_scopes) + render :json => { errors: ['Forbidden'] }.to_json, status: 403 end end def thread_with_auth_info + Thread.current[:api_url_base] = root_url.sub(/\/$/,'') + '/arvados/v1' begin user = nil api_client = nil api_client_auth = nil - supplied_token = params[:api_token] || params[:oauth_token] + supplied_token = + params[:api_token] || + params[:oauth_token] || + request.headers["Authorization"].andand.match(/OAuth2 ([a-z0-9]+)/).andand[1] if supplied_token api_client_auth = ApiClientAuthorization. includes(:api_client, :user). - where('api_token=?', supplied_token). + where('api_token=? and (expires_at is null or expires_at > now())', supplied_token). first - if api_client_auth + if api_client_auth.andand.user session[:user_id] = api_client_auth.user.id - session[:api_client_uuid] = api_client_auth.api_client.uuid + session[:api_client_uuid] = api_client_auth.api_client.andand.uuid session[:api_client_authorization_id] = api_client_auth.id user = api_client_auth.user api_client = api_client_auth.api_client @@ -200,15 +272,18 @@ class ApplicationController < ActionController::Base find session[:api_client_authorization_id] end end - Thread.current[:api_client_trusted] = session[:api_client_trusted] Thread.current[:api_client_ip_address] = remote_ip Thread.current[:api_client_authorization] = api_client_auth - Thread.current[:api_client_uuid] = api_client && api_client.uuid + Thread.current[:api_client_uuid] = api_client.andand.uuid Thread.current[:api_client] = api_client Thread.current[:user] = user + if api_client_auth + api_client_auth.last_used_at = Time.now + api_client_auth.last_used_by_ip_address = remote_ip + api_client_auth.save validate: false + end yield ensure - Thread.current[:api_client_trusted] = nil Thread.current[:api_client_ip_address] = nil Thread.current[:api_client_authorization] = nil Thread.current[:api_client_uuid] = nil @@ -251,36 +326,14 @@ class ApplicationController < ActionController::Base end end - def uncamelcase_params_hash_keys - self.params = uncamelcase_hash_keys(params) - end - - def uncamelcase_hash_keys(h, max_depth=-1) - if h.is_a? Hash and max_depth != 0 - nh = Hash.new - h.each do |k,v| - if k.class == String - nk = k.underscore - elsif k.class == Symbol - nk = k.to_s.underscore.to_sym - else - nk = k - end - nh[nk] = uncamelcase_hash_keys(v, max_depth-1) - end - h.replace(nh) - end - h - end - def render_list @object_list = { - :kind => "orvos##{resource_name}List", + :kind => "arvados##{resource_name}List", :etag => "", :self_link => "", :next_page_token => "", :next_link => "", - :items => @objects.as_api_response(:superuser) + :items => @objects.as_api_response(nil) } render json: @object_list end @@ -295,4 +348,16 @@ class ApplicationController < ActionController::Base @remote_ip = request.env['REMOTE_ADDR'] end end + + def self._index_requires_parameters + { + where: { type: 'object', required: false }, + order: { type: 'string', required: false } + } + end + + def client_accepts_plain_text_stream + (request.headers['Accept'].split(' ') & + ['text/plain', '*/*']).count > 0 + end end