X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fd6f00b069af5a7b87227ea4c3401dc461d7311a..990f3eba4069f98a11d98f18b18d0e35bcf295f4:/app/controllers/old_way_controller.rb

diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb
index a42496687..e2ee5f0c5 100644
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,42 +1,75 @@
 class OldWayController < ApplicationController
   require 'xml/libxml'
 
-  session :off
+  skip_before_filter :verify_authenticity_token
+  before_filter :setup_user_auth, :only => [ :history, :version ]
+  before_filter :authorize, :only => [ :redact ]
+  before_filter :authorize_moderator, :only => [ :redact ]
+  before_filter :require_allow_write_api, :only => [ :redact ]
   before_filter :check_api_readable
+  before_filter :check_api_writable, :only => [ :redact ]
+  before_filter :lookup_old_way, :except => [ :history ]
   after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
 
   def history
-    begin
-      way = Way.find(params[:id])
+    way = Way.find(params[:id].to_i)
     
-      doc = OSM::API.new.get_xml_doc
-
-      way.old_ways.each do |old_way|
-        doc.root << old_way.to_xml_node
-      end
-
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    doc = OSM::API.new.get_xml_doc
+    
+    visible_ways = if @user and @user.moderator? and params[:show_redactions] == "true"
+                     way.old_ways
+                   else
+                     way.old_ways.unredacted
+                   end
+    
+    visible_ways.each do |old_way|
+      doc.root << old_way.to_xml_node
     end
+    
+    render :text => doc.to_s, :content_type => "text/xml"
   end
   
   def version
-    begin
-      old_way = OldWay.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
-      
-      response.headers['Last-Modified'] = old_way.timestamp.rfc822
+    if @old_way.redacted? and not (@user and @user.moderator? and params[:show_redactions] == "true")
+      render :nothing => true, :status => :forbidden
+    else
+
+      response.last_modified = @old_way.timestamp
       
       doc = OSM::API.new.get_xml_doc
-      doc.root << old_way.to_xml_node
-      
+      doc.root << @old_way.to_xml_node
+        
       render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
+    end
+  end
+
+  def redact
+    redaction_id = params['redaction']
+    unless redaction_id.nil?
+      # if a redaction ID was specified, then set this way to
+      # be redacted in that redaction. (TODO: check that the
+      # user doing the redaction owns the redaction object too)
+      redaction = Redaction.find(redaction_id.to_i)
+      @old_way.redact!(redaction)
+      
+    else
+      # if no redaction ID was provided, then this is an unredact
+      # operation.
+      @old_way.redact!(nil)
+    end
+    
+    # just return an empty 200 OK for success
+    render :nothing => true
+  end
+
+  private
+  
+  def lookup_old_way
+    @old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first
+    if @old_way.nil?
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+      return false
     end
   end
 end