cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Close a number of holes in the API by making it validate changes

Browse source 
more carefully.
This commit is contained in:
Tom Hughes 2007-06-19 23:20:39 +00:00
parent 7f2756fe20
commit c11d961f62
9 changed files with 250 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/controllers/node_controller.rb
View file

@ -7,13 +7,7 @@ class NodeController < ApplicationController
def create def create
response.headers["Content-Type"] = 'text/xml' response.headers["Content-Type"] = 'text/xml'
if request.put? if request.put?
node = nil node = Node.from_xml(request.raw_post, true)
begin
node = Node.from_xml(request.raw_post, true)
rescue
render :text => "XML didn't parse", :status => 400 # if we got here the doc didnt parse
return
end
if node if node
node.user_id = @user.id node.user_id = @user.id
@ -61,9 +55,13 @@ class NodeController < ApplicationController
when :delete when :delete
if node.visible if node.visible
node.visible = 0 if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
node.save_with_history render :nothing => true, :status => HTTP_PRECONDITION_FAILED
render :nothing => true else
node.visible = 0
node.save_with_history
render :nothing => true
end
else else
render :nothing => true, :status => 410 render :nothing => true, :status => 410
end end
@ -71,17 +69,21 @@ class NodeController < ApplicationController
when :put when :put
new_node = Node.from_xml(request.raw_post) new_node = Node.from_xml(request.raw_post)
node.timestamp = Time.now if new_node
node.user_id = @user.id node.timestamp = Time.now
node.user_id = @user.id
node.latitude = new_node.latitude node.latitude = new_node.latitude
node.longitude = new_node.longitude node.longitude = new_node.longitude
node.tags = new_node.tags node.tags = new_node.tags
if node.id == new_node.id and node.save_with_history if node.id == new_node.id and node.save_with_history
render :nothing => true, :status => 200 render :nothing => true
else
render :nothing => true, :status => 500
end
else else
render :nothing => true, :status => 500 render :nothing => true, :status => 400 # if we got here the doc didnt parse
end end
return return
end end

47
app/controllers/segment_controller.rb
View file

@ -31,7 +31,6 @@ class SegmentController < ApplicationController
render :nothing => true, :status => 500 render :nothing => true, :status => 500
end end
return return
else else
render :nothing => true, :status => 400 # if we got here the doc didnt parse render :nothing => true, :status => 400 # if we got here the doc didnt parse
return return
@ -58,9 +57,13 @@ class SegmentController < ApplicationController
when :delete when :delete
if segment.visible if segment.visible
segment.visible = 0 if WaySegment.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_segments.id", :conditions => [ "current_ways.visible = 1 AND current_way_segments.segment_id = ?", segment.id ])
segment.save_with_history render :nothing => true, :status => HTTP_PRECONDITION_FAILED
render :nothing => true else
segment.visible = 0
segment.save_with_history
render :nothing => true
end
else else
render :nothing => true, :status => 410 render :nothing => true, :status => 410
end end
@ -68,26 +71,32 @@ class SegmentController < ApplicationController
when :put when :put
new_segment = Segment.from_xml(request.raw_post) new_segment = Segment.from_xml(request.raw_post)
segment.timestamp = Time.now if new_segment
segment.user_id = @user.id if new_segment.node_a == new_segment.node_b
render :nothing => true, :status => HTTP_EXPECTATION_FAILED
return
end
if new_segment.node_a == new_segment.node_b unless new_segment.preconditions_ok? # are the nodes visible?
render :nothing => true, :status => HTTP_EXPECTATION_FAILED render :nothing => true, :status => HTTP_PRECONDITION_FAILED
return return
end end
segment.node_a = new_segment.node_a segment.timestamp = Time.now
segment.node_b = new_segment.node_b segment.user_id = @user.id
segment.node_a = new_segment.node_a
segment.node_b = new_segment.node_b
segment.tags = new_segment.tags
segment.visible = new_segment.visible
segment.tags = new_segment.tags if segment.id == new_segment.id and segment.save_with_history
segment.visible = new_segment.visible render :nothing => true
else
if segment.id == new_segment.id and segment.save_with_history render :nothing => true, :status => 500
render :nothing => true, :status => HTTP_OK end
else else
render :nothing => true, :status => 500 render :nothing => true, :status => 400 # if we got here the doc didnt parse
end end
return
end end
end end

47
app/controllers/way_controller.rb
View file

