X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9b8e28f24b467a174a9699f3f4c95fc832184497..dc4cc8d21967d74b1fb229e37afb9ea4dcaf3e99:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index d503415cf..9c5ac0d09 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,6 +1,7 @@
 class UserController < ApplicationController
-  layout 'site', :except => :api_details
+  layout :choose_layout
 
+  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_details, :api_gpx_files]
   before_filter :set_locale, :except => [:api_details, :api_gpx_files]
@@ -18,84 +19,122 @@ class UserController < ApplicationController
 
   cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
 
+  def terms
+    @legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || DEFAULT_LEGALE
+    @text = OSM.legal_text_for_country(@legale)
+
+    if request.xhr?
+      render :update do |page|
+        page.replace_html "contributorTerms", :partial => "terms"
+      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
+      @user = session.delete(:new_user)
+
+      openid_verify(nil, @user) do |user|
+      end
+
+      if @user.openid_url.nil? or @user.invalid?
+        render :action => 'new'
+      else
+        render :action => 'terms'
+      end
+    else
+      session[:referer] = params[:referer]
+
+      @title = t 'user.terms.title'
+      @user = User.new(params[:user]) if params[:user]
+
+      if params[:user] and 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 
+      end
+
+      if @user
+        if @user.invalid?
+          if @user.new_record?
+            # Something is wrong with a new user, so rerender the form
+            render :action => :new
+          else
+            # Error in existing user, so go to account settings
+            flash[:errors] = @user.errors
+            redirect_to :action => :account, :display_name => @user.display_name
+          end
+        elsif @user.terms_agreed?
+          # Already agreed to terms, so just show settings
+          redirect_to :action => :account, :display_name => @user.display_name
+        elsif params[:user] and params[:user][:openid_url] and not params[:user][:openid_url].empty?
+          # Verify OpenID before moving on
+          session[:new_user] = @user
+          openid_verify(params[:user][:openid_url], @user)
+        end
+      else
+        # Not logged in, so redirect to the login page
+        redirect_to :action => :login, :referer => request.request_uri
+      end
+    end
+  end
+
   def save
     @title = t 'user.new.title'
 
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
-    else
-      #The redirect from the OpenID provider reenters here again 
-      #and we need to pass the parameters through to the  
-      #open_id_authentication function a second time 
-      if params[:open_id_complete] 
-        openid_verify('', true) 
-        #We have set the user.openid_url to nil beforehand. If it hasn't 
-        #been set to a new valid openid_url, it means the openid couldn't be validated 
-        if @user.nil? or @user.openid_url.nil? 
-          render :action => 'new' 
-          return 
-        end   
+    elsif 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')
+        end
+
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => :account, :display_name => @user.display_name
+        end
       else
