Implement the cancan filters for diary entries

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 0144f69b61c2ba58c450bbe95fe656fef7b3a0ee..d853d4822979b6ab956a166cd6946c12f5f7e752 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,363 +1,497 @@
 class UserController < ApplicationController
 class UserController < ApplicationController

-  layout 'site', :except => :api_details
+  layout "site", :except => [:api_details]
+
+  skip_authorization_check :only => [:login, :logout]
+
+  skip_before_action :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files, :auth_success]
+  before_action :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
+  before_action :authorize, :only => [:api_details, :api_gpx_files]
+  before_action :authorize_web, :except => [:api_read, :api_details, :api_gpx_files]
+  before_action :set_locale, :except => [:api_read, :api_details, :api_gpx_files]
+  before_action :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
+  before_action :require_self, :only => [:account]
+  before_action :check_database_readable, :except => [:login, :api_read, :api_details, :api_gpx_files]
+  before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
+  before_action :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files]
+  before_action :require_allow_read_prefs, :only => [:api_details]
+  before_action :require_allow_read_gpx, :only => [:api_gpx_files]
+  before_action :require_cookies, :only => [:new, :login, :confirm]
+  before_action :require_administrator, :only => [:set_status, :delete, :list]
+  around_action :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files]
+  before_action :lookup_user_by_id, :only => [:api_read]
+  before_action :lookup_user_by_name, :only => [:set_status, :delete]
+  before_action :allow_thirdparty_images, :only => [:view, :account]
+
+  def terms
+    @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE
+    @text = OSM.legal_text_for_country(@legale)
+
+    if request.xhr?
+      render :partial => "terms"
+    else
+      @title = t "user.terms.title"

 
 

-  before_filter :authorize, :only => [:api_details, :api_gpx_files]
-  before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
-  before_filter :set_locale, :except => [:api_details, :api_gpx_files]
-  before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
-  before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]
-  before_filter :check_database_writable, :only => [:login, :new, :account, :go_public, :make_friend, :remove_friend]
-  before_filter :check_api_readable, :only => [:api_details, :api_gpx_files]
-  before_filter :require_allow_read_prefs, :only => [:api_details]
-  before_filter :require_allow_read_gpx, :only => [:api_gpx_files]
-  before_filter :require_cookies, :only => [:login, :confirm]
-  before_filter :require_administrator, :only => [:set_status, :delete, :list]
-  before_filter :lookup_this_user, :only => [:set_status, :delete]
+      if current_user && current_user.terms_agreed?
+        # Already agreed to terms, so just show settings
+        redirect_to :action => :account, :display_name => current_user.display_name
+      elsif current_user.nil? && session[:new_user].nil?
+        redirect_to :action => :login, :referer => request.fullpath
+      end
+    end
+  end

 
 

-  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
+  def save
+    @title = t "user.new.title"

 
 

-  cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
+    if params[:decline]
+      if current_user
+        current_user.terms_seen = true

 
 

-  def save
-    @title = t 'user.new.title'
+        flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save

 
 

-    if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
-      render :action => 'new'
-    else
-      if params[:open_id_complete] 
-        # The redirect from the OpenID provider reenters here
-        # again and we need to pass the parameters through to
-        # the open_id_authentication function
-        @user = session.delete(:new_user)
-        openid_verify(nil, @user) do |user|
-          create_user(user)
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => :account, :display_name => current_user.display_name

         end
       else
         end
       else

-        session[:referer] = params[:referer]
-
-        @user = User.new(params[:user])
+        redirect_to t("user.terms.declined")
+      end
+    elsif current_user
+      unless current_user.terms_agreed?
+        current_user.consider_pd = params[:user][:consider_pd]
+        current_user.terms_agreed = Time.now.getutc
+        current_user.terms_seen = true

 
 

-        @user.status = "pending"
-        @user.data_public = true
-        @user.description = "" if @user.description.nil?
-        @user.creation_ip = request.remote_ip
-        @user.languages = request.user_preferred_languages
+        flash[:notice] = t "user.new.terms accepted" if current_user.save
+      end

 
 

-        if params[:user][:openid_url] and @user.pass_crypt.empty?
-          # We are creating an account with OpenID and no password
-          # was specified so create a random one
-          @user.pass_crypt = ActiveSupport::SecureRandom.base64(16) 
-          @user.pass_crypt_confirmation = @user.pass_crypt 
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :action => :account, :display_name => current_user.display_name
+      end
+    else
+      self.current_user = session.delete(:new_user)
+
+      if check_signup_allowed(current_user.email)
+        current_user.data_public = true
+        current_user.description = "" if current_user.description.nil?
+        current_user.creation_ip = request.remote_ip
+        current_user.languages = http_accept_language.user_preferred_languages
+        current_user.terms_agreed = Time.now.getutc
+        current_user.terms_seen = true
+
+        if current_user.auth_uid.blank?
+          current_user.auth_provider = nil
+          current_user.auth_uid = nil

         end
 
         end
 

