X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/30d5e783e478789d2454e85c6d5b621b07a11081..8f57efe850bf9805d9bfb073d16d4cf1d06882f5:/app/controllers/user_roles_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 7e56693df..469b2c40b 100644
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,45 +1,60 @@
 class UserRolesController < ApplicationController
-  layout 'site'
+  include UserMethods
 
-  before_filter :authorize_web
-  before_filter :require_user
-  before_filter :require_administrator
+  layout "site"
+
+  before_action :authorize_web
+
+  authorize_resource
+
+  before_action :lookup_user
+  before_action :require_valid_role
+  before_action :not_in_role, :only => [:grant]
+  before_action :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
+    @user.roles.create(:role => @role, :granter => current_user)
+    redirect_to user_path(@user)
   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
+    # checks that administrator role is not revoked from current user
+    if current_user == @user && @role == "administrator"
+      flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
     else
-      @nonce = OAuth::Helper.generate_nonce
-      session[:nonce] = @nonce
+      UserRole.where(:user => @user, :role => @role).delete_all
     end
+    redirect_to user_path(@user)
   end
 
   private
-  def require_administrator
-    redirect_to "/403.html" unless @user.administrator?
+
+  ##
+  # 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 user_path(@user)
+    end
+  end
+
+  ##
+  # checks that the user doesn't already have this role
+  def not_in_role
+    if @user.role? @role
+      flash[:error] = t("user_role.filter.already_has_role", :role => @role)
+      redirect_to user_path(@user)
+    end
   end
 
+  ##
+  # checks that the user already has this role
+  def in_role
+    unless @user.role? @role
+      flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
+      redirect_to user_path(@user)
+    end
+  end
 end