-        @user = User.new(params[:user])
-
-        @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
-        #Set the openid_url to nil as for one it is used 
-        #to check if the openid could be validated and secondly 
-        #to not get dupplicate conflicts for an empty openid  
-        @user.openid_url = nil
-
-        if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
-          if (@user.pass_crypt.nil? or @user.pass_crypt.length == 0)
-            #if the password is empty, but we have a openid 
-            #then generate a random passowrd to disable 
-            #loging in via password 
-            @user.pass_crypt = ActiveSupport::SecureRandom.base64(16) 
-            @user.pass_crypt_confirmation = @user.pass_crypt 
-          end
-          #Validate all of the other fields before
-          #redirecting to the openid provider
-          if !@user.valid?
-            render :action => 'new'
-          else        
-            #TODO: Is it a problem to store the user variable with respect to password safty in the session variables?
-            #Store the user variable in the session for it to be accessible when redirecting back from the openid provider
-            session[:new_usr] = @user
-            begin
-              @norm_openid_url = OpenIdAuthentication.normalize_identifier(params[:user][:openid_url])
-            rescue
-              flash.now[:error] = t 'user.login.openid invalid'
-              render :action => 'new'
-              return
-            end
-            #Verify that the openid provided is valid and that the user is the owner of the id
-            openid_verify(@norm_openid_url, true)
-            #openid_verify can return in two ways:
-            #Either it returns with a redirect to the openid provider who then freshly
-            #redirects back to this url if the openid is valid, or if the openid is not plausible
-            #and no provider for it could be found it just returns
-            #we want to just let the redirect through
-            if response.headers["Location"].nil?
-              render :action => 'new'
-            end
-          end
-          #At this point there was either an error and the page has been rendered,
-          #or there is a redirect to the openid provider and the rest of the method
-          #gets executed whenn this method gets reentered after redirecting back
-          #from the openid provider
-          return
+        redirect_to t('user.terms.declined')
+      end
+    elsif @user
+      if !@user.terms_agreed?
+        @user.consider_pd = params[:user][:consider_pd]
+        @user.terms_agreed = Time.now.getutc
+        @user.terms_seen = true
+        if @user.save
+          flash[:notice] = t 'user.new.terms accepted'
         end
       end
 
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :action => :account, :display_name => @user.display_name
+      end
+    else
+      @user = User.new(params[:user])
+
+      @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
+      @user.terms_agreed = Time.now.getutc
+      @user.terms_seen = true
+      @user.openid_url = nil if @user.openid_url and @user.openid_url.empty?
+      
       if @user.save
-        flash[:notice] = t 'user.new.flash create success message'
-        Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
-        redirect_to :action => 'login'
+        flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
+        flash[:notice] = t 'user.new.flash create success message', :email => @user.email
+        Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer)))
+        session[:token] = @user.tokens.create.token
+        redirect_to :action => 'login', :referer => params[:referer]
       else
-        render :action => 'new'
+        render :action => 'new', :referer => params[:referer]
       end
     end
   end
@@ -104,15 +143,6 @@ class UserController < ApplicationController
     @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'
 
-    #The redirect from the OpenID provider reenters here again
-    #and we need to pass the parameters through to the 
-    #open_id_authentication function
-    if params[:open_id_complete]
-      openid_verify('', false)
-      @user.save
-      return
-    end
-
     if 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]
@@ -133,74 +163,42 @@ class UserController < ApplicationController
       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
-      @user.openid_url = nil if (params[:user][:openid_url].length == 0)
-
-      if @user.save
-        set_locale
-
-        if @user.new_email.nil? or @user.new_email.empty?
-          flash[:notice] = t 'user.account.flash update success'
-        else
-          flash[:notice] = t 'user.account.flash update success confirm needed'
+      if params[:user][:preferred_editor] == "default"
+        @user.preferred_editor = nil
+      else
+        @user.preferred_editor = params[:user][:preferred_editor]
+      end
 
-          begin
-            Notifier.deliver_email_confirm(@user, @user.tokens.create)
-          rescue
-            # Ignore errors sending email
-          end
-        end
+      @user.openid_url = nil if params[:user][:openid_url].empty?
 
-        redirect_to :action => "account", :display_name => @user.display_name
+      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)
+      else
+        update_user(@user)
       end
