Copy the redaction code from nodes to ways

[rails.git] / app / controllers / old_way_controller.rb

diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb
index da4e26d67be706e07aebd6297b38838ce73f7813..fc7366bb6657e3745c279f8cd6c5c4cd19d5d462 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,42 +1,58 @@
 class OldWayController < ApplicationController
   require 'xml/libxml'
 
-  session :off
-  before_filter :check_read_availability
+  skip_before_filter :verify_authenticity_token
+  before_filter :authorize, :only => [ :redact ]
+  before_filter :require_allow_write_api, :only => [ :redact ]
+  before_filter :check_api_readable
   after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
 
   def history
-    begin
-      way = Way.find(params[:id])
-    
-      doc = OSM::API.new.get_xml_doc
+    way = Way.find(params[:id])
 
-      way.old_ways.each do |old_way|
+    # TODO - maybe a bit heavyweight to do this on every
+    # call, perhaps try lazy auth.
+    setup_user_auth
+    
+    doc = OSM::API.new.get_xml_doc
+    
+    way.old_ways.each do |old_way|
+      unless old_way.redacted? and (@user.nil? or not @user.moderator?) and not params[:show_redactions] == "true"
         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
     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
-      
-      doc = OSM::API.new.get_xml_doc
-      doc.root << old_way.to_xml_node
-      
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
+    if old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first
+      # TODO - maybe a bit heavyweight to do this on every
+      # call, perhaps try lazy auth.
+      setup_user_auth
+
+      if old_way.redacted? and (@user.nil? or not @user.moderator?) and not 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
+        
+        render :text => doc.to_s, :content_type => "text/xml"
+      end
+    else
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    end
+  end
+
+  def redact
+    if @user && @user.moderator?
+      render :nothing => true
+
+    else
+      render :nothing => true, :status => :forbidden
     end
   end
 end