X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..b0150caee632110eb5b305f9937b94473101645a:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 70fa4f7fc..b1d6c86f7 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,7 +1,7 @@
 class UserController < ApplicationController
-  layout 'site', :except => [:api_details]
+  layout "site", :except => [:api_details]
 
-  skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files]
+  skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files, :auth_success]
   before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_read, :api_details, :api_gpx_files]
@@ -26,7 +26,7 @@ class UserController < ApplicationController
     if request.xhr?
       render :partial => "terms"
     else
-      @title = t 'user.terms.title'
+      @title = t "user.terms.title"
 
       if @user && @user.terms_agreed?
         # Already agreed to terms, so just show settings
@@ -38,14 +38,14 @@ class UserController < ApplicationController
   end
 
   def save
-    @title = t 'user.new.title'
+    @title = t "user.new.title"
 
     if params[:decline]
       if @user
         @user.terms_seen = true
 
         if @user.save
-          flash[:notice] = t 'user.new.terms declined', :url => t('user.new.terms declined url')
+          flash[:notice] = t "user.new.terms declined", :url => t("user.new.terms declined url")
         end
 
         if params[:referer]
@@ -54,7 +54,7 @@ class UserController < ApplicationController
           redirect_to :action => :account, :display_name => @user.display_name
         end
       else
-        redirect_to t('user.terms.declined')
+        redirect_to t("user.terms.declined")
       end
     elsif @user
       unless @user.terms_agreed?
@@ -62,7 +62,7 @@ class UserController < ApplicationController
         @user.terms_agreed = Time.now.getutc
         @user.terms_seen = true
 
-        flash[:notice] = t 'user.new.terms accepted' if @user.save
+        flash[:notice] = t "user.new.terms accepted" if @user.save
       end
 
       if params[:referer]
@@ -89,11 +89,11 @@ class UserController < ApplicationController
 
           begin
             uri = URI(session[:referer])
-            /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))
+            %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
             # Use default
@@ -105,17 +105,17 @@ class UserController < ApplicationController
           else
             session[:token] = @user.tokens.create.token
             Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver_now
-            redirect_to :action => 'confirm', :display_name => @user.display_name
+            redirect_to :action => "confirm", :display_name => @user.display_name
           end
         else
-          render :action => 'new', :referer => params[:referer]
+          render :action => "new", :referer => params[:referer]
         end
       end
     end
   end
 
   def account
-    @title = t 'user.account.title'
+    @title = t "user.account.title"
     @tokens = @user.oauth_tokens.authorized
 
     if params[:user] && params[:user][:display_name] && params[:user][:description]
@@ -126,30 +126,23 @@ class UserController < ApplicationController
         # valid OpenID and one the user has control over before saving
         # it as a password equivalent for the user.
         session[:new_user_settings] = params
-        openid_verify(params[:user][:openid_url], @user)
+        openid_url = openid_expand_url(params[:user][:openid_url])
+        redirect_to auth_path(:provider => "openid", :openid_url => openid_url, :origin => request.path)
       else
         update_user(@user, params)
       end
-    elsif using_open_id?
-      # The redirect from the OpenID provider reenters here
-      # again and we need to pass the parameters through to
-      # the open_id_authentication function
-      settings = session.delete(:new_user_settings)
-      openid_verify(nil, @user) do |user|
-        update_user(user, settings)
-      end
     end
   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
+    flash[:notice] = t "user.go_public.flash success"
+    redirect_to :controller => "user", :action => "account", :display_name => @user.display_name
   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])
@@ -163,16 +156,16 @@ class UserController < ApplicationController
       if user
         token = user.tokens.create
         Notifier.lost_password(user, token).deliver_now
-        flash[:notice] = t 'user.lost_password.notice email on way'
-        redirect_to :action => 'login'
+        flash[:notice] = t "user.lost_password.notice email on way"
+        redirect_to :action => "login"
       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
-    @title = t 'user.reset_password.title'
+    @title = t "user.reset_password.title"
 
     if params[:token]
       token = UserToken.find_by_token(params[:token])
@@ -188,13 +181,13 @@ class UserController < ApplicationController
 
           if @user.save
             token.destroy