-        if @user.valid?
-          if params[:user][:openid_url].nil? or
-             params[:user][:openid_url].empty?
-            # No OpenID so just save
-            create_user(@user)
+        if current_user.save
+          flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
+
+          referer = welcome_path
+
+          begin
+            uri = URI(session[:referer])
+            %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m|
+              editor = Rack::Utils.parse_query(uri.query).slice("editor")
+              referer = welcome_path({ "zoom" => m[1],
+                                       "lat" => m[2],
+                                       "lon" => m[3] }.merge(editor))
+            end
+          rescue StandardError
+            # Use default
+          end
+
+          if current_user.status == "active"
+            session[:referer] = referer
+            successful_login(current_user)

           else
           else

-            # Verify OpenID before saving
-            session[:new_user] = @user
-            openid_verify(params[:user][:openid_url], @user)
+            session[:token] = current_user.tokens.create.token
+            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_now
+            redirect_to :action => "confirm", :display_name => current_user.display_name

           end
           end

+        else
+          render :action => "new", :referer => params[:referer]

         end
       end
         end
       end

-
-      # Render the signup page unless we have already been
-      # redirected or have managed to save the user
-      if response.location.nil? and  @user.new_record?
-        render :action => "new"
-      end

     end
   end
 
   def account
     end
   end
 
   def account

-    @title = t 'user.account.title'
-    @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
-
-    if params[:open_id_complete]
-      # The redirect from the OpenID provider reenters here
-      # again and we need to pass the parameters through to
-      # the open_id_authentication function
-      @user = session.delete(:new_user)
-      openid_verify(nil, @user) do |user|
-        update_user(user)
-      end
-    elsif params[:user] and params[:user][:display_name] and params[:user][:description]
-      @user.display_name = params[:user][:display_name]
-      @user.new_email = params[:user][:new_email]
-
-      if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
-        @user.pass_crypt = params[:user][:pass_crypt]
-        @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
-      end
-
-      @user.description = params[:user][:description]
-      @user.languages = params[:user][:languages].split(",")
-
-      case params[:image_action]
-        when "new" then @user.image = params[:user][:image]
-        when "delete" then @user.image = nil
-      end
-
-      @user.home_lat = params[:user][:home_lat]
-      @user.home_lon = params[:user][:home_lon]
-
-      @user.openid_url = nil if params[:user][:openid_url].empty?
+    @tokens = current_user.oauth_tokens.authorized

 
 

-      if params[:user][:openid_url].length > 0 and
-         params[:user][:openid_url] != @user.openid_url
-        # If the OpenID has changed, we want to check that it is a
-        # valid OpenID and one the user has control over before saving
-        # it as a password equivalent for the user.
-        session[:new_user] = @user
-        openid_verify(params[:user][:openid_url], @user)
+    if params[:user] && params[:user][:display_name] && params[:user][:description]
+      if params[:user][:auth_provider].blank? ||
+         (params[:user][:auth_provider] == current_user.auth_provider &&
+          params[:user][:auth_uid] == current_user.auth_uid)
+        update_user(current_user, params)

       else
       else

-        update_user(@user)
+        session[:new_user_settings] = params
+        redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
+      end
+    elsif errors = session.delete(:user_errors)
+      errors.each do |attribute, error|
+        current_user.errors.add(attribute, error)

       end
     end
       end
     end

+    @title = t "user.account.title"

   end
 
   def go_public
   end
 
   def go_public

-    @user.data_public = true
-    @user.save
-    flash[:notice] = t 'user.go_public.flash success'
-    redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
+    current_user.data_public = true
+    current_user.save
+    flash[:notice] = t "user.go_public.flash success"
+    redirect_to :action => "account", :display_name => current_user.display_name

   end
 
   def lost_password
   end
 
   def lost_password

-    @title = t 'user.lost_password.title'
+    @title = t "user.lost_password.title"
+
+    if params[:user] && params[:user][:email]
+      user = User.visible.find_by(:email => params[:user][:email])

 
 

-    if params[:user] and params[:user][:email]
-      user = User.find_by_email(params[:user][:email], :conditions => {:status => ["pending", "active", "confirmed"]})
+      if user.nil?
+        users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
+
+        user = users.first if users.count == 1
+      end

 
       if user
         token = user.tokens.create
 
       if user
         token = user.tokens.create

-        Notifier.deliver_lost_password(user, token)
-        flash[:notice] = t 'user.lost_password.notice email on way'
-        redirect_to :action => 'login'
+        Notifier.lost_password(user, token).deliver_now
+        flash[:notice] = t "user.lost_password.notice email on way"
+        redirect_to :action => "login"

       else
       else

