X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3ce4de1295ecec082313740a3cdf25c2831164f7..250a068b066c8968047ed90c2de64a47f9301c7d:/app/controllers/user_controller.rb
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9e1585243..fdef4ea04 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -12,70 +12,27 @@ class UserController < ApplicationController
before_filter :check_api_readable, :only => [:api_read, :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_cookies, :only => [:new, :login, :confirm]
before_filter :require_administrator, :only => [:set_status, :delete, :list]
around_filter :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files]
before_filter :lookup_user_by_id, :only => [:api_read]
before_filter :lookup_user_by_name, :only => [:set_status, :delete]
- 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 :partial => "terms"
- 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
- elsif params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last)
- render :action => 'blocked'
else
- session[:referer] = params[:referer]
-
@title = t 'user.terms.title'
- @user = User.new(params[:user]) if params[:user]
+ @user ||= session[:new_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 = 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
+ if !@user
redirect_to :action => :login, :referer => request.fullpath
+ elsif @user.terms_agreed?
+ # Already agreed to terms, so just show settings
+ redirect_to :action => :account, :display_name => @user.display_name
end
end
end
@@ -114,28 +71,41 @@ class UserController < ApplicationController
else
redirect_to :action => :account, :display_name => @user.display_name
end
- elsif Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last)
- render :action => 'blocked'
else
- @user = User.new(params[:user])
+ @user = session.delete(:new_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[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
- flash[:notice] = t 'user.new.flash create success message', :email => @user.email
- Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver
- session[:token] = @user.tokens.create.token
- redirect_to :action => 'login', :referer => params[:referer]
+ if Acl.no_account_creation(request.remote_ip, @user.email.split("@").last)
+ render :action => 'blocked'
else
- render :action => 'new', :referer => params[:referer]
+ @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[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
+
+ begin
+ referer_params = Rack::Utils.parse_query(URI(session[:referer]).query)
+ referer = welcome_path(referer_params.slice(:lat, :lon, :zoom, :editor))
+ rescue
+ referer = welcome_path
+ end
+
+ if @user.status == "active"
+ session[:referer] = referer
+ successful_login(@user)
+ else
+ session[:token] = @user.tokens.create.token
+ Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver
+ redirect_to :action => 'confirm', :display_name => @user.display_name
+ end
+ else
+ render :action => 'new', :referer => params[:referer]
+ end
end
end
end
@@ -231,7 +201,23 @@ class UserController < ApplicationController
@title = t 'user.new.title'
@referer = params[:referer] || session[:referer]
- if @user
+ 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? or @user.invalid?
+ render :action => 'new'
+ else
+ session[:new_user] = @user
+ redirect_to :action => 'terms'
+ end
+ elsif @user
# The user is logged in already, so don't show them the signup
# page, instead send them to the home page
if @referer
@@ -251,6 +237,38 @@ class UserController < ApplicationController
end
end
+ def create
+ if params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last)
+ render :action => 'blocked'
+
+ else
+ session[:referer] = params[:referer]
+
+ @user = User.new(params[:user])
+ @user.status = "pending"
+
+ if @user.openid_url.present? && @user.pass_crypt.empty?
+ # We are creating an account with OpenID and no password
+ # was specified so create a random one
+ @user.pass_crypt = SecureRandom.base64(16)
+ @user.pass_crypt_confirmation = @user.pass_crypt
+ end
+
+ if @user.invalid?
+ # Something is wrong with a new user, so rerender the form
+ render :action => "new"
+ elsif @user.openid_url.present?
+ # Verify OpenID before moving on
+ session[:new_user] = @user
+ openid_verify(@user.openid_url, @user)
+ else
+ # Save the user record
+ session[:new_user] = @user
+ redirect_to :action => :terms
+ end
+ end
+ end
+
def login
if params[:username] or using_open_id?
session[:remember_me] ||= params[:remember_me]
@@ -286,56 +304,41 @@ class UserController < ApplicationController
end
def confirm
- 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
- 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
- cookies.permanent["_osm_username"] = user.display_name
-
- if referer.nil?
- flash[:notice] = t('user.confirm.success') + "
" + 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
+ if request.post? && (token = UserToken.find_by_token(params[:confirm_string]))
+ if token.user.active?
+ flash[:error] = t('user.confirm.already active')
+ redirect_to :action => 'login'
else
- user = User.find_by_display_name(params[:display_name])
+ user = token.user
+ user.status = "active"
+ user.email_valid = true
+ user.save!
+ referer = token.referer
+ token.destroy
- 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]))
+ if session[:token]
+ token = UserToken.find_by_token(session[:token])
+ session.delete(:token)
else
- flash[:error] = t('user.confirm.unknown token')
+ token = nil
end
- redirect_to :action => 'login'
+ 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
+ cookies.permanent["_osm_username"] = user.display_name
+
+ redirect_to referer || welcome_path
+ end
+ end
+ else
+ user = User.find_by_display_name(params[:display_name])
+ if !user || user.active?
+ redirect_to root_path
end
end
end
@@ -376,7 +379,7 @@ class UserController < ApplicationController
end
def api_read
- render :nothing => true, :status => :gone unless @this_user.visible?
+ render :text => "", :status => :gone unless @this_user.visible?
end
def api_details
@@ -501,7 +504,7 @@ private
if user = User.authenticate(:username => username, :password => password)
successful_login(user)
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))
+ 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
@@ -532,7 +535,7 @@ private
if user = User.find_by_openid_url(identity_url)
case user.status
when "pending" then
- failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
+ unconfirmed_login(user)
when "active", "confirmed" then
successful_login(user)
when "suspended" then
@@ -551,6 +554,7 @@ private
# 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?
@@ -568,8 +572,18 @@ private
def openid_verify(openid_url, user)
user.openid_url = openid_url
- authenticate_with_open_id(openid_expand_url(openid_url), :method => :get) do |result, identity_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 = Hash.new if sreg.nil?
+ ax = Hash.new 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.
#
@@ -577,7 +591,7 @@ private
# 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
+ yield user, verified_email
elsif result.missing?
flash.now[:error] = t 'user.login.openid missing provider'
elsif result.invalid?
@@ -603,7 +617,15 @@ private
else
return openid_url
end
- end
+ end
+
+ ##
+ # 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?(.*)/) or
+ openid_url.match(/https:\/\/me.yahoo.com\/(.*)/)
+ end
##
# process a successful login
@@ -644,6 +666,15 @@ private
session.delete(:referer)
end
+ ##
+ #
+ def unconfirmed_login(user)
+ redirect_to :action => 'confirm', :display_name => user.display_name
+
+ session.delete(:remember_me)
+ session.delete(:referer)
+ end
+
##
# update a user's details
def update_user(user, params)
@@ -663,8 +694,15 @@ private
user.languages = params[:user][:languages].split(",")
case params[:image_action]
- when "new" then user.image = params[:user][:image]
- when "delete" then user.image = nil
+ 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]
@@ -755,7 +793,7 @@ private
##
#
def disable_terms_redirect
- # this is necessary otherwise going to the user terms page, when
+ # 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