X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4b4c5aac2f6e338fb043cd4d2a031c4bd6ee1b05..cbea796ef412840af9a3ec2fd26bf08657fc4cd3:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index edb2b1df5..17031848d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,18 +5,18 @@ class UsersController < ApplicationController before_action :disable_terms_redirect, :only => [:terms, :save, :logout] before_action :authorize_web before_action :set_locale + before_action :check_database_readable authorize_resource before_action :require_self, :only => [:account] - before_action :check_database_readable, :except => [:login] before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend] before_action :require_cookies, :only => [:new, :login, :confirm] before_action :lookup_user_by_name, :only => [:set_status, :delete] before_action :allow_thirdparty_images, :only => [:show, :account] def terms - @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE + @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || Settings.default_legale @text = OSM.legal_text_for_country(@legale) if request.xhr? @@ -36,7 +36,7 @@ class UsersController < ApplicationController def save @title = t "users.new.title" - if params[:decline] + if params[:decline] || !(params[:read_tou] && params[:read_ct]) if current_user current_user.terms_seen = true @@ -47,12 +47,15 @@ class UsersController < ApplicationController else redirect_to :action => :account, :display_name => current_user.display_name end - else + elsif params[:decline] redirect_to t("users.terms.declined") + else + redirect_to :action => :terms end elsif current_user unless current_user.terms_agreed? current_user.consider_pd = params[:user][:consider_pd] + current_user.tou_agreed = Time.now.getutc current_user.terms_agreed = Time.now.getutc current_user.terms_seen = true @@ -73,6 +76,7 @@ class UsersController < ApplicationController 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.tou_agreed = Time.now.getutc current_user.terms_seen = true if current_user.auth_uid.blank? @@ -259,9 +263,6 @@ class UsersController < ApplicationController 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 @@ -335,7 +336,7 @@ class UsersController < ApplicationController flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name] else Notifier.signup_confirm(user, user.tokens.create).deliver_later - flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe + flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => Settings.support_email).html_safe end redirect_to :action => "login" @@ -387,16 +388,16 @@ class UsersController < ApplicationController if @new_friend if request.post? - friend = Friend.new - friend.befriender = current_user - friend.befriendee = @new_friend + friendship = Friendship.new + friendship.befriender = current_user + friendship.befriendee = @new_friend if current_user.is_friends_with?(@new_friend) flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name - elsif friend.save + elsif friendship.save flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name - Notifier.friend_notification(friend).deliver_later + Notifier.friend_notification(friendship).deliver_later else - friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name)) + friendship.add_error(t("users.make_friend.failed", :name => @new_friend.display_name)) end if params[:referer] @@ -416,7 +417,7 @@ class UsersController < ApplicationController 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 + Friendship.where(:befriender => current_user, :befriendee => @friend).delete_all flash[:notice] = t "users.remove_friend.success", :name => @friend.display_name else flash[:error] = t "users.remove_friend.not_a_friend", :name => @friend.display_name @@ -524,7 +525,7 @@ class UsersController < ApplicationController when "active", "confirmed" then successful_login(user, request.env["omniauth.params"]["referer"]) when "suspended" then - failed_login t("users.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe + failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe else failed_login t("users.login.auth failure") end @@ -552,7 +553,7 @@ class UsersController < 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("users.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username + failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe, username else failed_login t("users.login.auth failure"), username end @@ -751,7 +752,13 @@ class UsersController < ApplicationController email.split("@").last end - if blocked = Acl.no_account_creation(request.remote_ip, domain) + mx_servers = if domain.nil? + nil + else + domain_mx_servers(domain) + end + + if blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers) logger.info "Blocked signup from #{request.remote_ip} for #{email}" render :action => "blocked" @@ -760,6 +767,14 @@ class UsersController < ApplicationController !blocked end + ## + # get list of MX servers for a domains + def domain_mx_servers(domain) + Resolv::DNS.open do |dns| + dns.getresources(domain, Resolv::DNS::Resource::IN::MX).collect(&:exchange).collect(&:to_s) + end + end + ## # check if this user has a gravatar and set the user pref is true def gravatar_enable(user)