From: Matt Amos <zerebubuth@gmail.com>
Date: Wed, 28 Mar 2012 12:21:18 +0000 (+0100)
Subject: Fixing review comments
X-Git-Tag: live~5592
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/67182f824e9ace7d5f6d40691e2d3d120b8fbfea

Fixing review comments

Added scoping for unredacted items, cleaned up authorization and
railsified old_node_controller.
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7ac9e6402..7043d8206 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -160,6 +160,18 @@ class ApplicationController < ActionController::Base
     end 
   end 
 
+  ##
+  # to be used as a before_filter *after* authorize. this checks that
+  # the user is a moderator and, if not, returns a forbidden error.
+  #
+  def authorize_moderator(errormessage="Access restricted to moderators") 
+    # check user is a moderator
+    unless @user.moderator?
+      render :text => errormessage, :status => :forbidden
+      return false
+    end 
+  end 
+
   def check_database_readable(need_api = false)
     if STATUS == :database_offline or (need_api and STATUS == :api_offline)
       redirect_to :controller => 'site', :action => 'offline'
diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb
index e6170fbda..1b5ec13a3 100644
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -2,59 +2,77 @@ class OldNodeController < ApplicationController
   require 'xml/libxml'
 
   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_node, :except => [ :history ]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 
   def history
-    # TODO - maybe a bit heavyweight to do this on every
-    # call, perhaps try lazy auth.
-    setup_user_auth
-
     node = Node.find(params[:id].to_i)
     
     doc = OSM::API.new.get_xml_doc
     
-    node.old_nodes.each do |old_node|
-      unless old_node.redacted? and (@user.nil? or not @user.moderator?)
-        doc.root << old_node.to_xml_node
-      end
+    visible_nodes = if @user and @user.moderator?
+                      node.old_nodes
+                    else
+                      node.old_nodes.unredacted
+                    end
+
+    visible_nodes.each do |old_node|
+      doc.root << old_node.to_xml_node
     end
     
     render :text => doc.to_s, :content_type => "text/xml"
   end
   
   def version
-    if old_node = OldNode.where(:node_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_node.redacted? and (@user.nil? or not @user.moderator?)
-        render :nothing => true, :status => :forbidden
-      else
+    if @old_node.redacted? and (@user.nil? or not @user.moderator?)
+      render :nothing => true, :status => :forbidden
+    else
 
-        response.last_modified = old_node.timestamp
-        
-        doc = OSM::API.new.get_xml_doc
-        doc.root << old_node.to_xml_node
+      response.last_modified = @old_node.timestamp
+      
+      doc = OSM::API.new.get_xml_doc
+      doc.root << @old_node.to_xml_node
         
-        render :text => doc.to_s, :content_type => "text/xml"
-      end
-    else
-      render :nothing => true, :status => :not_found
+      render :text => doc.to_s, :content_type => "text/xml"
     end
   end
 
   def redact
-    if @user && @user.moderator?
-      render :nothing => true
-
+    redaction_id = params['redaction']
+    unless redaction_id.nil?
+      # if a redaction ID was specified, then set this node 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_node.redact!(redaction)
+      
     else
-      render :nothing => true, :status => :forbidden
+      # if no redaction ID was provided, then this is an unredact
+      # operation.
+      @old_node.redact!(nil)
+    end
+    
+    # just return an empty 200 OK for success
+    render :nothing => true
+  end
+
+  private
+  
+  def lookup_old_node
+    @old_node = OldNode.where(:node_id => params[:id], :version => params[:version]).first
+    if @old_node.nil?
+      # i want to do this
+      #raise OSM::APINotFoundError.new
+      # but i get errors, so i'm getting very fed up and doing this instead
+      render :nothing => true, :status => :not_found
+      return false
     end
   end
 end
diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 5643a389b..e20a3b728 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,11 +1,14 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
-  include Redactable
 
   self.table_name = "nodes"
   self.primary_keys = "node_id", "version"
 
+  # note this needs to be included after the table name changes, or
+  # the queries generated by Redactable will use the wrong table name.
+  include Redactable
+
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
diff --git a/config/routes.rb b/config/routes.rb
index 823c00950..46be25c97 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,7 +16,7 @@ OpenStreetMap::Application.routes.draw do
   match 'api/0.6/node/:id/ways' => 'way#ways_for_node', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id/relations' => 'relation#relations_for_node', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id/history' => 'old_node#history', :via => :get, :id => /\d+/
-  match 'api/0.6/node/:id/:version/redact' => 'old_node#redact', :version => /\d+/, :id => /\d+/
+  match 'api/0.6/node/:id/:version/redact' => 'old_node#redact', :via => :post, :version => /\d+/, :id => /\d+/
   match 'api/0.6/node/:id/:version' => 'old_node#version', :via => :get, :id => /\d+/, :version => /\d+/
   match 'api/0.6/node/:id' => 'node#read', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id' => 'node#update', :via => :put, :id => /\d+/
diff --git a/lib/redactable.rb b/lib/redactable.rb
index b994e8563..d8367d7bd 100644
--- a/lib/redactable.rb
+++ b/lib/redactable.rb
@@ -1,6 +1,12 @@
 require 'osm'
 
 module Redactable
+  def self.included(base)
+    # this is used to extend activerecord bases, as these aren't
+    # in scope for the module itself.
+    base.scope :unredacted, base.where(:redaction_id => nil)
+  end
+  
   def redacted?
     not self.redaction.nil?
   end
@@ -11,5 +17,6 @@ module Redactable
 
     # make the change
     self.redaction = redaction
+    self.save!
   end
 end
diff --git a/test/functional/old_node_controller_test.rb b/test/functional/old_node_controller_test.rb
index efef38ad1..ebc387751 100644
--- a/test/functional/old_node_controller_test.rb
+++ b/test/functional/old_node_controller_test.rb
@@ -193,7 +193,7 @@ class OldNodeControllerTest < ActionController::TestCase
 
     do_redact_node(nodes(:node_with_versions_v4),
                    redactions(:example))
-    assert_response :forbidden, "shouldn't be OK to redact current version as moderator."
+    assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
   end    
 
   ##