Require POST for make_friend and remove_friend

Note that this breaks the make_friend link in friend notfication
emails, but it will do as a temporary measure.

diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb
index 9bac0dc2d67bee754eeaafd0bb809d33e0be4590..2418ed24cdc10d18581f51747395eb4d7b419eaa 100644 (file)
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -33,9 +33,9 @@
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
     |
     <% if @user.is_friends_with?(contact) %>
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
     |
     <% if @user.is_friends_with?(contact) %>

-      <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => contact.display_name, :referer => request.fullpath %>
+      <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => contact.display_name, :referer => request.fullpath, :method => :post %>

     <% else %>
     <% else %>

-      <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => contact.display_name, :referer => request.fullpath %>
+      <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => contact.display_name, :referer => request.fullpath, :method => :post %>

     <% end %>
   </td>
 </tr>
     <% end %>
   </td>
 </tr>

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index f8af1fccfbf43204a1aaa70500156881d134e65b..70e4f18288b7799436880def9db0a7eca2924ca3 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -39,9 +39,9 @@
     <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
     |
     <% if @user and @user.is_friends_with?(@this_user) %>
     <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
     |
     <% if @user and @user.is_friends_with?(@this_user) %>

-      <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
+      <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name, :method => :post %>

     <% else %>
     <% else %>

-      <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
+      <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name, :method => :post %>

     <% end %>
     <% if @this_user.blocks.exists? %>
       |
     <% end %>
     <% if @this_user.blocks.exists? %>
       |

diff --git a/config/routes.rb b/config/routes.rb
index 6b816453784ad814be8d2c987329f01d504195ec..c5119b945bf9bf4ec109d4ad8f72db91ee93a638 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -174,8 +174,8 @@ OpenStreetMap::Application.routes.draw do
 
   # user pages
   match '/user/:display_name' => 'user#view', :via => :get, :as => "user"
 
   # user pages
   match '/user/:display_name' => 'user#view', :via => :get, :as => "user"

-  match '/user/:display_name/make_friend' => 'user#make_friend', :via => :get
-  match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => :get
+  match '/user/:display_name/make_friend' => 'user#make_friend', :via => :post
+  match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => :post

   match '/user/:display_name/account' => 'user#account', :via => [:get, :post]
   match '/user/:display_name/set_status' => 'user#set_status', :via => :get, :as => :set_status_user
   match '/user/:display_name/delete' => 'user#delete', :via => :get, :as => :delete_user
   match '/user/:display_name/account' => 'user#account', :via => [:get, :post]
   match '/user/:display_name/set_status' => 'user#set_status', :via => :get, :as => :set_status_user
   match '/user/:display_name/delete' => 'user#delete', :via => :get, :as => :delete_user

diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index 4379a1d49d18c5e5bd06fa8f239c9dd8fd06a116..e853081836298bdc5393c60d2aaf080f052f4cea 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -140,11 +140,11 @@ class UserControllerTest < ActionController::TestCase
     )
 
     assert_routing(
     )
 
     assert_routing(

-      { :path => "/user/username/make_friend", :method => :get },
+      { :path => "/user/username/make_friend", :method => :post },

       { :controller => "user", :action => "make_friend", :display_name => "username" }
     )
     assert_routing(
       { :controller => "user", :action => "make_friend", :display_name => "username" }
     )
     assert_routing(

-      { :path => "/user/username/remove_friend", :method => :get },
+      { :path => "/user/username/remove_friend", :method => :post },

       { :controller => "user", :action => "remove_friend", :display_name => "username" }
     )
 
       { :controller => "user", :action => "remove_friend", :display_name => "username" }
     )