X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/99658f9ca22500e6249a77bae32994599949c76d..63e8f77e963949d4187555411e7b5c60fc850468:/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 a47ccf78ff..8ed554f8ca 100644 --- a/services/api/app/controllers/application_controller.rb +++ b/services/api/app/controllers/application_controller.rb @@ -1,17 +1,24 @@ class ApplicationController < ActionController::Base include CurrentApiClient + respond_to :json 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 :load_filters_param, :only => :index before_filter :find_objects_for_index, :only => :index - before_filter :find_object_by_uuid, :except => [:index, :create] + before_filter :find_object_by_uuid, :except => [:index, :create, + :render_error, + :render_not_found] + before_filter :reload_object_before_update, :only => :update + before_filter :render_404_if_no_object, except: [:index, :create, + :render_error, + :render_not_found] attr_accessor :resource_attrs @@ -24,25 +31,26 @@ class ApplicationController < ActionController::Base end def show - if @object - render json: @object.as_api_response(:superuser) - else - render_not_found("object not found") - end + render json: @object.as_api_response end def create @object = model_class.new resource_attrs - @object.save - show + if @object.save + show + else + render_error "Save failed" + end end def update - attrs_to_update = resource_attrs.reject { |k,v| [:kind,:etag].index k } + 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 + render_error "Update failed" end end @@ -68,12 +76,16 @@ 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_404_if_no_object + render_not_found "Object not found" if !@object + end + def render_error(e) logger.error e.inspect logger.error e.backtrace.collect { |x| x + "\n" }.join('') if e.backtrace @@ -82,7 +94,8 @@ class ApplicationController < ActionController::Base 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")) @@ -100,35 +113,77 @@ class ApplicationController < ActionController::Base elsif params[:where].is_a? String begin @where = Oj.load(params[:where]) + raise unless @where.is_a? Hash rescue raise ArgumentError.new("Could not parse \"where\" param as an object") end end + @where = @where.with_indifferent_access + end + + def load_filters_param + if params[:filters].is_a? Array + @filters = params[:filters] + elsif params[:filters].is_a? String + begin + @filters = Oj.load params[:filters] + raise unless @filters.is_a? Array + rescue + raise ArgumentError.new("Could not parse \"filters\" param as an array") + 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 #{model_class.sanitize current_user.uuid} IN (#{table_name}.head_uuid, #{table_name}.tail_uuid)" + @objects ||= model_class.readable_by(current_user) + apply_where_limit_order_params + end + + def apply_where_limit_order_params + if @filters.is_a? Array and @filters.any? + cond_out = [] + param_out = [] + @filters.each do |attr, operator, operand| + if !model_class.searchable_columns.index attr.to_s + raise ArgumentError.new("Invalid attribute '#{attr}' in condition") + end + case operator.downcase + when '=', '<', '<=', '>', '>=', 'like' + if operand.is_a? String + cond_out << "#{table_name}.#{attr} #{operator} ?" + if operator.match(/[<=>]/) and + model_class.attribute_column(attr).type == :datetime + operand = Time.parse operand + end + param_out << operand + end + when 'in' + if operand.is_a? Array + cond_out << "#{table_name}.#{attr} IN (?)" + param_out << operand + end + end + end + if cond_out.any? + @objects = @objects.where(cond_out.join(' AND '), *param_out) + end end - @objects ||= model_class. - joins("LEFT JOIN links permissions ON permissions.head_uuid in (#{table_name}.owner, #{table_name}.uuid) 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 #{or_references_me}", - true, current_user.is_admin, - uuid_list, - current_user.uuid) - if !@where.empty? + if @where.is_a? Hash and @where.any? conditions = ['1=1'] @where.each do |attr,value| - if attr == 'any' or attr == :any + if attr == :any if value.is_a?(Array) and + value.length == 2 and value[0] == 'contains' and model_class.columns.collect(&:name).index('name') then - conditions[0] << " and #{table_name}.name ilike ?" - conditions << "%#{value[1]}%" + ilikes = [] + model_class.searchable_columns.each do |column| + ilikes << "#{table_name}.#{column} ilike ?" + conditions << "%#{value[1]}%" + end + if ilikes.any? + conditions[0] << ' and (' + ilikes.join(' or ') + ')' + end end elsif attr.to_s.match(/^[a-z][_a-z0-9]+$/) and model_class.columns.collect(&:name).index(attr.to_s) @@ -136,8 +191,13 @@ class ApplicationController < ActionController::Base conditions[0] << " and #{table_name}.#{attr} is ?" conditions << nil elsif value.is_a? Array - conditions[0] << " and #{table_name}.#{attr} in (?)" - conditions << value + if value[0] == 'contains' and value.length == 2 + conditions[0] << " and #{table_name}.#{attr} like ?" + conditions << "%#{value[1]}%" + else + conditions[0] << " and #{table_name}.#{attr} in (?)" + conditions << value + end elsif value.is_a? String or value.is_a? Fixnum or value == true or value == false conditions[0] << " and #{table_name}.#{attr}=?" conditions << value @@ -189,7 +249,7 @@ class ApplicationController < ActionController::Base return @attrs if @attrs @attrs = params[resource_name] if @attrs.is_a? String - @attrs = uncamelcase_hash_keys(Oj.load @attrs) + @attrs = Oj.load @attrs, symbol_keys: true end unless @attrs.is_a? Hash message = "No #{resource_name}" @@ -199,23 +259,27 @@ class ApplicationController < ActionController::Base message << " hash provided with request" raise ArgumentError.new(message) end - %w(created_at modified_by_client modified_by_user modified_at).each do |x| - @attrs.delete x + %w(created_at modified_by_client_uuid modified_by_user_uuid modified_at).each do |x| + @attrs.delete x.to_sym end + @attrs = @attrs.symbolize_keys if @attrs.is_a? HashWithIndifferentAccess @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 @@ -225,7 +289,19 @@ class ApplicationController < ActionController::Base 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[:request_starttime] = Time.now + Thread.current[:api_url_base] = root_url.sub(/\/$/,'') + '/arvados/v1' begin user = nil api_client = nil @@ -239,9 +315,9 @@ class ApplicationController < ActionController::Base includes(:api_client, :user). 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 @@ -258,7 +334,7 @@ class ApplicationController < ActionController::Base end 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 @@ -293,53 +369,53 @@ class ApplicationController < ActionController::Base if params[:id] and params[:id].match /\D/ params[:uuid] = params.delete :id end - @object = model_class.where('uuid=?', params[:uuid]).first + @where = { uuid: params[:uuid] } + find_objects_for_index + @object = @objects.first + end + + def reload_object_before_update + # This is necessary to prevent an ActiveRecord::ReadOnlyRecord + # error when updating an object which was retrieved using a join. + if @object.andand.readonly? + @object = model_class.find_by_uuid(@objects.first.uuid) + end end def self.accept_attribute_as_json(attr, force_class=nil) before_filter lambda { accept_attribute_as_json attr, force_class } end + accept_attribute_as_json :properties, Hash + accept_attribute_as_json :info, Hash def accept_attribute_as_json(attr, force_class) - if params[resource_name].is_a? Hash - if params[resource_name][attr].is_a? String - params[resource_name][attr] = Oj.load params[resource_name][attr] - if force_class and !params[resource_name][attr].is_a? force_class + if params[resource_name] and resource_attrs.is_a? Hash + if resource_attrs[attr].is_a? String + resource_attrs[attr] = Oj.load(resource_attrs[attr], + symbol_keys: false) + if force_class and !resource_attrs[attr].is_a? force_class raise TypeError.new("#{resource_name}[#{attr.to_s}] must be a #{force_class.to_s}") end + elsif resource_attrs[attr].is_a? Hash + # Convert symbol keys to strings (in hashes provided by + # resource_attrs) + resource_attrs[attr] = resource_attrs[attr]. + with_indifferent_access.to_hash end 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 => "arvados##{resource_name}List", + :kind => "arvados##{(@response_resource_name || resource_name).camelize(:lower)}List", :etag => "", :self_link => "", :next_page_token => "", :next_link => "", - :items => @objects.as_api_response(:superuser) + :items => @objects.as_api_response(nil) } + if @objects.respond_to? :except + @object_list[:items_available] = @objects.except(:limit).count + end render json: @object_list end @@ -356,8 +432,26 @@ class ApplicationController < ActionController::Base def self._index_requires_parameters { + filters: { type: 'array', required: false }, 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 + + def render *opts + response = opts.first[:json] + if response.is_a?(Hash) && + params[:_profile] && + Thread.current[:request_starttime] + response[:_profile] = { + request_time: Time.now - Thread.current[:request_starttime] + } + end + super *opts + end end