-        flash.now[:error] = t 'user.lost_password.notice email cannot find'
+        flash.now[:error] = t "user.lost_password.notice email cannot find"

       end
     end
   end
 
   def reset_password
       end
     end
   end
 
   def reset_password

-    @title = t 'user.reset_password.title'
+    @title = t "user.reset_password.title"

 
     if params[:token]
 
     if params[:token]

-      token = UserToken.find_by_token(params[:token])
+      token = UserToken.find_by(:token => params[:token])

 
       if token
 
       if token

-        @user = token.user
+        self.current_user = token.user

 
         if params[:user]
 
         if params[:user]

-          @user.pass_crypt = params[:user][:pass_crypt]
-          @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
-          @user.status = "active" if @user.status == "pending"
-          @user.email_valid = true
+          current_user.pass_crypt = params[:user][:pass_crypt]
+          current_user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+          current_user.status = "active" if current_user.status == "pending"
+          current_user.email_valid = true

 
 

-          if @user.save
+          if current_user.save

             token.destroy
             token.destroy

-            flash[:notice] = t 'user.reset_password.flash changed'
-            redirect_to :action => 'login'
+            flash[:notice] = t "user.reset_password.flash changed"
+            successful_login(current_user)

           end
         end
       else
           end
         end
       else

-        flash[:error] = t 'user.reset_password.flash token bad'
-        redirect_to :action => 'lost_password'
+        flash[:error] = t "user.reset_password.flash token bad"
+        redirect_to :action => "lost_password"

       end
       end

+    else
+      head :bad_request

     end
   end
 
   def new
     end
   end
 
   def new

-    @title = t 'user.new.title'
+    @title = t "user.new.title"

     @referer = params[:referer] || session[:referer]
 
     @referer = params[:referer] || session[:referer]
 

-    if session[:user]
+    append_content_security_policy_directives(
+      :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
+    )
+
+    if current_user

       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page
       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page

-      redirect_to :controller => 'site', :action => 'index'
-    elsif not params['openid'].nil?
-      flash.now[:notice] = t 'user.new.openid association'
+      if @referer
+        redirect_to @referer
+      else
+        redirect_to :controller => "site", :action => "index"
+      end
+    elsif params.key?(:auth_provider) && params.key?(:auth_uid)
+      self.current_user = User.new(:email => params[:email],
+                                   :email_confirmation => params[:email],
+                                   :display_name => params[:nickname],
+                                   :auth_provider => params[:auth_provider],
+                                   :auth_uid => params[:auth_uid])
+
+      flash.now[:notice] = render_to_string :partial => "auth_association"
+    else
+      check_signup_allowed
+
+      self.current_user = User.new

     end
   end
 
     end
   end
 

-  def login
-    if request.post?
-      session[:remember_me] ||= params[:remember_me]
-      session[:referer] ||= params[:referer]
+  def create
+    self.current_user = User.new(user_params)
+
+    if check_signup_allowed(current_user.email)
+      session[:referer] = params[:referer]
+
+      current_user.status = "pending"
+
+      if current_user.auth_provider.present? && current_user.pass_crypt.empty?
+        # We are creating an account with external authentication and
+        # no password was specified so create a random one
+        current_user.pass_crypt = SecureRandom.base64(16)
+        current_user.pass_crypt_confirmation = current_user.pass_crypt
+      end

 
 

-      if using_open_id?(params[:openid_url])
-        openid_authentication(params[:openid_url])
+      if current_user.invalid?
+        # Something is wrong with a new user, so rerender the form
+        render :action => "new"
+      elsif current_user.auth_provider.present?
+        # Verify external authenticator before moving on
+        session[:new_user] = current_user
+        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid)

       else
       else

-        password_authentication(params[:username], params[:password])
+        # Save the user record
+        session[:new_user] = current_user
+        redirect_to :action => :terms

       end
       end

-    else
-      @title = t 'user.login.title'
+    end
+  end
+
+  def login
+    session[:referer] = params[:referer] if params[:referer]
+
+    if params[:username].present? && params[:password].present?
+      session[:remember_me] ||= params[:remember_me]
+      password_authentication(params[:username], params[:password])
+    elsif params[:openid_url].present?
+      session[:remember_me] ||= params[:remember_me_openid]
+      redirect_to auth_url("openid", params[:openid_url], params[:referer])

     end
   end
 
   def logout
     end
   end
 
   def logout

-    @title = t 'user.logout.title'
+    @title = t "user.logout.title"

 
 

-    if params[:session] == request.session_options[:id]
+    if params[:session] == session.id

       if session[:token]
       if session[:token]

-        token = UserToken.find_by_token(session[:token])
-        if token
-          token.destroy
-        end
-        session[:token] = nil
+        token = UserToken.find_by(:token => session[:token])
+        token.destroy if token
+        session.delete(:token)

       end
       end

