class ChangesetController < ApplicationController
require 'xml/libxml'
- require 'diff_reader'
+ session :off
before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
before_filter :check_write_availability, :only => [:create, :update, :delete, :upload, :include]
before_filter :check_read_availability, :except => [:create, :update, :delete, :upload, :download, :query]
# Help methods for checking boundary sanity and area size
include MapBoundary
+ # Helper methods for checking consistency
+ include ConsistencyValidations
+
# Create a changeset from XML.
def create
if request.put?
end
end
+ ##
+ # Return XML giving the basic info about the changeset. Does not
+ # return anything about the nodes, ways and relations in the changeset.
def read
begin
changeset = Changeset.find(params[:id])
end
end
+ ##
+ # marks a changeset as closed. this may be called multiple times
+ # on the same changeset, so is idempotent.
def close
- begin
- unless request.put?
- render :nothing => true, :status => :method_not_allowed
- return
- end
-
- changeset = Changeset.find(params[:id])
+ unless request.put?
+ render :nothing => true, :status => :method_not_allowed
+ return
+ end
+
+ changeset = Changeset.find(params[:id])
+ check_changeset_consistency(changeset, @user)
- unless @user.id == changeset.user_id
- raise OSM::APIUserChangesetMismatchError
- end
+ # to close the changeset, we'll just set its closed_at time to
+ # now. this might not be enough if there are concurrency issues,
+ # but we'll have to wait and see.
+ changeset.set_closed_time_now
- changeset.open = false
- changeset.save!
- render :nothing => true
- rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
- end
+ changeset.save!
+ render :nothing => true
+ rescue ActiveRecord::RecordNotFound
+ render :nothing => true, :status => :not_found
+ rescue OSM::APIError => ex
+ render ex.render_opts
end
##
# increase the size of the bounding box. this is a hint that clients can
# set either before uploading a large number of changes, or changes that
# the client (but not the server) knows will affect areas further away.
- def include
+ def expand_bbox
# only allow POST requests, because although this method is
# idempotent, there is no "document" to PUT really...
if request.post?
cs = Changeset.find(params[:id])
-
- # check user credentials - only the user who opened a changeset
- # may alter it.
- unless @user.id == cs.user_id
- raise OSM::APIUserChangesetMismatchError
- end
+ check_changeset_consistency(cs, @user)
# keep an array of lons and lats
lon = Array.new
end
changeset = Changeset.find(params[:id])
-
- # access control - only the user who created a changeset may
- # upload to it.
- unless @user.id == changeset.user_id
- raise OSM::APIUserChangesetMismatchError
- end
+ check_changeset_consistency(changeset, @user)
diff_reader = DiffReader.new(request.raw_post, changeset)
Changeset.transaction do
# create the conditions that the user asked for. some or all of
# these may be nil.
conditions = conditions_bbox(params['bbox'])
- cond_merge conditions, conditions_user(params['user'])
- cond_merge conditions, conditions_time(params['time'])
- cond_merge conditions, conditions_open(params['open'])
+ conditions = cond_merge conditions, conditions_user(params['user'])
+ conditions = cond_merge conditions, conditions_time(params['time'])
+ conditions = cond_merge conditions, conditions_open(params['open'])
# create the results document
results = OSM::API.new.get_xml_doc
render :nothing => true, :status => :not_found
rescue OSM::APIError => ex
render ex.render_opts
- rescue String => s
- render :text => s, :content_type => "text/plain", :status => :bad_request
end
##
new_changeset = Changeset.from_xml(request.raw_post)
unless new_changeset.nil?
+ check_changeset_consistency(changeset, @user)
changeset.update_from(new_changeset, @user)
render :text => changeset.to_xml, :mime_type => "text/xml"
else
render ex.render_opts
end
+private
#------------------------------------------------------------
# utility functions below.
#------------------------------------------------------------
# area restriction.
def conditions_bbox(bbox)
unless bbox.nil?
- raise "Bounding box should be min_lon,min_lat,max_lon,max_lat" unless bbox.count(',') == 3
+ raise OSM::APIBadUserInput.new("Bounding box should be min_lon,min_lat,max_lon,max_lat") unless bbox.count(',') == 3
bbox = sanitise_boundaries(bbox.split(/,/))
- raise "Minimum longitude should be less than maximum." unless bbox[0] <= bbox[2]
- raise "Minimum latitude should be less than maximum." unless bbox[1] <= bbox[3]
+ raise OSM::APIBadUserInput.new("Minimum longitude should be less than maximum.") unless bbox[0] <= bbox[2]
+ raise OSM::APIBadUserInput.new("Minimum latitude should be less than maximum.") unless bbox[1] <= bbox[3]
return ['min_lon < ? and max_lon > ? and min_lat < ? and max_lat > ?',
bbox[2] * GeoRecord::SCALE, bbox[0] * GeoRecord::SCALE, bbox[3]* GeoRecord::SCALE, bbox[1] * GeoRecord::SCALE]
else
# restrict changesets to those by a particular user
def conditions_user(user)
unless user.nil?
+ # user input checking, we don't have any UIDs < 1
+ raise OSM::APIBadUserInput.new("invalid user ID") if user.to_i < 1
+
u = User.find(user.to_i)
- raise OSM::APINotFoundError unless u.data_public?
+ # should be able to get changesets of public users only, or
+ # our own changesets regardless of public-ness.
+ unless u.data_public?
+ # get optional user auth stuff so that users can see their own
+ # changesets if they're non-public
+ setup_user_auth
+
+ raise OSM::APINotFoundError if @user.nil? or @user.id != u.id
+ end
return ['user_id = ?', u.id]
else
return nil
# if there is a range, i.e: comma separated, then the first is
# low, second is high - same as with bounding boxes.
if time.count(',') == 1
- from, to = time.split(/,/).collect { |t| Date.parse(t) }
- return ['created_at > ? and created_at < ?', from, to]
+ # check that we actually have 2 elements in the array
+ times = time.split(/,/)
+ raise OSM::APIBadUserInput.new("bad time range") if times.size != 2
+
+ from, to = times.collect { |t| DateTime.parse(t) }
+ return ['closed_at >= ? and created_at <= ?', from, to]
else
# if there is no comma, assume its a lower limit on time
- return ['created_at > ?', Date.parse(time)]
+ return ['closed_at >= ?', DateTime.parse(time)]
end
else
return nil
end
+ # stupid DateTime seems to throw both of these for bad parsing, so
+ # we have to catch both and ensure the correct code path is taken.
rescue ArgumentError => ex
- raise ex.message.to_s
+ raise OSM::APIBadUserInput.new(ex.message.to_s)
+ rescue RuntimeError => ex
+ raise OSM::APIBadUserInput.new(ex.message.to_s)
end
##
# restrict changes to those which are open
def conditions_open(open)
- return open.nil? ? nil : ['open = ?', true]
+ return open.nil? ? nil : ['closed_at >= ?', DateTime.now]
end
end
projects / rails.git / blobdiff