X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/30d5e783e478789d2454e85c6d5b621b07a11081..6fe824bd0ba20d997bb7d1b8627d79e209b61d03:/app/controllers/user_roles_controller.rb

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 7e56693df..8f623a04d 100644
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -3,43 +3,59 @@ class UserRolesController < ApplicationController
 
   before_filter :authorize_web
   before_filter :require_user
+  before_filter :lookup_this_user
   before_filter :require_administrator
+  before_filter :require_valid_role
+  before_filter :not_in_role, :only => [:grant]
+  before_filter :in_role, :only => [:revoke]
 
   def grant
-    # added a random nonce here which isn't predictable, making an CSRF procedure much, much more difficult.
-    if params[:nonce] and params[:nonce] == session[:nonce]
-      this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
-      if this_user and UserRole::ALL_ROLES.include? params[:role]
-        this_user.roles.create(:role => params[:role])
-        redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
-      else
-        flash[:notice] = t('user_role.grant.fail', :role => params[:role], :name => params[:display_name])
-      end
-    else
-      @nonce = OAuth::Helper.generate_nonce
-      session[:nonce] = @nonce
-    end
+    @this_user.roles.create(:role => @role, :granter_id => @user.id)
+    redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
   end
 
   def revoke
-    # added a random nonce here which isn't predictable, making an CSRF procedure much, much more difficult.
-    if params[:nonce] and params[:nonce] == session[:nonce]
-      this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
-      if this_user and UserRole::ALL_ROLES.include? params[:role]
-        UserRole.delete_all({:user_id => this_user.id, :role => params[:role]})
-        redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
-      else
-        flash[:notice] = t('user_role.revoke.fail', :role => params[:role], :name => params[:display_name])
-      end
-    else
-      @nonce = OAuth::Helper.generate_nonce
-      session[:nonce] = @nonce
-    end
+    UserRole.delete_all({:user_id => @this_user.id, :role => @role})
+    redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
   end
 
   private
+  ##
+  # require that the user is an administrator, or fill out a helpful error message
+  # and return them to theuser page.
   def require_administrator
-    redirect_to "/403.html" unless @user.administrator?
+    unless @user.administrator?
+      flash[:error] = t'user_role.filter.not_an_administrator'
+      redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
+    end
+  end
+
+  ##
+  # require that the given role is valid. the role is a URL 
+  # parameter, so should always be present.
+  def require_valid_role
+    @role = params[:role]
+    unless UserRole::ALL_ROLES.include?(@role)
+      flash[:error] = t('user_role.filter.not_a_role', :role => @role)
+      redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
+    end
   end
 
+  ##
+  # checks that the user doesn't already have this role
+  def not_in_role
+    if @this_user.has_role? @role
+      flash[:error] = t('user_role.filter.already_has_role', :role => @role)
+      redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
+    end
+  end
+
+  ##
+  # checks that the user already has this role
+  def in_role
+    unless @this_user.has_role? @role
+      flash[:error] = t('user_role.filter.doesnt_have_role', :role => @role)
+      redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
+    end
+  end
 end