@ -11,17 +11,16 @@ class WayController < ApplicationController
if way if way
way.user_id = @user.id way.user_id = @user.id
unless way.preconditions_ok? # are the segments (and their nodes) visible? unless way.preconditions_ok? # are the segments (and their nodes) visible?
render :nothing => true, :status => 412 render :nothing => true, :status => HTTP_PRECONDITION_FAILED
return return
end end
if way.save_with_history if way.save_with_history
render :text => way.id.to_s render :text => way.id.to_s
return
else else
render :nothing => true, :status => 500 render :nothing => true, :status => 500
return
end end
return return
else else
@ -87,38 +86,36 @@ class WayController < ApplicationController
render :text => way.to_xml.to_s render :text => way.to_xml.to_s
when :delete when :delete
unless way.visible if way.visible
way.visible = false
way.save_with_history
render :nothing => true
else
render :nothing => true, :status => 410 render :nothing => true, :status => 410
return
end end
way.visible = false
way.save_with_history
render :nothing => true
return
when :put when :put
way = Way.from_xml(request.raw_post) new_way = Way.from_xml(request.raw_post)
if way if new_way
way_in_db = Way.find(way.id) unless new_way.preconditions_ok? # are the segments (and their nodes) visible?
if way_in_db render :nothing => true, :status => HTTP_PRECONDITION_FAILED
way_in_db.user_id = @user.id
way_in_db.tags = way.tags
way_in_db.segs = way.segs
way_in_db.timestamp = way.timestamp
way_in_db.visible = true
if way_in_db.save_with_history
render :text => way.id
else
render :nothing => true, :status => 500
end
return return
end
way.user_id = @user.id
way.tags = new_way.tags
way.segs = new_way.segs
way.timestamp = new_way.timestamp
way.visible = true
if way.id == new_way.id and way.save_with_history
render :nothing => true
else else
render :nothing => true, :status => 404 # way doesn't exist yet render :nothing => true, :status => 500
end end
else else
render :nothing => true, :status => 400 # if we got here the doc didnt parse render :nothing => true, :status => 400 # if we got here the doc didnt parse
return
end end
end end
end end

93
app/models/node.rb
View file

@ -2,59 +2,69 @@ class Node < ActiveRecord::Base
require 'xml/libxml' require 'xml/libxml'
set_table_name 'current_nodes' set_table_name 'current_nodes'
validates_presence_of :user_id, :timestamp
validates_numericality_of :latitude validates_inclusion_of :visible, :in => [ true, false ]
validates_numericality_of :longitude validates_numericality_of :latitude, :longitude
# FIXME validate lat and lon within the world validate :validate_position
has_many :old_nodes, :foreign_key => :id has_many :old_nodes, :foreign_key => :id
belongs_to :user belongs_to :user
def validate_position
errors.add_to_base("Node is not in the world") unless in_world?
end
def in_world?
return false if self.latitude < -90 or self.latitude > 90
return false if self.longitude < -180 or self.longitude > 180
return true
end
def self.from_xml(xml, create=false) def self.from_xml(xml, create=false)
p = XML::Parser.new begin
p.string = xml p = XML::Parser.new
doc = p.parse p.string = xml
doc = p.parse
node = Node.new node = Node.new
doc.find('//osm/node').each do |pt| doc.find('//osm/node').each do |pt|
node.latitude = pt['lat'].to_f
node.longitude = pt['lon'].to_f
return nil unless node.in_world?
node.latitude = pt['lat'].to_f unless create
node.longitude = pt['lon'].to_f if pt['id'] != '0'
node.id = pt['id'].to_i
if node.latitude > 90 or node.latitude < -90 or node.longitude > 180 or node.longitude < -180 end
return nil
end
unless create
if pt['id'] != '0'
node.id = pt['id'].to_i
end end
end
node.visible = pt['visible'] and pt['visible'] == 'true' node.visible = pt['visible'] and pt['visible'] == 'true'
if create if create
node.timestamp = Time.now node.timestamp = Time.now
else else
if pt['timestamp'] if pt['timestamp']
node.timestamp = Time.parse(pt['timestamp']) node.timestamp = Time.parse(pt['timestamp'])
end
end end
tags = []
pt.find('tag').each do |tag|
tags << [tag['k'],tag['v']]
end
tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
tags = '' if tags.nil?
node.tags = tags
end end
rescue
tags = [] node = nil
pt.find('tag').each do |tag|
tags << [tag['k'],tag['v']]
end
tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
tags = '' if tags.nil?
node.tags = tags
end end
return node return node
end end
@ -62,12 +72,13 @@ class Node < ActiveRecord::Base
begin begin
Node.transaction do Node.transaction do
self.timestamp = Time.now self.timestamp = Time.now
self.save self.save!
old_node = OldNode.from_node(self) old_node = OldNode.from_node(self)
old_node.save old_node.save!
end end
return true return true
rescue Exception => ex rescue
return nil return nil
end end
end end

