Fixed AMF controller methods to hide redacted nodes

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

diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb
index 84d0b0c902c53d84ce4fd09f942ff220a9b87455..85cac89e787ea3b1259a3c20802aa81ae9de2c96 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -1,41 +1,75 @@
 class OldRelationController < ApplicationController
   require 'xml/libxml'
 
 class OldRelationController < ApplicationController
   require 'xml/libxml'
 

-  session :off
-  before_filter :check_read_availability
+  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_relation, :except => [ :history ]

   after_filter :compress_output
   after_filter :compress_output

+  around_filter :api_call_handle_error, :api_call_timeout

 
   def history
 
   def history

-    begin
-      relation = Relation.find(params[:id])
-      doc = OSM::API.new.get_xml_doc
-
-      relation.old_relations.each do |old_relation|
-        doc.root << old_relation.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
+    relation = Relation.find(params[:id].to_i)
+    
+    doc = OSM::API.new.get_xml_doc
+    
+    visible_relations = if @user and @user.moderator? and params[:show_redactions] == "true"
+                          relation.old_relations
+                        else
+                          relation.old_relations.unredacted
+                        end
+    
+    visible_relations.each do |old_relation|
+      doc.root << old_relation.to_xml_node

     end
     end

+    
+    render :text => doc.to_s, :content_type => "text/xml"

   end
   
   def version
   end
   
   def version

-    begin
-      old_relation = OldRelation.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
-      
-      response.headers['Last-Modified'] = old_relation.timestamp.rfc822
+    if @old_relation.redacted? and not (@user and @user.moderator? and params[:show_redactions] == "true")
+      render :nothing => true, :status => :forbidden
+    else

 
 

+      response.last_modified = @old_relation.timestamp
+      

       doc = OSM::API.new.get_xml_doc
       doc = OSM::API.new.get_xml_doc

-      doc.root << old_relation.to_xml_node
-
+      doc.root << @old_relation.to_xml_node
+        

       render :text => doc.to_s, :content_type => "text/xml"
       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 relation 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_relation.redact!(redaction)
+      
+    else
+      # if no redaction ID was provided, then this is an unredact
+      # operation.
+      @old_relation.redact!(nil)
+    end
+    
+    # just return an empty 200 OK for success
+    render :nothing => true
+  end
+
+  private
+  
+  def lookup_old_relation
+    @old_relation = OldRelation.where(:relation_id => params[:id], :version => params[:version]).first
+    if @old_relation.nil?

       render :nothing => true, :status => :not_found
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internetal_service_error
+      return false

     end
   end
 end
     end
   end
 end