-
-      if (params[:user][:openid_url].length > 0)
-        begin
-          @norm_openid_url = OpenIdAuthentication.normalize_identifier(params[:user][:openid_url])
-          if (@norm_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 the openID as a password equivalent for
-            #the user.
-            openid_verify(@norm_openid_url, false)
-          end
-        rescue
-          flash.now[:error] = t 'user.login.openid invalid'
-        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
+      @user = session.delete(:new_user)
+      openid_verify(nil, @user) do |user|
+        update_user(user)
       end
-
     else
       if flash[:errors]
         flash[:errors].each do |attr,msg|
-          attr = "new_email" if attr == "email"
+          attr = "new_email" if attr == "email" and !@user.new_email.nil?
           @user.errors.add(attr,msg)
         end
       end
     end
   end
 
-  def openid_verify(openid_url, account_create)
-    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.
-        #e.g. one can simply enter yahoo.com in the login box, i.e. no user specific url
-        #only once it comes back from the OpenID provider do we know the unique address for
-        #the user.
-        @user = session[:new_usr] unless @user #this is used for account creation when the user is not yet in the database
-        @user.openid_url = identity_url
-      elsif result.missing?
-        if openid_url = openid_alternate_url(openid_url)
-          openid_verify(openid_url, account_create)
-        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
-  end
-
   def go_public
     @user.data_public = true
     @user.save
@@ -255,32 +253,29 @@ class UserController < ApplicationController
 
   def new
     @title = t 'user.new.title'
+    @referer = params[:referer] || session[:referer]
 
-    # 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' if session[:user]
-
-    @nickname = params['nickname']
-    @email = params['email']
-    @openID = params['openid']
-	
-    if !params['openid'].nil?
+    if session[:user]
+      # 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'
     end
   end
 
   def login
-    if request.post?
+    if params[:username] or using_open_id?
       session[:remember_me] ||= params[:remember_me]
       session[:referer] ||= params[:referer]
 
-      if using_open_id?(params[:openid_url])
+      if using_open_id?
         openid_authentication(params[:openid_url])
       else
         password_authentication(params[:username], params[:password])
       end
-    else
-      @title = t 'user.login.title'
+    elsif flash[:notice].nil?
+      flash.now[:notice] =  t 'user.login.notice'
     end
   end
 
@@ -293,9 +288,9 @@ class UserController < ApplicationController
         if token
           token.destroy
         end
-        session[:token] = nil
+        session.delete(:token)
       end
-      session[:user] = nil
+      session.delete(:user)
       session_expires_automatically
       if params[:referer]
         redirect_to params[:referer]
@@ -306,30 +301,72 @@ class UserController < ApplicationController
   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!
-        referer = token.referer
-        token.destroy
-        flash[:notice] = t 'user.confirm.success'
-        session[:user] = @user.id
-        unless referer.nil?
-          redirect_to referer
+    if request.post?
+      if token = UserToken.find_by_token(params[:confirm_string])
+        if token.user.active?
+          flash[:error] = t('user.confirm.already active')
+          redirect_to :action => 'login'
         else
-          redirect_to :action => 'account', :display_name => @user.display_name
+          user = token.user
+          user.status = "active"
+          user.email_valid = true
+          user.save!
+          referer = token.referer
+          token.destroy
+
+          if session[:token] 
+            token = UserToken.find_by_token(session[:token])
+            session.delete(:token)
+          else
+            token = nil
+          end
+
+          if token.nil? or token.user != user
+            flash[:notice] = t('user.confirm.success')
+            redirect_to :action => :login, :referer => referer
+          else
+            token.destroy
+
+            session[:user] = user.id
+
+            if referer.nil?
+              flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
+              redirect_to :action => :account, :display_name => user.display_name
+            else
+              flash[:notice] = t('user.confirm.success')
+              redirect_to referer
+            end
+          end
         end
       else
-        flash.now[:error] = t 'user.confirm.failure'
+        user = User.find_by_display_name(params[:display_name])
+
+        if user and user.active?
+          flash[:error] = t('user.confirm.already active')
+        elsif user
+          flash[:error] = t('user.confirm.unknown token') + t('user.confirm.reconfirm', :reconfirm => url_for(:action => 'confirm_resend', :display_name => params[:display_name]))
+        else
+          flash[:error] = t('user.confirm.unknown token')
+        end
+
+        redirect_to :action => 'login'
       end
     end
   end
 
+  def confirm_resend
+    if user = User.find_by_display_name(params[:display_name])
+      Notifier.deliver_signup_confirm(user, user.tokens.create)
+      flash[:notice] = t 'user.confirm_resend.success', :email => user.email
+    else
+      flash[:notice] = t 'user.confirm_resend.failure', :name => params[:display_name]
+    end
+
+    redirect_to :action => 'login'
+  end
+
   def confirm_email
-    if params[:confirm_action]
+    if request.post?
       token = UserToken.find_by_token(params[:confirm_string])
       if token and token.user.new_email?
         @user = token.user
@@ -345,7 +382,8 @@ class UserController < ApplicationController
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
-        flash.now[:error] = t 'user.confirm_email.failure'
+        flash[:error] = t 'user.confirm_email.failure'
+        redirect_to :action => 'account', :display_name => @user.display_name
       end
     end
   end
@@ -459,10 +497,11 @@ private
   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)
