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
def show
if @object
- render json: @object.as_api_response(:superuser)
+ render json: @object.as_api_response
else
render_not_found("object not found")
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
: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
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"))
@where = params[:where]
elsif params[:where].is_a? String
begin
- @where = Oj.load(params[:where])
+ @where = Oj.load(params[:where], symbol_keys: true)
rescue
raise ArgumentError.new("Could not parse \"where\" param as an object")
end
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)"
+ 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 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}",
+ 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)
if !@where.empty?
conditions = ['1=1']
@where.each do |attr,value|
- if attr == 'any' or attr == :any
+ if attr == :any
if value.is_a?(Array) and
value[0] == 'contains' and
model_class.columns.collect(&:name).index('name') then
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}"
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
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
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
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
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 self.accept_attribute_as_json(attr, force_class=nil)
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]
+ params[resource_name][attr] = Oj.load(params[resource_name][attr],
+ symbol_keys: true)
if force_class and !params[resource_name][attr].is_a? force_class
raise TypeError.new("#{resource_name}[#{attr.to_s}] must be a #{force_class.to_s}")
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
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
projects / arvados.git / blobdiff