mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
cfa583fa71
Fixes #15959 Introduced in #6540, OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form to instead redirect to the external OmniAuth login provider. However, it did not prevent the log-in form on /about introduced by #10232 from appearing, and completely broke with the introduction of #15228. As I restoring that previous log-in flow without introducing a security vulnerability may require extensive care and knowledge of how OmniAuth works, this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time being.
158 lines
4 KiB
Ruby
158 lines
4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Auth::SessionsController < Devise::SessionsController
|
|
layout 'auth'
|
|
|
|
skip_before_action :require_no_authentication, only: [:create]
|
|
skip_before_action :require_functional!
|
|
skip_before_action :update_user_sign_in
|
|
|
|
include TwoFactorAuthenticationConcern
|
|
include SignInTokenAuthenticationConcern
|
|
|
|
before_action :set_instance_presenter, only: [:new]
|
|
before_action :set_body_classes
|
|
|
|
def create
|
|
super do |resource|
|
|
# We only need to call this if this hasn't already been
|
|
# called from one of the two-factor or sign-in token
|
|
# authentication methods
|
|
|
|
on_authentication_success(resource, :password) unless @on_authentication_success_called
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
tmp_stored_location = stored_location_for(:user)
|
|
super
|
|
session.delete(:challenge_passed_at)
|
|
flash.delete(:notice)
|
|
store_location_for(:user, tmp_stored_location) if continue_after?
|
|
end
|
|
|
|
def webauthn_options
|
|
user = User.find_by(id: session[:attempt_user_id])
|
|
|
|
if user&.webauthn_enabled?
|
|
options_for_get = WebAuthn::Credential.options_for_get(
|
|
allow: user.webauthn_credentials.pluck(:external_id),
|
|
user_verification: 'discouraged'
|
|
)
|
|
|
|
session[:webauthn_challenge] = options_for_get.challenge
|
|
|
|
render json: options_for_get, status: :ok
|
|
else
|
|
render json: { error: t('webauthn_credentials.not_enabled') }, status: :unauthorized
|
|
end
|
|
end
|
|
|
|
protected
|
|
|
|
def find_user
|
|
if user_params[:email].present?
|
|
find_user_from_params
|
|
elsif session[:attempt_user_id]
|
|
User.find_by(id: session[:attempt_user_id])
|
|
end
|
|
end
|
|
|
|
def find_user_from_params
|
|
user = User.authenticate_with_ldap(user_params) if Devise.ldap_authentication
|
|
user ||= User.authenticate_with_pam(user_params) if Devise.pam_authentication
|
|
user ||= User.find_for_authentication(email: user_params[:email])
|
|
user
|
|
end
|
|
|
|
def user_params
|
|
params.require(:user).permit(:email, :password, :otp_attempt, :sign_in_token_attempt, credential: {})
|
|
end
|
|
|
|
def after_sign_in_path_for(resource)
|
|
last_url = stored_location_for(:user)
|
|
|
|
if home_paths(resource).include?(last_url)
|
|
root_path
|
|
else
|
|
last_url || root_path
|
|
end
|
|
end
|
|
|
|
def require_no_authentication
|
|
super
|
|
|
|
# Delete flash message that isn't entirely useful and may be confusing in
|
|
# most cases because /web doesn't display/clear flash messages.
|
|
flash.delete(:alert) if flash[:alert] == I18n.t('devise.failure.already_authenticated')
|
|
end
|
|
|
|
private
|
|
|
|
def set_instance_presenter
|
|
@instance_presenter = InstancePresenter.new
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'lighter'
|
|
end
|
|
|
|
def home_paths(resource)
|
|
paths = [about_path]
|
|
|
|
if single_user_mode? && resource.is_a?(User)
|
|
paths << short_account_path(username: resource.account)
|
|
end
|
|
|
|
paths
|
|
end
|
|
|
|
def continue_after?
|
|
truthy_param?(:continue)
|
|
end
|
|
|
|
def restart_session
|
|
clear_attempt_from_session
|
|
redirect_to new_user_session_path, alert: I18n.t('devise.failure.timeout')
|
|
end
|
|
|
|
def set_attempt_session(user)
|
|
session[:attempt_user_id] = user.id
|
|
session[:attempt_user_updated_at] = user.updated_at.to_s
|
|
end
|
|
|
|
def clear_attempt_from_session
|
|
session.delete(:attempt_user_id)
|
|
session.delete(:attempt_user_updated_at)
|
|
end
|
|
|
|
def on_authentication_success(user, security_measure)
|
|
@on_authentication_success_called = true
|
|
|
|
clear_attempt_from_session
|
|
|
|
user.update_sign_in!(new_sign_in: true)
|
|
sign_in(user)
|
|
flash.delete(:notice)
|
|
|
|
LoginActivity.create(
|
|
user: user,
|
|
success: true,
|
|
authentication_method: security_measure,
|
|
ip: request.remote_ip,
|
|
user_agent: request.user_agent
|
|
)
|
|
end
|
|
|
|
def on_authentication_failure(user, security_measure, failure_reason)
|
|
LoginActivity.create(
|
|
user: user,
|
|
success: false,
|
|
authentication_method: security_measure,
|
|
failure_reason: failure_reason,
|
|
ip: request.remote_ip,
|
|
user_agent: request.user_agent
|
|
)
|
|
end
|
|
end
|