+      failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
-      failed_login t('user.login.account suspended')
+      webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
+      failed_login t('user.login.account suspended', :webmaster => webmaster)
     else
       failed_login t('user.login.auth failure')
     end
@@ -474,13 +513,13 @@ private
     # 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
+      required = nil
     else
-      optional = [:nickname, :email]
+      required = [:nickname, :email, "http://axschema.org/namePerson/friendly", "http://axschema.org/contact/email"]
     end
 
     # Start the authentication
-    authenticate_with_open_id(openid_url, :optional => optional) do |result, identity_url, registration|
+    authenticate_with_open_id(openid_expand_url(openid_url), :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.
@@ -490,25 +529,31 @@ private
         # 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')
+            when "pending" then
+              failed_login t('user.login.account not active')
+            when "active", "confirmed" then
+              successful_login(user)
+            when "suspended" then
+              webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
+              failed_login t('user.login.account suspended', :webmaster => webmaster)
+            else
+              failed_login t('user.login.auth failure')
           end
         else
+          # Guard against not getting any extension data
+          sreg = Hash.new if sreg.nil?
+          ax = Hash.new 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.
-          redirect_to :controller => 'user', :action => 'new', :nickname => registration['nickname'], :email => registration['email'], :openid => identity_url
+          nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"]
+          email = sreg["email"] || ax["http://axschema.org/contact/email"]
+          redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => 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
+        failed_login t('user.login.openid missing provider')
       elsif result.invalid?
         failed_login t('user.login.openid invalid')
       else
@@ -518,17 +563,44 @@ private
   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(\/?)$/)
+  # verify an OpenID URL
+  def openid_verify(openid_url, user)
+    user.openid_url = openid_url
+
+    authenticate_with_open_id(openid_expand_url(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?
+        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
+    end
+  end
+
+  ##
+  # 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?
+      return nil
+    elsif openid_url.match(/(.*)gmail.com(\/?)$/) or openid_url.match(/(.*)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.
       return 'https://www.google.com/accounts/o8/id'
     else
-      return nil
+      return openid_url
     end
   end  
 
@@ -536,15 +608,22 @@ private
   # process a successful login
   def successful_login(user)
     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]
+    target = 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 and not user.terms_seen
+      redirect_to :controller => :user, :action => :terms, :referer => target
+    elsif user.blocked_on_view
+      redirect_to user.blocked_on_view, :referer => target
     else
-      redirect_to :controller => 'site', :action => 'index'
+      redirect_to target
     end
 
     session.delete(:remember_me)
@@ -562,6 +641,26 @@ private
     session.delete(:referer)
   end
 
+  ##
+  # update a user's details
+  def update_user(user)
+    if user.save
+      set_locale
+
+      if user.new_email.nil? or user.new_email.empty?
+        flash.now[:notice] = t 'user.account.flash update success'
+      else
+        flash.now[:notice] = t 'user.account.flash update success confirm needed'
+
+        begin
+          Notifier.deliver_email_confirm(user, user.tokens.create)
+        rescue
+          # Ignore errors sending email
+        end
+      end
+    end
+  end
+
   ##
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
@@ -586,4 +685,28 @@ private
   rescue ActiveRecord::RecordNotFound
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end
+
+  ##
+  # Choose the layout to use. See
+  # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts
+  def choose_layout
+    oauth_url = url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
+
+    if [ 'api_details' ].include? action_name
+      nil
+    elsif params[:referer] and URI.parse(params[:referer]).path == oauth_url
+      'slim'
+    else
+      'site'
+    end
+  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
 end