-      session[:user] = nil
+      session.delete(:user)

       session_expires_automatically
       if params[:referer]
         redirect_to params[:referer]
       else
       session_expires_automatically
       if params[:referer]
         redirect_to params[:referer]
       else

-        redirect_to :controller => 'site', :action => 'index'
+        redirect_to :controller => "site", :action => "index"

       end
     end
   end
 
   def confirm
       end
     end
   end
 
   def confirm

-    if params[:confirm_action]
-      token = UserToken.find_by_token(params[:confirm_string])
-      if token and !token.user.active?
-        @user = token.user
-        @user.status = "active"
-        @user.email_valid = true
-        @user.save!
+    if request.post?
+      token = UserToken.find_by(:token => params[:confirm_string])
+      if token && token.user.active?
+        flash[:error] = t("user.confirm.already active")
+        redirect_to :action => "login"
+      elsif !token || token.expired?
+        flash[:error] = t("user.confirm.unknown token")
+        redirect_to :action => "confirm"
+      else
+        user = token.user
+        user.status = "active"
+        user.email_valid = true
+        flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
+        user.save!

         referer = token.referer
         token.destroy
         referer = token.referer
         token.destroy

-        flash[:notice] = t 'user.confirm.success'
-        session[:user] = @user.id
-        unless referer.nil?
-          redirect_to referer
+
+        if session[:token]
+          token = UserToken.find_by(:token => session[:token])
+          session.delete(:token)

         else
         else

-          redirect_to :action => 'account', :display_name => @user.display_name
+          token = nil
+        end
+
+        if token.nil? || token.user != user
+          flash[:notice] = t("user.confirm.success")
+          redirect_to :action => :login, :referer => referer
+        else
+          token.destroy
+
+          session[:user] = user.id
+
+          redirect_to referer || welcome_path

         end
         end

-      else
-        flash.now[:error] = t 'user.confirm.failure'

       end
       end

+    else
+      user = User.find_by(:display_name => params[:display_name])
+
+      redirect_to root_path if user.nil? || user.active?
+    end
+  end
+
+  def confirm_resend
+    user = User.find_by(:display_name => params[:display_name])
+    token = UserToken.find_by(:token => session[:token])
+
+    if user.nil? || token.nil? || token.user != user
+      flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
+    else
+      Notifier.signup_confirm(user, user.tokens.create).deliver_now
+      flash[:notice] = t("user.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe

     end
     end

+
+    redirect_to :action => "login"

   end
 
   def confirm_email
   end
 
   def confirm_email

-    if params[:confirm_action]
-      token = UserToken.find_by_token(params[:confirm_string])
-      if token and token.user.new_email?
-        @user = token.user
-        @user.email = @user.new_email
-        @user.new_email = nil
-        @user.email_valid = true
-        if @user.save
-          flash[:notice] = t 'user.confirm_email.success'
+    if request.post?
+      token = UserToken.find_by(:token => params[:confirm_string])
+      if token && token.user.new_email?
+        self.current_user = token.user
+        current_user.email = current_user.new_email
+        current_user.new_email = nil
+        current_user.email_valid = true
+        gravatar_enabled = gravatar_enable(current_user)
+        if current_user.save
+          flash[:notice] = if gravatar_enabled
+                             t("user.confirm_email.success") + " " + gravatar_status_message(current_user)
+                           else
+                             t("user.confirm_email.success")
+                           end

         else
         else

-          flash[:errors] = @user.errors
+          flash[:errors] = current_user.errors

         end
         token.destroy
         end
         token.destroy

-        session[:user] = @user.id
-        redirect_to :action => 'account', :display_name => @user.display_name
+        session[:user] = current_user.id
+        redirect_to :action => "account", :display_name => current_user.display_name
+      elsif token
+        flash[:error] = t "user.confirm_email.failure"
+        redirect_to :action => "account", :display_name => token.user.display_name

       else
       else

-        flash.now[:error] = t 'user.confirm_email.failure'
+        flash[:error] = t "user.confirm_email.unknown_token"

       end
     end
   end
 
       end
     end
   end
 

+  def api_read
+    if @user.visible?
+      render :action => :api_read, :content_type => "text/xml"
+    else
+      head :gone
+    end
+  end
+
+  def api_details
+    @user = current_user
+    render :action => :api_read, :content_type => "text/xml"
+  end
+

   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc

-    @user.traces.each do |trace|
-      doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
+    current_user.traces.reload.each do |trace|
+      doc.root << trace.to_xml_node

     end
     end

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   def view
   end
 
   def view

-    @this_user = User.find_by_display_name(params[:display_name])
+    @user = User.find_by(:display_name => params[:display_name])

 
 

-    if @this_user and
-       (@this_user.visible? or (@user and @user.administrator?))
-      @title = @this_user.display_name
+    if @user &&
+       (@user.visible? || (current_user && current_user.administrator?))
+      @title = @user.display_name

     else
     else

-      @title = t 'user.no_such_user.title'
-      @not_found_user = params[:display_name]
-      render :action => 'no_such_user', :status => :not_found
+      render_unknown_user params[:display_name]

     end
   end
 
   def make_friend
     end
   end
 
   def make_friend

-    if params[:display_name]
-      name = params[:display_name]
-      new_friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
-      friend = Friend.new
-      friend.user_id = @user.id
-      friend.friend_user_id = new_friend.id
-      unless @user.is_friends_with?(new_friend)
-        if friend.save
-          flash[:notice] = t 'user.make_friend.success', :name => name
-          Notifier.deliver_friend_notification(friend)
+    @new_friend = User.find_by(:display_name => params[:display_name])
+
+    if @new_friend
+      if request.post?
+        friend = Friend.new
+        friend.befriender = current_user
+        friend.befriendee = @new_friend
+        if current_user.is_friends_with?(@new_friend)
+          flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
+        elsif friend.save
+          flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
+          Notifier.friend_notification(friend).deliver_now

         else
         else

-          friend.add_error(t('user.make_friend.failed', :name => name))
+          friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))

         end
         end

