From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Dec 2018 12:54:55 +0000 (+0000)
Subject: Only check IP addresses for anonymous note comments
X-Git-Tag: live~2744
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cbc4c5352d66739e8d9cb89c1888fe0687d80c09?ds=sidebyside

Only check IP addresses for anonymous note comments
---

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 62fd9d078..036238db1 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -55,7 +55,7 @@ class NotesController < ApplicationController
   # Create a new note
   def create
     # Check the ACLs
-    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+    raise OSM::APIAccessDenied if current_user.nil? && Acl.no_note_comment(request.remote_ip)
 
     # Check the arguments are sane
     raise OSM::APIBadUserInput, "No lat was given" unless params[:lat]
@@ -91,7 +91,7 @@ class NotesController < ApplicationController
   # Add a comment to an existing note
   def comment
     # Check the ACLs
-    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+    raise OSM::APIAccessDenied if current_user.nil? && Acl.no_note_comment(request.remote_ip)
 
     # Check the arguments are sane
     raise OSM::APIBadUserInput, "No id was given" unless params[:id]