-            flash[:notice] = t 'user.reset_password.flash changed'
-            redirect_to :action => 'login'
+            flash[:notice] = t "user.reset_password.flash changed"
+            redirect_to :action => "login"
           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
     else
       render :text => "", :status => :bad_request
@@ -202,32 +195,16 @@ class UserController < ApplicationController
   end
 
   def new
-    @title = t 'user.new.title'
+    @title = t "user.new.title"
     @referer = params[:referer] || session[:referer]
 
-    if using_open_id?
-      # 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, verified_email|
-        user.status = "active" if user.email == verified_email
-      end
-
-      if @user.openid_url.nil? || @user.invalid?
-        render :action => 'new'
-      else
-        session[:new_user] = @user
-        redirect_to :action => 'terms'
-      end
-    elsif @user
+    if @user
       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page
       if @referer
         redirect_to @referer
       else
-        redirect_to :controller => 'site', :action => 'index'
+        redirect_to :controller => "site", :action => "index"
       end
     elsif params.key?(:openid)
       @user = User.new(:email => params[:email],
@@ -235,7 +212,7 @@ class UserController < ApplicationController
                        :display_name => params[:nickname],
                        :openid_url => params[:openid])
 
-      flash.now[:notice] = t 'user.new.openid association'
+      flash.now[:notice] = t "user.new.openid association"
     else
       check_signup_allowed
     end
@@ -262,7 +239,8 @@ class UserController < ApplicationController
       elsif @user.openid_url.present?
         # Verify OpenID before moving on
         session[:new_user] = @user
-        openid_verify(@user.openid_url, @user)
+        openid_url = openid_expand_url(@user.openid_url)
+        redirect_to auth_path(:provider => "openid", :openid_url => openid_url, :origin => request.path)
       else
         # Save the user record
         session[:new_user] = @user
@@ -272,12 +250,13 @@ class UserController < ApplicationController
   end
 
   def login
-    if params[:username] || using_open_id?
+    if params[:username] || params[:openid_url]
       session[:referer] ||= params[:referer]
 
-      if using_open_id?
+      if params[:openid_url].present?
         session[:remember_me] ||= params[:remember_me_openid]
-        openid_authentication(params[:openid_url])
+        openid_url = openid_expand_url(params[:openid_url])
+        redirect_to auth_path(:provider => "openid", :openid_url => openid_url, :origin => request.path)
       else
         session[:remember_me] ||= params[:remember_me]
         password_authentication(params[:username], params[:password])
@@ -286,7 +265,7 @@ class UserController < ApplicationController
   end
 
   def logout
-    @title = t 'user.logout.title'
+    @title = t "user.logout.title"
 
     if params[:session] == request.session_options[:id]
       if session[:token]
@@ -299,7 +278,7 @@ class UserController < ApplicationController
       if params[:referer]
         redirect_to params[:referer]
       else
-        redirect_to :controller => 'site', :action => 'index'
+        redirect_to :controller => "site", :action => "index"
       end
     end
   end
@@ -308,11 +287,11 @@ class UserController < ApplicationController
     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'
+        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'
+        flash[:error] = t("user.confirm.unknown token")
+        redirect_to :action => "confirm"
       else
         user = token.user
         user.status = "active"
@@ -329,7 +308,7 @@ class UserController < ApplicationController
         end
 
         if token.nil? || token.user != user
-          flash[:notice] = t('user.confirm.success')
+          flash[:notice] = t("user.confirm.success")
           redirect_to :action => :login, :referer => referer
         else
           token.destroy
@@ -349,12 +328,12 @@ class UserController < ApplicationController
   def confirm_resend
     if user = User.find_by_display_name(params[:display_name])
       Notifier.signup_confirm(user, user.tokens.create).deliver_now
-      flash[:notice] = t 'user.confirm_resend.success', :email => user.email
+      flash[:notice] = t "user.confirm_resend.success", :email => user.email
     else
-      flash[:notice] = t 'user.confirm_resend.failure', :name => params[:display_name]
+      flash[:notice] = t "user.confirm_resend.failure", :name => params[:display_name]
     end
 
-    redirect_to :action => 'login'
+    redirect_to :action => "login"
   end
 
   def confirm_email
@@ -366,16 +345,16 @@ class UserController < ApplicationController
         @user.new_email = nil
         @user.email_valid = true
         if @user.save