-      else
-        flash[:warning] = t 'user.make_friend.already_a_friend', :name => name
-      end

 
 

-      if params[:referer]
-        redirect_to params[:referer]
-      else
-        redirect_to :controller => 'user', :action => 'view'
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => "view"
+        end

       end
       end

+    else
+      render_unknown_user params[:display_name]

     end
   end
 
   def remove_friend
     end
   end
 
   def remove_friend

-    if params[:display_name]
-      name = params[:display_name]
-      friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
-      if @user.is_friends_with?(friend)
-        Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
-        flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
-      else
-        flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
-      end
+    @friend = User.find_by(:display_name => params[:display_name])

 
 

-      if params[:referer]
-        redirect_to params[:referer]
-      else
-        redirect_to :controller => 'user', :action => 'view'
+    if @friend
+      if request.post?
+        if current_user.is_friends_with?(@friend)
+          Friend.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all
+          flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name
+        else
+          flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name
+        end
+
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => "view"
+        end

       end
       end

+    else
+      render_unknown_user params[:display_name]

     end
   end
 
   ##
   # sets a user's status
   def set_status
     end
   end
 
   ##
   # sets a user's status
   def set_status

-    @this_user.update_attributes(:status => params[:status])
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+    @user.status = params[:status]
+    @user.save
+    redirect_to :action => "view", :display_name => params[:display_name]

   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete

-    @this_user.delete
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+    @user.delete
+    redirect_to :action => "view", :display_name => params[:display_name]

   end
 
   ##
   # display a list of users matching specified criteria
   def list
     if request.post?
   end
 
   ##
   # display a list of users matching specified criteria
   def list
     if request.post?

-      ids = params[:user].keys.collect { |id| id.to_i }
+      ids = params[:user].keys.collect(&:to_i)

 
 

-      User.update_all("status = 'confirmed'", :id => ids) if params[:confirm]
-      User.update_all("status = 'deleted'", :id => ids) if params[:hide]
+      User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm]
+      User.where(:id => ids).update_all(:status => "deleted") if params[:hide]

 
       redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
     else
 
       redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
     else