16
app/models/old_node.rb
View file

@ -1,8 +1,23 @@
class OldNode < ActiveRecord::Base class OldNode < ActiveRecord::Base
set_table_name 'nodes' set_table_name 'nodes'
validates_presence_of :user_id, :timestamp
validates_inclusion_of :visible, :in => [ true, false ]
validates_numericality_of :latitude, :longitude
validate :validate_position
belongs_to :user belongs_to :user
def validate_position
errors.add_to_base("Node is not in the world") unless in_world?
end
def in_world?
return false if self.latitude < -90 or self.latitude > 90
return false if self.longitude < -180 or self.longitude > 180
return true
end
def self.from_node(node) def self.from_node(node)
old_node = OldNode.new old_node = OldNode.new
old_node.latitude = node.latitude old_node.latitude = node.latitude
@ -26,5 +41,4 @@ class OldNode < ActiveRecord::Base
el1['timestamp'] = self.timestamp.xmlschema el1['timestamp'] = self.timestamp.xmlschema
return el1 return el1
end end
end end

4
app/models/old_segment.rb
View file

@ -1,6 +1,10 @@
class OldSegment < ActiveRecord::Base class OldSegment < ActiveRecord::Base
set_table_name 'segments' set_table_name 'segments'
validates_presence_of :user_id, :timestamp
validates_inclusion_of :visible, :in => [ true, false ]
validates_numericality_of :node_a, :node_b
belongs_to :user belongs_to :user
def self.from_segment(segment) def self.from_segment(segment)

8
app/models/old_way.rb
View file

@ -13,7 +13,7 @@ class OldWay < ActiveRecord::Base
return old_way return old_way
end end
def save_with_dependencies def save_with_dependencies!
# dont touch this unless you really have figured out why it's called # dont touch this unless you really have figured out why it's called
# (Rails doesn't deal well with the old ways table (called 'ways') because # (Rails doesn't deal well with the old ways table (called 'ways') because
@ -21,7 +21,7 @@ class OldWay < ActiveRecord::Base
# id and get it back but we have that and we want to get the 'version' back # id and get it back but we have that and we want to get the 'version' back
# we could add another column but thats a lot of data. No, set_primary_key # we could add another column but thats a lot of data. No, set_primary_key
# doesn't work either. # doesn't work either.
save() save!
clear_aggregation_cache clear_aggregation_cache
clear_association_cache clear_association_cache
@attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes')) @attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
@ -34,7 +34,7 @@ class OldWay < ActiveRecord::Base
tag.v = v tag.v = v
tag.id = self.id tag.id = self.id
tag.version = self.version tag.version = self.version
tag.save tag.save!
end end
i = 0 i = 0
@ -43,7 +43,7 @@ class OldWay < ActiveRecord::Base
seg.id = self.id seg.id = self.id
seg.segment_id = n seg.segment_id = n
seg.version = self.version seg.version = self.version
seg.save seg.save!
end end
end end

79
app/models/segment.rb
View file

