mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-23 22:41:29 +00:00
df4ff9a8e1
* Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names
57 lines
1.5 KiB
Ruby
57 lines
1.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::TwoFactorAuthsController < ApplicationController
|
|
layout 'admin'
|
|
|
|
before_action :authenticate_user!
|
|
|
|
def show; end
|
|
|
|
def new
|
|
redirect_to settings_two_factor_auth_path if current_user.otp_required_for_login
|
|
|
|
@confirmation = Form::TwoFactorConfirmation.new
|
|
current_user.otp_secret = User.generate_otp_secret(32)
|
|
current_user.save!
|
|
set_qr_code
|
|
end
|
|
|
|
def create
|
|
if current_user.validate_and_consume_otp!(confirmation_params[:code])
|
|
current_user.otp_required_for_login = true
|
|
@codes = current_user.generate_otp_backup_codes!
|
|
current_user.save!
|
|
flash[:notice] = I18n.t('two_factor_auth.enabled_success')
|
|
else
|
|
@confirmation = Form::TwoFactorConfirmation.new
|
|
set_qr_code
|
|
flash.now[:alert] = I18n.t('two_factor_auth.wrong_code')
|
|
render action: :new
|
|
end
|
|
end
|
|
|
|
def recovery_codes
|
|
@codes = current_user.generate_otp_backup_codes!
|
|
current_user.save!
|
|
flash[:notice] = I18n.t('two_factor_auth.recovery_codes_regenerated')
|
|
end
|
|
|
|
def disable
|
|
current_user.otp_required_for_login = false
|
|
current_user.save!
|
|
|
|
redirect_to settings_two_factor_auth_path
|
|
end
|
|
|
|
private
|
|
|
|
def set_qr_code
|
|
@provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Rails.configuration.x.local_domain)
|
|
@qrcode = RQRCode::QRCode.new(@provision_url)
|
|
end
|
|
|
|
def confirmation_params
|
|
params.require(:form_two_factor_confirmation).permit(:code)
|
|
end
|
|
end
|