-      conditions = Hash.new
-      conditions[:status] = params[:status] if params[:status]
-      conditions[:creation_ip] = params[:ip] if params[:ip]
+      @params = params.permit(:status, :ip)
+
+      conditions = {}
+      conditions[:status] = @params[:status] if @params[:status]
+      conditions[:creation_ip] = @params[:ip] if @params[:ip]

 
       @user_pages, @users = paginate(:users,
                                      :conditions => conditions,
 
       @user_pages, @users = paginate(:users,
                                      :conditions => conditions,


@@ -366,129 +500,146 @@ class UserController < ApplicationController
     end
   end
 
     end
   end
 

-private
+  ##
+  # omniauth success callback
+  def auth_success
+    auth_info = request.env["omniauth.auth"]
+
+    provider = auth_info[:provider]
+    uid = auth_info[:uid]
+    name = auth_info[:info][:name]
+    email = auth_info[:info][:email]
+
+    case provider
+    when "openid"
+      email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
+                       uid.match(%r{https://me.yahoo.com/(.*)})
+    when "google", "facebook"
+      email_verified = true
+    else
+      email_verified = false
+    end
+
+    if settings = session.delete(:new_user_settings)
+      current_user.auth_provider = provider
+      current_user.auth_uid = uid
+
+      update_user(current_user, settings)
+
+      session[:user_errors] = current_user.errors.as_json
+
+      redirect_to :action => "account", :display_name => current_user.display_name
+    elsif session[:new_user]
+      session[:new_user].auth_provider = provider
+      session[:new_user].auth_uid = uid
+
+      session[:new_user].status = "active" if email_verified && email == session[:new_user].email
+
+      redirect_to :action => "terms"
+    else
+      user = User.find_by(:auth_provider => provider, :auth_uid => uid)
+
+      if user.nil? && provider == "google"
+        openid_url = auth_info[:extra][:id_info]["openid_id"]
+        user = User.find_by(:auth_provider => "openid", :auth_uid => openid_url) if openid_url
+        user.update(:auth_provider => provider, :auth_uid => uid) if user
+      end
+
+      if user
+        case user.status
+        when "pending" then
+          unconfirmed_login(user)
+        when "active", "confirmed" then
+          successful_login(user, request.env["omniauth.params"]["referer"])
+        when "suspended" then
+          failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe
+        else
+          failed_login t("user.login.auth failure")
+        end
+      else
+        redirect_to :action => "new", :nickname => name, :email => email,
+                    :auth_provider => provider, :auth_uid => uid
+      end
+    end
+  end
+
+  ##
+  # omniauth failure callback
+  def auth_failure
+    flash[:error] = t("user.auth_failure." + params[:message])
+    redirect_to params[:origin] || login_url
+  end
+
+  private

 
   ##
   # handle password authentication
   def password_authentication(username, password)
     if user = User.authenticate(:username => username, :password => password)
       successful_login(user)
 
   ##
   # handle password authentication
   def password_authentication(username, password)
     if user = User.authenticate(:username => username, :password => password)
       successful_login(user)

-    elsif User.authenticate(:username => username, :password => password, :pending => true)
-      failed_login t('user.login.account not active')
+    elsif user = User.authenticate(:username => username, :password => password, :pending => true)
+      unconfirmed_login(user)

     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)

-      failed_login t('user.login.account suspended')
+      failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username

     else
     else

-      failed_login t('user.login.auth failure')
+      failed_login t("user.login.auth failure"), username

     end
   end
 
   ##
     end
   end
 
   ##

-  # handle OpenID authentication
-  def openid_authentication(openid_url)
-    # If we don't appear to have a user for this URL then ask the
-    # provider for some extra information to help with signup
-    if openid_url and User.find_by_openid_url(openid_url)
-      optional = nil
+  # return the URL to use for authentication
+  def auth_url(provider, uid, referer = nil)
+    params = { :provider => provider }
+
+    params[:openid_url] = openid_expand_url(uid) if provider == "openid"
+
+    if referer.nil?
+      params[:origin] = request.path

     else
     else

-      optional = [:nickname, :email]
-    end
-
-    # Start the authentication
-    authenticate_with_open_id(openid_url, :optional => optional) do |result, identity_url, registration|
-      if result.successful?
-        # We need to use the openid url passed back from the OpenID provider
-        # rather than the one supplied by the user, as these can be different.
-        #
-        # For example, you can simply enter yahoo.com in the login box rather
-        # than a user specific url. Only once it comes back from the provider
-        # provider do we know the unique address for the user.
-        if user = User.find_by_openid_url(identity_url)
-          case user.status
-            when "pending" then failed_login t('user.login.account not active')
-            when "active", "confirmed" then successful_login(user)
-            when "suspended" then failed_login t('user.login.account suspended')
-            else failed_login t('user.login.auth failure')
-          end
-        else
-          # We don't have a user registered to this OpenID, so redirect
-          # to the create account page with username and email filled
-          # in if they have been given by the OpenID provider through
-          # the simple registration protocol.
-          redirect_to :controller => 'user', :action => 'new', :nickname => registration['nickname'], :email => registration['email'], :openid => identity_url
-        end
-      elsif result.missing?
-        # Try and apply some heuristics to make common cases more user friendly
-        if openid_url = openid_alternate_url(openid_url)
-          openid_authentication(openid_url)
-        else
-          failed_login t('user.login.openid missing provider')
-        end
-      elsif result.invalid?
-        failed_login t('user.login.openid invalid')
-      else
-        failed_login t('user.login.auth failure')
-      end
+      params[:origin] = request.path + "?referer=" + CGI.escape(referer)
+      params[:referer] = referer

     end
     end

-  end

 
 

-  ##
-  # verify an OpenID URL
-  def openid_verify(openid_url, user)
-    user.openid_url = openid_url
-
-    authenticate_with_open_id(openid_url) do |result, identity_url|
-      if result.successful?
-        # We need to use the openid url passed back from the OpenID provider
-        # rather than the one supplied by the user, as these can be different.
-        #
-        # For example, you can simply enter yahoo.com in the login box rather
-        # than a user specific url. Only once it comes back from the provider
-        # provider do we know the unique address for the user.
-        user.openid_url = identity_url
-        yield user
-      elsif result.missing?
-        # Try and apply some heuristics to make common cases more user friendly
-        if openid_url = openid_alternate_url(openid_url)
-          openid_verify(openid_url, user)
-        else
-          flash.now[:error] = t 'user.login.openid missing provider'
-        end
-      elsif result.invalid?
-        flash.now[:error] = t 'user.login.openid invalid'
-      else
-        flash.now[:error] = t 'user.login.auth failure'
-      end
-    end
+    auth_path(params)

   end
 
   ##
   end
 
   ##

-  # special case some common OpenID providers by applying heuristics
-  # to try and come up with an alternate URL if the supplied one fails
-  def openid_alternate_url(openid_url)
-    # Special case gmail.com as it is potentially a popular OpenID
-    # provider and, unlike yahoo.com, where it works automatically, Google
-    # have hidden their OpenID endpoint somewhere obscure this making it
-    # somewhat less user friendly.
-    if openid_url.match(/(.*)gmail.com(\/?)$/) or openid_url.match(/(.*)googlemail.com(\/?)$/)
-      return 'https://www.google.com/accounts/o8/id'
+  # special case some common OpenID providers by applying heuristics to
+  # try and come up with the correct URL based on what the user entered
+  def openid_expand_url(openid_url)
+    if openid_url.nil?
+      nil
+    elsif openid_url.match(%r{(.*)gmail.com(/?)$}) || openid_url.match(%r{(.*)googlemail.com(/?)$})
+      # Special case gmail.com as it is potentially a popular OpenID
+      # provider and, unlike yahoo.com, where it works automatically, Google
+      # have hidden their OpenID endpoint somewhere obscure this making it
+      # somewhat less user friendly.
+      "https://www.google.com/accounts/o8/id"

     else
     else

-      return nil
+      openid_url

     end
     end

-  end  
+  end

 
   ##
   # process a successful login
 
   ##
   # process a successful login

-  def successful_login(user)
+  def successful_login(user, referer = nil)

     session[:user] = user.id
     session[:user] = user.id

-
-    session_expires_after 1.month if session[:remember_me]
-
-    if user.blocked_on_view
-      redirect_to user.blocked_on_view, :referer => params[:referer]
-    elsif session[:referer]
-      redirect_to session[:referer]
+    session_expires_after 28.days if session[:remember_me]
+
+    target = referer || session[:referer] || url_for(:controller => :site, :action => :index)
+
+    # The user is logged in, so decide where to send them:
+    #
+    # - If they haven't seen the contributor terms, send them there.
+    # - If they have a block on them, show them that.
+    # - If they were referred to the login, send them back there.
+    # - Otherwise, send them to the home page.
+    if REQUIRE_TERMS_SEEN && !user.terms_seen
+      redirect_to :action => :terms, :referer => target
+    elsif user.blocked_on_view
+      redirect_to user.blocked_on_view, :referer => target

     else
     else

-      redirect_to :controller => 'site', :action => 'index'
+      redirect_to target

     end
 
     session.delete(:remember_me)
     end
 
     session.delete(:remember_me)


@@ -497,43 +648,93 @@ private
 
   ##
   # process a failed login
 
   ##
   # process a failed login

-  def failed_login(message)
+  def failed_login(message, username = nil)

     flash[:error] = message
 
     flash[:error] = message
 

-    redirect_to :action => 'login', :referer =>  session[:referer]
+    redirect_to :action => "login", :referer => session[:referer],
+                :username => username, :remember_me => session[:remember_me]

 
     session.delete(:remember_me)
     session.delete(:referer)
   end
 
   ##
 
     session.delete(:remember_me)
     session.delete(:referer)
   end
 
   ##

-  # save a new user
-  def create_user(user)
-    if user.save
-      flash[:notice] = t 'user.new.flash create success message'
+  #
+  def unconfirmed_login(user)
+    session[:token] = user.tokens.create.token

 
 

-      Notifier.deliver_signup_confirm(user, user.tokens.create(:referer => session.delete(:referer)))
+    redirect_to :action => "confirm", :display_name => user.display_name

 
 

-      redirect_to :action => 'login'
-    end
+    session.delete(:remember_me)
+    session.delete(:referer)

   end
 
   ##
   # update a user's details
   end
 
   ##
   # update a user's details

-  def update_user(user)
+  def update_user(user, params)
+    user.display_name = params[:user][:display_name]
+    user.new_email = params[:user][:new_email]
+
+    unless params[:user][:pass_crypt].empty? && params[:user][:pass_crypt_confirmation].empty?
+      user.pass_crypt = params[:user][:pass_crypt]
+      user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+    end
+
+    if params[:user][:description] != user.description
+      user.description = params[:user][:description]
+      user.description_format = "markdown"
+    end
+
+    user.languages = params[:user][:languages].split(",")
+
+    case params[:image_action]
+    when "new" then
+      user.image = params[:user][:image]
+      user.image_use_gravatar = false
+    when "delete" then
+      user.image = nil
+      user.image_use_gravatar = false
+    when "gravatar" then
+      user.image = nil
+      user.image_use_gravatar = true
+    end
+
+    user.home_lat = params[:user][:home_lat]
+    user.home_lon = params[:user][:home_lon]
+
+    user.preferred_editor = if params[:user][:preferred_editor] == "default"
+                              nil
+                            else
+                              params[:user][:preferred_editor]
+                            end
+
+    if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
+      user.auth_provider = nil
+      user.auth_uid = nil
+    end
+

     if user.save
     if user.save

-      set_locale
+      set_locale(true)

 
 

-      if user.new_email.nil? or user.new_email.empty?
-        flash.now[:notice] = t 'user.account.flash update success'
+      if user.new_email.blank? || user.new_email == user.email
+        flash.now[:notice] = t "user.account.flash update success"

       else
       else

-        flash.now[:notice] = t 'user.account.flash update success confirm needed'
+        user.email = user.new_email

 
 

-        begin
-          Notifier.deliver_email_confirm(user, user.tokens.create)
-        rescue
-          # Ignore errors sending email
+        if user.valid?
+          flash.now[:notice] = t "user.account.flash update success confirm needed"
+
+          begin
+            Notifier.email_confirm(user, user.tokens.create).deliver_now
+          rescue StandardError
+            # Ignore errors sending email
+          end
+        else
+          current_user.errors.add(:new_email, current_user.errors[:email])
+          current_user.errors.add(:email, [])

         end
         end

+
+        user.restore_email!

       end
     end
   end
       end
     end
   end


@@ -542,24 +743,94 @@ private
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator

-    if @user and not @user.administrator?
-      flash[:error] = t('user.filter.not_an_administrator')
+    if current_user && !current_user.administrator?
+      flash[:error] = t("user.filter.not_an_administrator")

 
       if params[:display_name]
 
       if params[:display_name]

-        redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+        redirect_to :action => "view", :display_name => params[:display_name]

       else
       else

-        redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
+        redirect_to :action => "login", :referer => request.fullpath

       end
       end

-    elsif not @user
-      redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
+    elsif !current_user
+      redirect_to :action => "login", :referer => request.fullpath

     end
   end
 
   ##
     end
   end
 
   ##

-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    @this_user = User.find_by_display_name(params[:display_name])
+  # require that the user in the URL is the logged in user
+  def require_self
+    head :forbidden if params[:display_name] != current_user.display_name
+  end
+
+  ##
+  # ensure that there is a "user" instance variable
+  def lookup_user_by_id
+    @user = User.find(params[:id])
+  end
+
+  ##
+  # ensure that there is a "user" instance variable
+  def lookup_user_by_name
+    @user = User.find_by(:display_name => params[:display_name])

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
+    redirect_to :action => "view", :display_name => params[:display_name] unless @user
+  end
+
+  ##
+  #
+  def disable_terms_redirect
+    # this is necessary otherwise going to the user terms page, when
+    # having not agreed already would cause an infinite redirect loop.
+    # it's .now so that this doesn't propagate to other pages.
+    flash.now[:skip_terms] = true
+  end
+
+  ##
+  # return permitted user parameters
+  def user_params
+    params.require(:user).permit(:email, :email_confirmation, :display_name,
+                                 :auth_provider, :auth_uid,
+                                 :pass_crypt, :pass_crypt_confirmation)
+  end
+
+  ##
+  # check signup acls
+  def check_signup_allowed(email = nil)
+    domain = if email.nil?
+               nil
+             else
+               email.split("@").last
+             end
+
+    if blocked = Acl.no_account_creation(request.remote_ip, domain)
+      logger.info "Blocked signup from #{request.remote_ip} for #{email}"
+
+      render :action => "blocked"
+    end
+
+    !blocked
+  end
+
+  ##
+  # check if this user has a gravatar and set the user pref is true
+  def gravatar_enable(user)
+    # code from example https://en.gravatar.com/site/implement/images/ruby/
+    return false if user.image.present?
+    hash = Digest::MD5.hexdigest(user.email.downcase)
+    url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back
+    response = OSM.http_client.get(URI.parse(url))
+    oldsetting = user.image_use_gravatar
+    user.image_use_gravatar = response.success?
+    oldsetting != user.image_use_gravatar
+  end
+
+  ##
+  # display a message about th current status of the gravatar setting
+  def gravatar_status_message(user)
+    if user.image_use_gravatar
+      t "user.account.gravatar.enabled"
+    else
+      t "user.account.gravatar.disabled"
+    end

   end
 end
   end
 end