@ -2,8 +2,9 @@ class Segment < ActiveRecord::Base
require 'xml/libxml' require 'xml/libxml'
set_table_name 'current_segments' set_table_name 'current_segments'
validates_numericality_of :node_a validates_presence_of :user_id, :timestamp
validates_numericality_of :node_b validates_inclusion_of :visible, :in => [ true, false ]
validates_numericality_of :node_a, :node_b
has_many :old_segments, :foreign_key => :id has_many :old_segments, :foreign_key => :id
belongs_to :user belongs_to :user
@ -13,43 +14,48 @@ class Segment < ActiveRecord::Base
belongs_to :to_node, :class_name => 'Node', :foreign_key => 'node_b' belongs_to :to_node, :class_name => 'Node', :foreign_key => 'node_b'
def self.from_xml(xml, create=false) def self.from_xml(xml, create=false)
p = XML::Parser.new begin
p.string = xml p = XML::Parser.new
doc = p.parse p.string = xml
doc = p.parse
segment = Segment.new segment = Segment.new
doc.find('//osm/segment').each do |pt| doc.find('//osm/segment').each do |pt|
segment.node_a = pt['from'].to_i
segment.node_b = pt['to'].to_i
segment.node_a = pt['from'].to_i unless create
segment.node_b = pt['to'].to_i if pt['id'] != '0'
segment.id = pt['id'].to_i
if pt['id'] != '0' end
segment.id = pt['id'].to_i
end
segment.visible = true
if create
segment.timestamp = Time.now
else
if pt['timestamp']
segment.timestamp = Time.parse(pt['timestamp'])
end end
segment.visible = true
if create
segment.timestamp = Time.now
else
if pt['timestamp']
segment.timestamp = Time.parse(pt['timestamp'])
end
end
tags = []
pt.find('tag').each do |tag|
tags << [tag['k'],tag['v']]
end
tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
tags = '' if tags.nil?
segment.tags = tags
end end
rescue
tags = [] segment = nil
pt.find('tag').each do |tag|
tags << [tag['k'],tag['v']]
end
tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
tags = '' if tags.nil?
segment.tags = tags
end end
return segment return segment
end end
@ -57,12 +63,13 @@ class Segment < ActiveRecord::Base
begin begin
Segment.transaction do Segment.transaction do
self.timestamp = Time.now self.timestamp = Time.now
self.save self.save!
old_segment = OldSegment.from_segment(self) old_segment = OldSegment.from_segment(self)
old_segment.save old_segment.save!
end end
return true return true
rescue Exception => ex rescue
return nil return nil
end end
end end

110
app/models/way.rb
View file

@ -11,34 +11,37 @@ class Way < ActiveRecord::Base
set_table_name 'current_ways' set_table_name 'current_ways'
def self.from_xml(xml, create=false) def self.from_xml(xml, create=false)
p = XML::Parser.new begin
p.string = xml p = XML::Parser.new
doc = p.parse p.string = xml
doc = p.parse
way = Way.new way = Way.new
doc.find('//osm/way').each do |pt| doc.find('//osm/way').each do |pt|
if !create and pt['id'] != '0' if !create and pt['id'] != '0'
way.id = pt['id'].to_i way.id = pt['id'].to_i
end end
if create if create
way.timestamp = Time.now way.timestamp = Time.now
way.visible = true way.visible = true
else else
if pt['timestamp'] if pt['timestamp']
way.timestamp = Time.parse(pt['timestamp']) way.timestamp = Time.parse(pt['timestamp'])
end
end
pt.find('tag').each do |tag|
way.add_tag_keyval(tag['k'], tag['v'])
end
pt.find('seg').each do |seg|
way.add_seg_num(seg['id'])
end end
end end
rescue
pt.find('tag').each do |tag| way = nil
way.add_tag_keyval(tag['k'], tag['v'])
end
pt.find('seg').each do |seg|
way.add_seg_num(seg['id'])
end
end end
return way return way
@ -140,38 +143,47 @@ class Way < ActiveRecord::Base
end end
def save_with_history def save_with_history
t = Time.now begin
self.timestamp = t Way.transaction do
self.save t = Time.now
self.timestamp = t
self.save!
WayTag.delete_all(['id = ?', self.id]) WayTag.delete_all(['id = ?', self.id])
self.tags.each do |k,v| self.tags.each do |k,v|
tag = WayTag.new tag = WayTag.new
tag.k = k tag.k = k
tag.v = v tag.v = v
tag.id = self.id tag.id = self.id
tag.save tag.save!
end
WaySegment.delete_all(['id = ?', self.id])
i = 0
self.segs.each do |n|
seg = WaySegment.new
seg.id = self.id
seg.segment_id = n
seg.sequence_id = i
seg.save!
i += 1
end
old_way = OldWay.from_way(self)
old_way.timestamp = t
old_way.save_with_dependencies!
end
return true
rescue
return nil
end end
WaySegment.delete_all(['id = ?', self.id])
i = 0
self.segs.each do |n|
seg = WaySegment.new
seg.id = self.id
seg.segment_id = n
seg.sequence_id = i
seg.save
i += 1
end
old_way = OldWay.from_way(self)
old_way.timestamp = t
old_way.save_with_dependencies
end end
def preconditions_ok? def preconditions_ok?
return false if self.segs.empty?
self.segs.each do |n| self.segs.each do |n|
segment = Segment.find(n) segment = Segment.find(n)
unless segment and segment.visible and segment.preconditions_ok? unless segment and segment.visible and segment.preconditions_ok?