Really remove login.live.com from CSP allow list

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

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index fef4d85eb51273596dfe81ccfc0cad88ba81c19f..6a80f260ad05f99128a631558c2adac886f49b2a 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -4,19 +4,17 @@ class ChangesetsController < ApplicationController
   include UserMethods
 
   layout "site"
   include UserMethods
 
   layout "site"

-  require "xml/libxml"

 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

-  before_action -> { check_database_readable(:need_api => true) }, :only => [:index, :feed]
+  before_action -> { check_database_readable(:need_api => true) }, :only => [:index, :feed, :show]
+  before_action :require_oauth, :only => :show
+  before_action :check_database_writable, :only => [:subscribe, :unsubscribe]

 
   authorize_resource
 
   around_action :web_timeout
 
 
   authorize_resource
 
   around_action :web_timeout
 

-  # Helper methods for checking consistency
-  include ConsistencyValidations
-

   ##
   # list non-empty changesets in reverse chronological order
   def index
   ##
   # list non-empty changesets in reverse chronological order
   def index


@@ -74,6 +72,55 @@ class ChangesetsController < ApplicationController
     index
   end
 
     index
   end
 

+  def show
+    @type = "changeset"
+    @changeset = Changeset.find(params[:id])
+    @comments = if current_user&.moderator?
+                  @changeset.comments.unscope(:where => :visible).includes(:author)
+                else
+                  @changeset.comments.includes(:author)
+                end
+    @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "node_page")
+    @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "way_page")
+    @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "relation_page")
+    if @changeset.user.active? && @changeset.user.data_public?
+      changesets = conditions_nonempty(@changeset.user.changesets)
+      @next_by_user = changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first
+      @prev_by_user = changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first
+    end
+    render :layout => map_layout
+  rescue ActiveRecord::RecordNotFound
+    render :template => "browse/not_found", :status => :not_found, :layout => map_layout
+  end
+
+  ##
+  # subscribe to a changeset
+  def subscribe
+    @changeset = Changeset.find(params[:id])
+
+    if request.post?
+      @changeset.subscribe(current_user) unless @changeset.subscribed?(current_user)
+
+      redirect_to changeset_path(@changeset)
+    end
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+
+  ##
+  # unsubscribe from a changeset
+  def unsubscribe
+    @changeset = Changeset.find(params[:id])
+
+    if request.post?
+      @changeset.unsubscribe(current_user)
+
+      redirect_to changeset_path(@changeset)
+    end
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+

   private
 
   #------------------------------------------------------------
   private
 
   #------------------------------------------------------------


@@ -83,7 +130,6 @@ class ChangesetsController < ApplicationController
   ##
   # if a bounding box was specified do some sanity checks.
   # restrict changesets to those enclosed by a bounding box
   ##
   # if a bounding box was specified do some sanity checks.
   # restrict changesets to those enclosed by a bounding box

-  # we need to return both the changesets and the bounding box

   def conditions_bbox(changesets, bbox)
     if bbox
       bbox.check_boundaries
   def conditions_bbox(changesets, bbox)
     if bbox
       bbox.check_boundaries