X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/50091893d44ecfc48c13bb2269f23a6f23aea1d2..bbd6140f4bdc7746ecbd4d109316b2dd0b6d047f:/app/controllers/api/traces_controller.rb?ds=inline diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb index 5e95892e1..738642fff 100644 --- a/app/controllers/api/traces_controller.rb +++ b/app/controllers/api/traces_controller.rb @@ -1,31 +1,50 @@ module Api class TracesController < ApiController - layout "site", :except => :georss - - before_action :authorize_web + before_action :check_api_writable, :only => [:create, :update, :destroy] before_action :set_locale before_action :authorize authorize_resource - before_action :check_database_readable, :except => [:api_read, :api_data] - before_action :check_database_writable, :only => [:api_create, :api_update, :api_delete] - before_action :check_api_readable, :only => [:api_read, :api_data] - before_action :check_api_writable, :only => [:api_create, :api_update, :api_delete] - before_action :offline_redirect, :only => [:api_create, :api_delete, :api_data] + before_action :offline_error, :only => [:create, :destroy, :data] around_action :api_call_handle_error - def api_read - trace = Trace.visible.find(params[:id]) + def show + @trace = Trace.visible.find(params[:id]) - if trace.public? || trace.user == current_user - render :xml => trace.to_xml.to_s + head :forbidden unless @trace.public? || @trace.user == current_user + end + + def create + tags = params[:tags] || "" + description = params[:description] || "" + visibility = params[:visibility] + + if visibility.nil? + visibility = if params[:public]&.to_i&.nonzero? + "public" + else + "private" + end + end + + if params[:file].respond_to?(:read) + trace = do_create(params[:file], tags, description, visibility) + + if trace.id + trace.schedule_import + render :plain => trace.id.to_s + elsif trace.valid? + head :internal_server_error + else + head :bad_request + end else - head :forbidden + head :bad_request end end - def api_update + def update trace = Trace.visible.find(params[:id]) if trace.user == current_user @@ -38,13 +57,13 @@ module Api end end - def api_delete + def destroy trace = Trace.visible.find(params[:id]) if trace.user == current_user trace.visible = false trace.save! - TraceDestroyerJob.perform_later(trace) if Settings.trace_use_job_queue + trace.schedule_destruction head :ok else @@ -52,7 +71,7 @@ module Api end end - def api_data + def data trace = Trace.visible.find(params[:id]) if trace.public? || trace.user == current_user @@ -60,6 +79,8 @@ module Api send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment") elsif request.format == Mime[:gpx] send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment") + elsif trace.file.attached? + redirect_to rails_blob_path(trace.file, :disposition => "attachment") else send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") end @@ -68,47 +89,12 @@ module Api end end - def api_create - tags = params[:tags] || "" - description = params[:description] || "" - visibility = params[:visibility] - - if visibility.nil? - visibility = if params[:public]&.to_i&.nonzero? - "public" - else - "private" - end - end - - if params[:file].respond_to?(:read) - trace = do_create(params[:file], tags, description, visibility) - - if trace.id - TraceImporterJob.perform_later(@trace) if Settings.trace_use_job_queue - render :plain => trace.id.to_s - elsif trace.valid? - head :internal_server_error - else - head :bad_request - end - else - head :bad_request - end - end - private def do_create(file, tags, description, visibility) # Sanitise the user's filename name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_") - # Get a temporary filename... - filename = "/tmp/#{rand}" - - # ...and save the uploaded file to that location - File.open(filename, "wb") { |f| f.write(file.read) } - # Create the trace object, falsely marked as already # inserted to stop the import daemon trying to load it trace = Trace.new( @@ -116,43 +102,17 @@ module Api :tagstring => tags, :description => description, :visibility => visibility, - :inserted => true, + :inserted => false, :user => current_user, - :timestamp => Time.now.getutc + :timestamp => Time.now.utc, + :file => file ) - if trace.valid? - Trace.transaction do - begin - # Save the trace object - trace.save! - - # Rename the temporary file to the final name - FileUtils.mv(filename, trace.trace_name) - rescue StandardError - # Remove the file as we have failed to update the database - FileUtils.rm_f(filename) - - # Pass the exception on - raise - end - - begin - # Clear the inserted flag to make the import daemon load the trace - trace.inserted = false - trace.save! - rescue StandardError - # Remove the file as we have failed to update the database - FileUtils.rm_f(trace.trace_name) - - # Pass the exception on - raise - end - end - end + # Save the trace object + trace.save! # Finally save the user's preferred privacy level - if pref = current_user.preferences.where(:k => "gps.trace.visibility").first + if pref = current_user.preferences.find_by(:k => "gps.trace.visibility") pref.v = visibility pref.save else @@ -162,8 +122,8 @@ module Api trace end - def offline_redirect - redirect_to :action => :offline if Settings.status == "gpx_offline" + def offline_error + report_error "GPX files offline for maintenance", :service_unavailable if Settings.status == "gpx_offline" end end end