X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ccf25b347d90b2ae7b1f2e2b5c8f042e0790a3b..a2cf9b5b9f568c614ad8bbf8a477326b01cefb57:/app/controllers/trace_controller.rb diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index b4e9d7f51..07a6fe210 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -1,201 +1,420 @@ class TraceController < ApplicationController - before_filter :authorize_web - before_filter :authorize, :only => [:api_details, :api_data, :api_create] - layout 'site' - + layout "site" + + skip_before_action :verify_authenticity_token, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] + before_action :authorize_web + before_action :set_locale + before_action :require_user, :only => [:mine, :create, :edit, :delete] + before_action :authorize, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] + before_action :check_database_readable, :except => [:api_read, :api_data] + before_action :check_database_writable, :only => [:create, :edit, :delete, :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 :require_allow_read_gpx, :only => [:api_read, :api_data] + before_action :require_allow_write_gpx, :only => [:api_create, :api_update, :api_delete] + before_action :offline_warning, :only => [:mine, :view] + before_action :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data] + around_action :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] + # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.). # target_user - if set, specifies the user to fetch traces for. if not set will fetch all traces - # paging_action - the action that will be linked back to from view - def list (target_user = nil, paging_action = 'list') - @traces_per_page = 20 - page_index = params[:page] ? params[:page].to_i - 1 : 0 # nice 1-based page -> 0-based page index - + def list # from display name, pick up user id if one user's traces only display_name = params[:display_name] - if target_user.nil? and display_name and display_name != '' - target_user = User.find(:first, :conditions => [ "display_name = ?", display_name]) + unless display_name.blank? + target_user = User.active.where(:display_name => display_name).first + if target_user.nil? + render_unknown_user display_name + return + end + end + + # set title + if target_user.nil? + @title = t "trace.list.public_traces" + elsif @user && @user == target_user + @title = t "trace.list.your_traces" + else + @title = t "trace.list.public_traces_from", :user => target_user.display_name end - opt = Hash.new - opt[:include] = [:user, :tags] # load users and tags from db at same time as traces + @title += t "trace.list.tagged_with", :tags => params[:tag] if params[:tag] # four main cases: # 1 - all traces, logged in = all public traces + all user's (i.e + all mine) # 2 - all traces, not logged in = all public traces - # 3 - user's traces, logged in as same user = all user's traces + # 3 - user's traces, logged in as same user = all user's traces # 4 - user's traces, not logged in as that user = all user's public traces if target_user.nil? # all traces if @user - conditions = ["(public = 1 OR user_id = ?)", @user.id] #1 + @traces = Trace.visible_to(@user) # 1 else - conditions = ["public = 1"] #2 + @traces = Trace.visible_to_all # 2 end else - if @user and @user.id == target_user.id - conditions = ["user_id = ?", @user.id] #3 (check vs user id, so no join + can't pick up non-public traces by changing name) + if @user && @user == target_user + @traces = @user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name) else - conditions = ["public = 1 AND user_id = ?", target_user.id] #4 + @traces = target_user.traces.visible_to_all # 4 end end - conditions[0] += " AND users.display_name != ''" # users need to set display name before traces will be exposed - - opt[:order] = 'timestamp DESC' - if params[:tag] - @tag = params[:tag] - conditions[0] += " AND gpx_file_tags.tag = ?" - conditions << @tag; - end - - opt[:conditions] = conditions - - # count traces using all options except limit - @max_trace = Trace.count(opt) - @max_page = Integer((@max_trace + 1) / @traces_per_page) - - # last step before fetch - add paging options - opt[:limit] = @traces_per_page - if page_index > 0 - opt[:offset] = @traces_per_page * page_index - end - - @traces = Trace.find(:all , opt) - + + @traces = @traces.tagged(params[:tag]) if params[:tag] + + @page = (params[:page] || 1).to_i + @page_size = 20 + + @traces = @traces.visible + @traces = @traces.order("timestamp DESC") + @traces = @traces.offset((@page - 1) * @page_size) + @traces = @traces.limit(@page_size) + @traces = @traces.includes(:user, :tags) + # put together SET of tags across traces, for related links - tagset = Hash.new - if @traces - @traces.each do |trace| - trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here - trace.tags.each do |tag| - tagset[tag.tag] = tag.tag - end + tagset = {} + @traces.each do |trace| + trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here + trace.tags.each do |tag| + tagset[tag.tag] = tag.tag end end - + # final helper vars for view - @display_name = display_name + @target_user = target_user + @display_name = target_user.display_name if target_user @all_tags = tagset.values - @paging_action = paging_action # the action that paging requests should route back to, e.g. 'list' or 'mine' - @page = page_index + 1 # nice 1-based external page numbers end def mine - if @user - list(@user, 'mine') unless @user.nil? - else - redirect_to :controller => 'user', :action => 'login' - end + redirect_to :action => :list, :display_name => @user.display_name end def view @trace = Trace.find(params[:id]) - unless @trace.public - if @user - render :nothing, :status => 401 if @trace.user.id != @user.id - end + + if @trace && @trace.visible? && + (@trace.public? || @trace.user == @user) + @title = t "trace.view.title", :name => @trace.name + else + flash[:error] = t "trace.view.trace_not_found" + redirect_to :controller => "trace", :action => "list" end + rescue ActiveRecord::RecordNotFound + flash[:error] = t "trace.view.trace_not_found" + redirect_to :controller => "trace", :action => "list" end def create - filename = "/tmp/#{rand}" + if params[:trace] + logger.info(params[:trace][:gpx_file].class.name) + + if params[:trace][:gpx_file].respond_to?(:read) + begin + do_create(params[:trace][:gpx_file], params[:trace][:tagstring], + params[:trace][:description], params[:trace][:visibility]) + rescue => ex + logger.debug ex + end - File.open(filename, "w") { |f| f.write(@params['trace']['gpx_file'].read) } - @params['trace']['name'] = @params['trace']['gpx_file'].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane - @params['trace'].delete('gpx_file') # remove the field from the hash, because there's no such field in the DB - @trace = Trace.new(@params['trace']) - @trace.inserted = false - @trace.user = @user - @trace.timestamp = Time.now + if @trace.id + flash[:notice] = t "trace.create.trace_uploaded" - if @trace.save - saved_filename = "/home/osm/gpx/#{@trace.id}.gpx" - File.rename(filename, saved_filename) + if @user.traces.where(:inserted => false).count > 4 + flash[:warning] = t "trace.trace_header.traces_waiting", :count => @user.traces.where(:inserted => false).count + end - logger.info("id is #{@trace.id}") - flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion." - redirect_to :action => 'mine' + redirect_to :action => :list, :display_name => @user.display_name + end + else + @trace = Trace.new(:name => "Dummy", + :tagstring => params[:trace][:tagstring], + :description => params[:trace][:description], + :visibility => params[:trace][:visibility], + :inserted => false, :user => @user, + :timestamp => Time.now.getutc) + @trace.valid? + @trace.errors.add(:gpx_file, "can't be blank") + end else - # fixme throw an error here - redirect_to :action => 'mine' - flash[:notice] = "You haven't entered a tag or a description for yoru traces." + @trace = Trace.new(:visibility => default_visibility) end + + @title = t "trace.create.upload_trace" end def data trace = Trace.find(params[:id]) - if trace.public? or (@user and @user == trace.user) - send_data(File.open("/tmp/#{trace.id}.gpx",'r').read , :filename => "#{trace.id}.gpx", :type => 'text/plain', :disposition => 'inline') + + if trace.visible? && (trace.public? || (@user && @user == trace.user)) + if Acl.no_trace_download(request.remote_ip) + render :text => "", :status => :forbidden + elsif request.format == Mime::XML + send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment") + elsif request.format == Mime::GPX + send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment") + else + send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") + end + else + render :text => "", :status => :not_found + end + rescue ActiveRecord::RecordNotFound + render :text => "", :status => :not_found + end + + def edit + @trace = Trace.find(params[:id]) + + if !@trace.visible? + render :text => "", :status => :not_found + elsif @user.nil? || @trace.user != @user + render :text => "", :status => :forbidden + else + @title = t "trace.edit.title", :name => @trace.name + + if params[:trace] + @trace.description = params[:trace][:description] + @trace.tagstring = params[:trace][:tagstring] + @trace.visibility = params[:trace][:visibility] + if @trace.save + redirect_to :action => "view", :display_name => @user.display_name + end + end end + rescue ActiveRecord::RecordNotFound + render :text => "", :status => :not_found end - def make_public + def delete trace = Trace.find(params[:id]) - if @user and trace.user == @user and !trace.public - trace.public = true + + if !trace.visible? + render :text => "", :status => :not_found + elsif @user.nil? || trace.user != @user + render :text => "", :status => :forbidden + else + trace.visible = false trace.save - flash[:notice] = 'Track made public' - redirect_to :controller => 'trace', :action => 'view', :id => params[:id] + flash[:notice] = t "trace.delete.scheduled_for_deletion" + redirect_to :action => :list, :display_name => @user.display_name end + rescue ActiveRecord::RecordNotFound + render :text => "", :status => :not_found end def georss - traces = Trace.find(:all, :conditions => ['public = true'], :order => 'timestamp DESC', :limit => 20) - - rss = OSM::GeoRSS.new + @traces = Trace.visible_to_all.visible - #def add(latitude=0, longitude=0, title_text='dummy title', url='http://www.example.com/', description_text='dummy description', timestamp=Time.now) - traces.each do |trace| - rss.add(trace.latitude, trace.longitude, trace.name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), " 'icon', :id => trace.id, :user_login => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp) + if params[:display_name] + @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) end - response.headers["Content-Type"] = 'application/xml+rss' - - render :text => rss.to_s + @traces = @traces.tagged(params[:tag]) if params[:tag] + @traces = @traces.order("timestamp DESC") + @traces = @traces.limit(20) + @traces = @traces.includes(:user) end def picture trace = Trace.find(params[:id]) - send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user) + + if trace.visible? && trace.inserted? + if trace.public? || (@user && @user == trace.user) + expires_in 7.days, :private => !trace.public?, :public => trace.public? + send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline") + else + render :text => "", :status => :forbidden + end + else + render :text => "", :status => :not_found + end + rescue ActiveRecord::RecordNotFound + render :text => "", :status => :not_found end def icon trace = Trace.find(params[:id]) - send_data(trace.icon_picture, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user) + + if trace.visible? && trace.inserted? + if trace.public? || (@user && @user == trace.user) + expires_in 7.days, :private => !trace.public?, :public => trace.public? + send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline") + else + render :text => "", :status => :forbidden + end + else + render :text => "", :status => :not_found + end + rescue ActiveRecord::RecordNotFound + render :text => "", :status => :not_found end - def api_details - trace = Trace.find(params[:id]) - doc = OSM::API.new.get_xml_doc - doc.root << trace.to_xml_node() if trace.public? or trace.user == @user - render :text => doc.to_s + def api_read + trace = Trace.visible.find(params[:id]) + + if trace.public? || trace.user == @user + render :text => trace.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :forbidden + end + end + + def api_update + trace = Trace.visible.find(params[:id]) + + if trace.user == @user + new_trace = Trace.from_xml(request.raw_post) + + unless new_trace && new_trace.id == trace.id + fail OSM::APIBadUserInput.new("The id in the url (#{trace.id}) is not the same as provided in the xml (#{new_trace.id})") + end + + trace.description = new_trace.description + trace.tags = new_trace.tags + trace.visibility = new_trace.visibility + trace.save! + + render :text => "", :status => :ok + else + render :text => "", :status => :forbidden + end + end + + def api_delete + trace = Trace.visible.find(params[:id]) + + if trace.user == @user + trace.visible = false + trace.save! + + render :text => "", :status => :ok + else + render :text => "", :status => :forbidden + end end def api_data - render :action => 'data' + trace = Trace.visible.find(params[:id]) + + if trace.public? || trace.user == @user + if request.format == Mime::XML + send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment") + elsif request.format == Mime::GPX + send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment") + else + send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") + end + else + render :text => "", :status => :forbidden + end end def api_create - #FIXME merge this code with create as they're pretty similar? - + tags = params[:tags] || "" + description = params[:description] || "" + visibility = params[:visibility] + + if visibility.nil? + if params[:public] && params[:public].to_i.nonzero? + visibility = "public" + else + visibility = "private" + end + end + + if params[:file].respond_to?(:read) + do_create(params[:file], tags, description, visibility) + + if @trace.id + render :text => @trace.id.to_s, :content_type => "text/plain" + elsif @trace.valid? + render :text => "", :status => :internal_server_error + else + render :text => "", :status => :bad_request + end + else + render :text => "", :status => :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}" - File.open(filename, "w") { |f| f.write(request.raw_post) } - @params['trace'] = {} - @params['trace']['name'] = params[:filename] - @params['trace']['tagstring'] = params[:tags] - @params['trace']['description'] = params[:description] - @trace = Trace.new(@params['trace']) - @trace.inserted = false - @trace.user = @user - @trace.timestamp = Time.now - - if @trace.save - saved_filename = "/tmp/#{@trace.id}.gpx" - File.rename(filename, saved_filename) - logger.info("id is #{@trace.id}") - flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion." - render :nothing => true - else - render :nothing => true, :status => 400 # er FIXME what fricking code to return? + + # ...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( + :name => name, + :tagstring => tags, + :description => description, + :visibility => visibility, + :inserted => true, + :user => @user, + :timestamp => Time.now.getutc + ) + + 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 + # Finally save the user's preferred privacy level + if pref = @user.preferences.where(:k => "gps.trace.visibility").first + pref.v = visibility + pref.save + else + @user.preferences.create(:k => "gps.trace.visibility", :v => visibility) + end + end + + def offline_warning + flash.now[:warning] = t "trace.offline_warning.message" if STATUS == :gpx_offline + end + + def offline_redirect + redirect_to :action => :offline if STATUS == :gpx_offline + end + + def default_visibility + visibility = @user.preferences.where(:k => "gps.trace.visibility").first + + if visibility + visibility.v + elsif @user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil? + "private" + else + "public" + end end end