-          flash[:notice] = t 'user.confirm_email.success'
+          flash[:notice] = t "user.confirm_email.success"
         else
           flash[:errors] = @user.errors
         end
         token.destroy
         session[:user] = @user.id
-        redirect_to :action => 'account', :display_name => @user.display_name
+        redirect_to :action => "account", :display_name => @user.display_name
       else
-        flash[:error] = t 'user.confirm_email.failure'
-        redirect_to :action => 'account', :display_name => @user.display_name
+        flash[:error] = t "user.confirm_email.failure"
+        redirect_to :action => "account", :display_name => @user.display_name
       end
     end
   end
@@ -417,20 +396,20 @@ class UserController < ApplicationController
         friend.user_id = @user.id
         friend.friend_user_id = @new_friend.id
         if @user.is_friends_with?(@new_friend)
-          flash[:warning] = t 'user.make_friend.already_a_friend', :name => @new_friend.display_name
+          flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
         else
           if friend.save
-            flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name
+            flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
             Notifier.friend_notification(friend).deliver_now
           else
-            friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name))
+            friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))
           end
         end
 
         if params[:referer]
           redirect_to params[:referer]
         else
-          redirect_to :controller => 'user', :action => 'view'
+          redirect_to :controller => "user", :action => "view"
         end
       end
     else
@@ -445,15 +424,15 @@ class UserController < ApplicationController
       if request.post?
         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
+          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
+          flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name
         end
 
         if params[:referer]
           redirect_to params[:referer]
         else
-          redirect_to :controller => 'user', :action => 'view'
+          redirect_to :controller => "user", :action => "view"
         end
       end
     else
@@ -466,14 +445,14 @@ class UserController < ApplicationController
   def set_status
     @this_user.status = params[:status]
     @this_user.save
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
   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]
+    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
   end
 
   ##
@@ -498,6 +477,52 @@ class UserController < ApplicationController
     end
   end
 
+  ##
+  # omniauth success callback
+  def auth_success
+    auth_info = env["omniauth.auth"]
+
+    openid_url = auth_info[:uid]
+    name = auth_info[:info][:name]
+    email = auth_info[:info][:email]
+
+    if user = User.find_by_openid_url(openid_url)
+      case user.status
+      when "pending" then
+        unconfirmed_login(user)
+      when "active", "confirmed" then
+        successful_login(user)
+      when "suspended" then
+        failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
+      else
+        failed_login t("user.login.auth failure")
+      end
+    elsif settings = session.delete(:new_user_settings)
+      @user.openid_url = openid_url
+
+      update_user(@user, settings)
+
+      redirect_to :action => "account", :display_name => @user.display_name
+    elsif session[:new_user]
+      session[:new_user].openid_url = openid_url
+
+      if email == session[:new_user].email && openid_email_verified(email)
+        session[:new_user].status = "active"
+      end
+
+      redirect_to :action => "terms"
+    else
+      redirect_to :action => "new", :nickname => name, :email => email, :openid => openid_url
+    end
+  end
+
+  ##
+  # omniauth failure callback
+  def auth_failure
+    flash[:error] = t("user.auth_failure." + params[:message])
+    redirect_to params[:origin]
+  end
+
   private
 
   ##
@@ -508,99 +533,9 @@ class UserController < ApplicationController
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
-      failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
-    else
-      failed_login t('user.login.auth failure')
-    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 && User.find_by_openid_url(openid_url)
-      required = nil
+      failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
     else
