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
end
def update
- if @object.update_attributes resource_attrs
+ attrs_to_update = resource_attrs.reject { |k,v| [:kind,:etag].index k }
+ if @object.update_attributes attrs_to_update
show
else
render json: { errors: @object.errors.full_messages }, status: 422
end
end
- unless Rails.application.config.consider_all_requests_local
+ begin
rescue_from Exception,
:with => :render_error
rescue_from ActiveRecord::RecordNotFound,
:with => :render_not_found
rescue_from ActionController::UnknownAction,
: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]
protected
def load_where_param
- @where = params[:where] || {}
- @where = Oj.load(@where) if @where.is_a?(String)
+ 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)
if !@where.empty?
conditions = ['1=1']
@where.each do |attr,value|
- if attr == 'any'
+ 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 << "%#{value[1]}%"
end
elsif attr.to_s.match(/^[a-z][_a-z0-9]+$/) and
- model_class.columns.collect(&:name).index(attr)
+ model_class.columns.collect(&:name).index(attr.to_s)
if value.nil?
conditions[0] << " and #{table_name}.#{attr} is ?"
conditions << nil
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
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
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
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
@remote_ip = request.env['REMOTE_ADDR']
end
end
+
+ def self._index_requires_parameters
+ {
+ where: { type: 'object', required: false },
+ order: { type: 'string', required: false }
+ }
+ end
end
projects / arvados.git / blobdiff