-      required = [:nickname, :email, "http://axschema.org/namePerson/friendly", "http://axschema.org/contact/email"]
-    end
-
-    # Start the authentication
-    authenticate_with_open_id(openid_expand_url(openid_url), :method => :get, :required => required) do |result, identity_url, sreg, ax|
-      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
-            unconfirmed_login(user)
-          when "active", "confirmed" then
-            successful_login(user)
-          when "suspended" then
-            failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
-          else
-            failed_login t('user.login.auth failure')
-          end
-        else
-          # Guard against not getting any extension data
-          sreg = {} if sreg.nil?
-          ax = {} if ax.nil?
-
-          # 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.
-          nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first
-          email = sreg["email"] || ax["http://axschema.org/contact/email"].first
-
-          redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url
-        end
-      elsif result.missing?
-        failed_login t('user.login.openid missing provider')
-      elsif result.invalid?
-        failed_login t('user.login.openid invalid')
-      else
-        failed_login t('user.login.auth failure')
-      end
-    end
-  end
-
-  ##
-  # verify an OpenID URL
-  def openid_verify(openid_url, user)
-    user.openid_url = openid_url
-
-    authenticate_with_open_id(openid_expand_url(openid_url), :method => :get, :required => [:email, "http://axschema.org/contact/email"]) do |result, identity_url, sreg, ax|
-      if result.successful?
-        # Do we trust the emails this provider returns?
-        if openid_email_verified(identity_url)
-          # Guard against not getting any extension data
-          sreg = {} if sreg.nil?
-          ax = {} if ax.nil?
-
-          # Get the verified email
-          verified_email = sreg["email"] || ax["http://axschema.org/contact/email"].first
-        end
-
-        # 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, verified_email
-      elsif result.missing?
-        flash.now[:error] = t 'user.login.openid missing provider'
-      elsif result.invalid?
-        flash.now[:error] = t 'user.login.openid invalid'
-      else
-        flash.now[:error] = t 'user.login.auth failure'
-      end
+      failed_login t("user.login.auth failure")
     end
   end
 
@@ -615,7 +550,7 @@ class UserController < ApplicationController
       # provider and, unlike yahoo.com, where it works automatically, Google
       # have hidden their OpenID endpoint somewhere obscure this making it
       # somewhat less user friendly.
-      return 'https://www.google.com/accounts/o8/id'
+      return "https://www.google.com/accounts/o8/id"
     else
       return openid_url
     end
@@ -625,8 +560,8 @@ class UserController < ApplicationController
   # check if we trust an OpenID provider to return a verified
   # email, so that we can skpi verifying it ourselves
   def openid_email_verified(openid_url)
-    openid_url.match(/https:\/\/www.google.com\/accounts\/o8\/id?(.*)/) ||
-      openid_url.match(/https:\/\/me.yahoo.com\/(.*)/)
+    openid_url.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
+      openid_url.match(%r{https://me.yahoo.com/(.*)})
   end
 
   ##
@@ -660,7 +595,7 @@ class UserController < ApplicationController
   def failed_login(message)
     flash[:error] = message
 
-    redirect_to :action => 'login', :referer =>  session[:referer]
+    redirect_to :action => "login", :referer =>  session[:referer]
 
     session.delete(:remember_me)
     session.delete(:referer)
@@ -669,7 +604,7 @@ class UserController < ApplicationController
   ##
   #
   def unconfirmed_login(user)
-    redirect_to :action => 'confirm', :display_name => user.display_name
+    redirect_to :action => "confirm", :display_name => user.display_name
 
     session.delete(:remember_me)
     session.delete(:referer)
@@ -720,12 +655,12 @@ class UserController < ApplicationController
       set_locale
 
       if user.new_email.blank? || user.new_email == user.email
-        flash.now[:notice] = t 'user.account.flash update success'
+        flash.now[:notice] = t "user.account.flash update success"
       else
         user.email = user.new_email
 
         if user.valid?
-          flash.now[:notice] = t 'user.account.flash update success confirm needed'
+          flash.now[:notice] = t "user.account.flash update success confirm needed"
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now
@@ -747,15 +682,15 @@ class UserController < ApplicationController
   # and return them to the user page.
   def require_administrator
     if @user && !@user.administrator?
-      flash[:error] = t('user.filter.not_an_administrator')
+      flash[:error] = t("user.filter.not_an_administrator")
 
       if params[:display_name]
-        redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+        redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
       else
-        redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
+        redirect_to :controller => "user", :action => "login", :referer => request.fullpath
       end
     elsif !@user
-      redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
+      redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   end
 
@@ -778,7 +713,7 @@ class UserController < ApplicationController
   def lookup_user_by_name
     @this_user = User.find_by_display_name(params[:display_name])
   rescue ActiveRecord::RecordNotFound
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
+    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] unless @this_user
   end
 
   ##
@@ -808,7 +743,7 @@ class UserController < ApplicationController
     if blocked = Acl.no_account_creation(request.remote_ip, domain)
       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 
-      render :action => 'blocked'
+      render :action => "blocked"
     end
 
     !blocked