2016-11-15 09:56:29 -06:00
|
|
|
# frozen_string_literal: true
|
2017-05-01 19:14:47 -05:00
|
|
|
# == Schema Information
|
|
|
|
#
|
|
|
|
# Table name: users
|
|
|
|
#
|
2018-04-23 04:29:17 -05:00
|
|
|
# id :bigint(8) not null, primary key
|
2017-05-01 19:14:47 -05:00
|
|
|
# email :string default(""), not null
|
|
|
|
# created_at :datetime not null
|
|
|
|
# updated_at :datetime not null
|
|
|
|
# encrypted_password :string default(""), not null
|
|
|
|
# reset_password_token :string
|
|
|
|
# reset_password_sent_at :datetime
|
|
|
|
# sign_in_count :integer default(0), not null
|
|
|
|
# current_sign_in_at :datetime
|
|
|
|
# last_sign_in_at :datetime
|
2017-07-12 20:12:25 -05:00
|
|
|
# admin :boolean default(FALSE), not null
|
2017-05-01 19:14:47 -05:00
|
|
|
# confirmation_token :string
|
|
|
|
# confirmed_at :datetime
|
|
|
|
# confirmation_sent_at :datetime
|
|
|
|
# unconfirmed_email :string
|
|
|
|
# locale :string
|
|
|
|
# encrypted_otp_secret :string
|
|
|
|
# encrypted_otp_secret_iv :string
|
|
|
|
# encrypted_otp_secret_salt :string
|
|
|
|
# consumed_timestep :integer
|
2017-07-12 20:12:25 -05:00
|
|
|
# otp_required_for_login :boolean default(FALSE), not null
|
2017-05-01 19:14:47 -05:00
|
|
|
# last_emailed_at :datetime
|
|
|
|
# otp_backup_codes :string is an Array
|
2018-04-23 04:29:17 -05:00
|
|
|
# account_id :bigint(8) not null
|
2017-11-07 12:06:44 -06:00
|
|
|
# disabled :boolean default(FALSE), not null
|
2017-11-11 13:23:33 -06:00
|
|
|
# moderator :boolean default(FALSE), not null
|
2018-04-23 04:29:17 -05:00
|
|
|
# invite_id :bigint(8)
|
2018-06-17 06:54:02 -05:00
|
|
|
# chosen_languages :string is an Array
|
2018-12-24 12:12:38 -06:00
|
|
|
# created_by_application_id :bigint(8)
|
2019-03-13 23:28:30 -05:00
|
|
|
# approved :boolean default(TRUE), not null
|
2020-06-09 03:23:06 -05:00
|
|
|
# sign_in_token :string
|
|
|
|
# sign_in_token_sent_at :datetime
|
Add WebAuthn as an alternative 2FA method (#14466)
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
2020-08-24 09:46:27 -05:00
|
|
|
# webauthn_id :string
|
2020-10-12 09:33:49 -05:00
|
|
|
# sign_up_ip :inet
|
2022-07-04 19:41:40 -05:00
|
|
|
# role_id :bigint(8)
|
2017-05-01 19:14:47 -05:00
|
|
|
#
|
2016-11-15 09:56:29 -06:00
|
|
|
|
2016-08-17 10:56:23 -05:00
|
|
|
class User < ApplicationRecord
|
2022-01-23 08:46:30 -06:00
|
|
|
self.ignored_columns = %w(
|
|
|
|
remember_created_at
|
|
|
|
remember_token
|
2022-02-01 13:57:39 -06:00
|
|
|
current_sign_in_ip
|
|
|
|
last_sign_in_ip
|
2022-04-06 13:58:12 -05:00
|
|
|
skip_sign_in_token
|
2022-05-27 13:05:22 -05:00
|
|
|
filtered_languages
|
2022-01-23 08:46:30 -06:00
|
|
|
)
|
|
|
|
|
2017-01-12 19:42:22 -06:00
|
|
|
include Settings::Extend
|
2022-04-28 10:47:34 -05:00
|
|
|
include Redisable
|
2022-05-16 12:13:36 -05:00
|
|
|
include LanguagesHelper
|
2017-11-07 12:06:44 -06:00
|
|
|
|
2018-08-18 20:50:34 -05:00
|
|
|
# The home and list feeds will be stored in Redis for this amount
|
|
|
|
# of time, and status fan-out to followers will include only people
|
|
|
|
# within this time frame. Lowering the duration may improve performance
|
|
|
|
# if lots of people sign up, but not a lot of them check their feed
|
|
|
|
# every day. Raising the duration reduces the amount of expensive
|
|
|
|
# RegenerationWorker jobs that need to be run when those people come
|
|
|
|
# to check their feed
|
2019-01-02 03:47:32 -06:00
|
|
|
ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days.freeze
|
2017-01-12 13:46:24 -06:00
|
|
|
|
2018-01-02 09:55:00 -06:00
|
|
|
devise :two_factor_authenticatable,
|
2018-03-04 13:28:24 -06:00
|
|
|
otp_secret_encryption_key: Rails.configuration.x.otp_secret
|
2018-01-02 09:55:00 -06:00
|
|
|
|
|
|
|
devise :two_factor_backupable,
|
2017-04-15 06:26:03 -05:00
|
|
|
otp_number_of_backup_codes: 10
|
2016-03-05 06:12:24 -06:00
|
|
|
|
2021-11-05 18:13:58 -05:00
|
|
|
devise :registerable, :recoverable, :validatable,
|
2018-01-02 09:55:00 -06:00
|
|
|
:confirmable
|
|
|
|
|
2019-03-13 20:13:42 -05:00
|
|
|
include Omniauthable
|
|
|
|
include PamAuthenticable
|
|
|
|
include LdapAuthenticable
|
2018-02-02 03:18:55 -06:00
|
|
|
|
2018-01-19 13:56:47 -06:00
|
|
|
belongs_to :account, inverse_of: :user
|
|
|
|
belongs_to :invite, counter_cache: :uses, optional: true
|
2018-12-24 12:12:38 -06:00
|
|
|
belongs_to :created_by_application, class_name: 'Doorkeeper::Application', optional: true
|
2022-07-04 19:41:40 -05:00
|
|
|
belongs_to :role, class_name: 'UserRole', optional: true
|
2016-03-05 15:43:05 -06:00
|
|
|
accepts_nested_attributes_for :account
|
2016-03-05 06:12:24 -06:00
|
|
|
|
2017-08-22 11:33:57 -05:00
|
|
|
has_many :applications, class_name: 'Doorkeeper::Application', as: :owner
|
2018-02-21 16:21:32 -06:00
|
|
|
has_many :backups, inverse_of: :user
|
2019-07-26 11:55:33 -05:00
|
|
|
has_many :invites, inverse_of: :user
|
2019-09-06 06:55:51 -05:00
|
|
|
has_many :markers, inverse_of: :user, dependent: :destroy
|
Add WebAuthn as an alternative 2FA method (#14466)
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
2020-08-24 09:46:27 -05:00
|
|
|
has_many :webauthn_credentials, dependent: :destroy
|
2022-01-16 06:23:50 -06:00
|
|
|
has_many :ips, class_name: 'UserIp', inverse_of: :user
|
2017-08-22 11:33:57 -05:00
|
|
|
|
2019-04-09 09:06:30 -05:00
|
|
|
has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy
|
2020-12-14 03:03:09 -06:00
|
|
|
accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
|
2020-12-22 10:14:32 -06:00
|
|
|
validates :invite_request, presence: true, on: :create, if: :invite_text_required?
|
2019-04-09 09:06:30 -05:00
|
|
|
|
2017-05-18 20:11:23 -05:00
|
|
|
validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
|
2022-08-24 21:31:10 -05:00
|
|
|
validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
|
2018-12-10 15:53:25 -06:00
|
|
|
validates_with EmailMxValidator, if: :validate_email_dns?
|
2018-12-24 12:12:38 -06:00
|
|
|
validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
|
2016-03-14 11:49:13 -05:00
|
|
|
|
2022-03-30 07:45:52 -05:00
|
|
|
# Honeypot/anti-spam fields
|
2020-12-09 23:27:26 -06:00
|
|
|
attr_accessor :registration_form_time, :website, :confirm_password
|
|
|
|
|
|
|
|
validates_with RegistrationFormTimeValidator, on: :create
|
|
|
|
validates :website, absence: true, on: :create
|
|
|
|
validates :confirm_password, absence: true, on: :create
|
2022-07-04 19:41:40 -05:00
|
|
|
validate :validate_role_elevation
|
2020-12-09 23:27:26 -06:00
|
|
|
|
2017-11-11 13:23:33 -06:00
|
|
|
scope :recent, -> { order(id: :desc) }
|
2019-03-13 23:28:30 -05:00
|
|
|
scope :pending, -> { where(approved: false) }
|
|
|
|
scope :approved, -> { where(approved: true) }
|
2017-03-03 16:45:48 -06:00
|
|
|
scope :confirmed, -> { where.not(confirmed_at: nil) }
|
2019-01-02 03:47:32 -06:00
|
|
|
scope :enabled, -> { where(disabled: false) }
|
2019-06-19 19:52:34 -05:00
|
|
|
scope :disabled, -> { where(disabled: true) }
|
2017-05-22 12:36:21 -05:00
|
|
|
scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
|
2019-06-18 11:22:02 -05:00
|
|
|
scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
|
2017-05-22 14:50:58 -05:00
|
|
|
scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
|
2022-02-12 18:58:26 -06:00
|
|
|
scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
|
2019-01-02 03:47:32 -06:00
|
|
|
scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }
|
2016-10-07 06:17:56 -05:00
|
|
|
|
2017-05-07 20:32:52 -05:00
|
|
|
before_validation :sanitize_languages
|
2022-07-04 19:41:40 -05:00
|
|
|
before_validation :sanitize_role
|
2019-03-13 23:28:30 -05:00
|
|
|
before_create :set_approved
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
after_commit :send_pending_devise_notifications
|
2022-06-09 14:57:36 -05:00
|
|
|
after_create_commit :trigger_webhooks
|
2017-05-07 20:32:52 -05:00
|
|
|
|
2017-06-01 13:53:37 -05:00
|
|
|
# This avoids a deprecation warning from Rails 5.1
|
|
|
|
# It seems possible that a future release of devise-two-factor will
|
|
|
|
# handle this itself, and this can be removed from our User class.
|
|
|
|
attribute :otp_secret
|
|
|
|
|
2017-06-23 11:50:53 -05:00
|
|
|
has_many :session_activations, dependent: :destroy
|
|
|
|
|
2017-11-15 09:05:20 -06:00
|
|
|
delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
|
2022-03-07 02:36:47 -06:00
|
|
|
:reduce_motion, :system_font_ui, :noindex, :theme, :display_media,
|
2019-05-25 14:27:00 -05:00
|
|
|
:expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
|
2019-10-24 15:51:41 -05:00
|
|
|
:advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
|
2022-04-08 11:03:31 -05:00
|
|
|
:disable_swiping, :always_send_emails,
|
2019-08-06 10:57:52 -05:00
|
|
|
to: :settings, prefix: :setting, allow_nil: false
|
2017-11-15 09:05:20 -06:00
|
|
|
|
2022-07-04 19:41:40 -05:00
|
|
|
delegate :can?, to: :role
|
|
|
|
|
2022-04-06 13:58:12 -05:00
|
|
|
attr_reader :invite_code
|
2022-07-04 19:41:40 -05:00
|
|
|
attr_writer :external, :bypass_invite_request_check, :current_account
|
|
|
|
|
|
|
|
def self.those_who_can(*any_of_privileges)
|
|
|
|
matching_role_ids = UserRole.that_can(*any_of_privileges).map(&:id)
|
|
|
|
|
|
|
|
if matching_role_ids.empty?
|
|
|
|
none
|
|
|
|
else
|
|
|
|
where(role_id: matching_role_ids)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def role
|
|
|
|
if role_id.nil?
|
|
|
|
UserRole.everyone
|
|
|
|
else
|
|
|
|
super
|
|
|
|
end
|
|
|
|
end
|
2017-11-27 09:07:59 -06:00
|
|
|
|
2017-04-22 21:43:42 -05:00
|
|
|
def confirmed?
|
|
|
|
confirmed_at.present?
|
|
|
|
end
|
|
|
|
|
2018-12-27 20:38:41 -06:00
|
|
|
def invited?
|
2019-05-19 14:40:36 -05:00
|
|
|
invite_id.present?
|
|
|
|
end
|
|
|
|
|
|
|
|
def valid_invitation?
|
2019-05-01 21:30:12 -05:00
|
|
|
invite_id.present? && invite.valid_for_use?
|
2018-12-27 20:38:41 -06:00
|
|
|
end
|
|
|
|
|
2017-11-07 12:06:44 -06:00
|
|
|
def disable!
|
2020-01-24 22:22:35 -06:00
|
|
|
update!(disabled: true)
|
2017-11-07 12:06:44 -06:00
|
|
|
end
|
|
|
|
|
|
|
|
def enable!
|
|
|
|
update!(disabled: false)
|
|
|
|
end
|
|
|
|
|
2022-08-25 13:39:40 -05:00
|
|
|
def to_log_human_identifier
|
|
|
|
account.acct
|
|
|
|
end
|
|
|
|
|
|
|
|
def to_log_route_param
|
|
|
|
account_id
|
|
|
|
end
|
|
|
|
|
2017-12-29 12:52:04 -06:00
|
|
|
def confirm
|
2019-03-22 20:23:48 -05:00
|
|
|
new_user = !confirmed?
|
2021-01-20 23:18:30 -06:00
|
|
|
self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
|
2017-12-29 12:52:04 -06:00
|
|
|
|
|
|
|
super
|
2019-03-13 20:13:42 -05:00
|
|
|
|
2019-03-13 23:28:30 -05:00
|
|
|
if new_user && approved?
|
|
|
|
prepare_new_user!
|
|
|
|
elsif new_user
|
|
|
|
notify_staff_about_pending_account!
|
|
|
|
end
|
2017-12-29 12:52:04 -06:00
|
|
|
end
|
|
|
|
|
2017-11-11 13:23:33 -06:00
|
|
|
def confirm!
|
2019-03-22 20:23:48 -05:00
|
|
|
new_user = !confirmed?
|
|
|
|
self.approved = true if open_registrations?
|
2017-12-29 12:52:04 -06:00
|
|
|
|
2017-11-11 13:23:33 -06:00
|
|
|
skip_confirmation!
|
|
|
|
save!
|
2019-03-13 20:13:42 -05:00
|
|
|
|
2019-03-13 23:28:30 -05:00
|
|
|
prepare_new_user! if new_user && approved?
|
|
|
|
end
|
|
|
|
|
2022-01-16 06:23:50 -06:00
|
|
|
def update_sign_in!(new_sign_in: false)
|
2022-06-09 14:57:36 -05:00
|
|
|
old_current = current_sign_in_at
|
|
|
|
new_current = Time.now.utc
|
|
|
|
|
2020-11-12 16:05:01 -06:00
|
|
|
self.last_sign_in_at = old_current || new_current
|
|
|
|
self.current_sign_in_at = new_current
|
|
|
|
|
|
|
|
if new_sign_in
|
|
|
|
self.sign_in_count ||= 0
|
|
|
|
self.sign_in_count += 1
|
|
|
|
end
|
|
|
|
|
|
|
|
save(validate: false) unless new_record?
|
|
|
|
prepare_returning_user!
|
|
|
|
end
|
|
|
|
|
2019-03-13 23:28:30 -05:00
|
|
|
def pending?
|
|
|
|
!approved?
|
|
|
|
end
|
|
|
|
|
|
|
|
def active_for_authentication?
|
2020-09-15 07:37:58 -05:00
|
|
|
!account.memorial?
|
Change unconfirmed user login behaviour (#11375)
Allow access to account settings, 2FA, authorized applications, and
account deletions to unconfirmed and pending users, as well as
users who had their accounts disabled. Suspended users cannot update
their e-mail or password or delete their account.
Display account status on account settings page, for example, when
an account is frozen, limited, unconfirmed or pending review.
After sign up, login users straight away and show a simple page that
tells them the status of their account with links to account settings
and logout, to reduce onboarding friction and allow users to correct
wrongly typed e-mail addresses.
Move the final sign-up step of SSO integrations to be the same
as above to reduce code duplication.
2019-07-22 03:48:50 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def functional?
|
2020-09-15 07:37:58 -05:00
|
|
|
confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil?
|
2019-03-13 23:28:30 -05:00
|
|
|
end
|
|
|
|
|
2022-03-25 20:53:13 -05:00
|
|
|
def unconfirmed?
|
|
|
|
!confirmed?
|
|
|
|
end
|
|
|
|
|
2019-09-11 09:32:44 -05:00
|
|
|
def unconfirmed_or_pending?
|
2022-03-25 20:53:13 -05:00
|
|
|
unconfirmed? || pending?
|
2019-09-11 09:32:44 -05:00
|
|
|
end
|
|
|
|
|
2019-03-13 23:28:30 -05:00
|
|
|
def inactive_message
|
|
|
|
!approved? ? :pending : super
|
|
|
|
end
|
|
|
|
|
|
|
|
def approve!
|
|
|
|
return if approved?
|
|
|
|
|
|
|
|
update!(approved: true)
|
|
|
|
prepare_new_user!
|
2018-01-23 13:52:30 -06:00
|
|
|
end
|
|
|
|
|
Add WebAuthn as an alternative 2FA method (#14466)
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
2020-08-24 09:46:27 -05:00
|
|
|
def otp_enabled?
|
|
|
|
otp_required_for_login
|
|
|
|
end
|
|
|
|
|
|
|
|
def webauthn_enabled?
|
|
|
|
webauthn_credentials.any?
|
|
|
|
end
|
|
|
|
|
|
|
|
def two_factor_enabled?
|
|
|
|
otp_required_for_login? || webauthn_credentials.any?
|
|
|
|
end
|
|
|
|
|
2017-05-02 14:07:12 -05:00
|
|
|
def disable_two_factor!
|
|
|
|
self.otp_required_for_login = false
|
Add WebAuthn as an alternative 2FA method (#14466)
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
2020-08-24 09:46:27 -05:00
|
|
|
self.otp_secret = nil
|
2017-05-02 14:07:12 -05:00
|
|
|
otp_backup_codes&.clear
|
Add WebAuthn as an alternative 2FA method (#14466)
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
2020-08-24 09:46:27 -05:00
|
|
|
|
|
|
|
webauthn_credentials.destroy_all if webauthn_enabled?
|
|
|
|
|
2017-05-02 14:07:12 -05:00
|
|
|
save!
|
|
|
|
end
|
|
|
|
|
2022-02-07 19:41:17 -06:00
|
|
|
def preferred_posting_language
|
2022-09-27 18:02:15 -05:00
|
|
|
valid_locale_cascade(settings.default_language, locale, I18n.locale)
|
2022-02-07 19:41:17 -06:00
|
|
|
end
|
|
|
|
|
2017-02-06 16:16:20 -06:00
|
|
|
def setting_default_privacy
|
|
|
|
settings.default_privacy || (account.locked? ? 'private' : 'public')
|
|
|
|
end
|
2017-04-11 09:10:16 -05:00
|
|
|
|
2018-09-01 17:11:58 -05:00
|
|
|
def allows_report_emails?
|
|
|
|
settings.notification_emails['report']
|
|
|
|
end
|
|
|
|
|
2019-04-09 17:35:49 -05:00
|
|
|
def allows_pending_account_emails?
|
|
|
|
settings.notification_emails['pending_account']
|
|
|
|
end
|
|
|
|
|
2022-02-14 14:27:53 -06:00
|
|
|
def allows_appeal_emails?
|
|
|
|
settings.notification_emails['appeal']
|
|
|
|
end
|
|
|
|
|
2022-02-24 17:34:14 -06:00
|
|
|
def allows_trends_review_emails?
|
2019-08-05 12:54:29 -05:00
|
|
|
settings.notification_emails['trending_tag']
|
|
|
|
end
|
|
|
|
|
2018-12-09 06:03:01 -06:00
|
|
|
def aggregates_reblogs?
|
|
|
|
@aggregates_reblogs ||= settings.aggregate_reblogs
|
|
|
|
end
|
|
|
|
|
2019-02-02 12:18:15 -06:00
|
|
|
def shows_application?
|
2019-02-20 10:47:38 -06:00
|
|
|
@shows_application ||= settings.show_application
|
2019-02-02 12:18:15 -06:00
|
|
|
end
|
|
|
|
|
2022-01-16 06:23:50 -06:00
|
|
|
def token_for_app(app)
|
|
|
|
return nil if app.nil? || app.owner != self
|
|
|
|
|
|
|
|
Doorkeeper::AccessToken.find_or_create_by(application_id: app.id, resource_owner_id: id) do |t|
|
|
|
|
t.scopes = app.scopes
|
|
|
|
t.expires_in = Doorkeeper.configuration.access_token_expires_in
|
2017-08-22 11:33:57 -05:00
|
|
|
t.use_refresh_token = Doorkeeper.configuration.refresh_token_enabled?
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-06-25 09:54:30 -05:00
|
|
|
def activate_session(request)
|
2022-01-16 06:23:50 -06:00
|
|
|
session_activations.activate(
|
|
|
|
session_id: SecureRandom.hex,
|
|
|
|
user_agent: request.user_agent,
|
|
|
|
ip: request.remote_ip
|
|
|
|
).session_id
|
2017-06-23 11:50:53 -05:00
|
|
|
end
|
|
|
|
|
2020-01-23 17:20:38 -06:00
|
|
|
def clear_other_sessions(id)
|
2017-06-23 11:50:53 -05:00
|
|
|
session_activations.exclusive(id)
|
|
|
|
end
|
|
|
|
|
2017-07-13 15:15:32 -05:00
|
|
|
def web_push_subscription(session)
|
2018-05-11 04:49:12 -05:00
|
|
|
session.web_push_subscription.nil? ? nil : session.web_push_subscription
|
2017-07-13 15:15:32 -05:00
|
|
|
end
|
|
|
|
|
2017-11-27 09:07:59 -06:00
|
|
|
def invite_code=(code)
|
2018-08-26 12:22:46 -05:00
|
|
|
self.invite = Invite.find_by(code: code) if code.present?
|
2017-11-27 09:07:59 -06:00
|
|
|
@invite_code = code
|
|
|
|
end
|
|
|
|
|
2018-02-02 03:18:55 -06:00
|
|
|
def password_required?
|
2019-09-18 09:37:27 -05:00
|
|
|
return false if external?
|
|
|
|
|
2018-02-02 03:18:55 -06:00
|
|
|
super
|
|
|
|
end
|
|
|
|
|
2020-06-09 03:23:06 -05:00
|
|
|
def external_or_valid_password?(compare_password)
|
|
|
|
# If encrypted_password is blank, we got the user from LDAP or PAM,
|
|
|
|
# so credentials are already valid
|
|
|
|
|
|
|
|
encrypted_password.blank? || valid_password?(compare_password)
|
|
|
|
end
|
|
|
|
|
2018-02-02 03:18:55 -06:00
|
|
|
def send_reset_password_instructions
|
2019-09-18 09:37:27 -05:00
|
|
|
return false if encrypted_password.blank?
|
|
|
|
|
2018-02-02 03:18:55 -06:00
|
|
|
super
|
|
|
|
end
|
|
|
|
|
2021-07-07 22:31:28 -05:00
|
|
|
def reset_password(new_password, new_password_confirmation)
|
2019-09-18 09:37:27 -05:00
|
|
|
return false if encrypted_password.blank?
|
|
|
|
|
2018-02-02 03:18:55 -06:00
|
|
|
super
|
|
|
|
end
|
|
|
|
|
2021-07-07 22:31:28 -05:00
|
|
|
def reset_password!
|
2022-01-23 08:46:30 -06:00
|
|
|
# First, change password to something random and deactivate all sessions
|
2021-07-07 22:31:28 -05:00
|
|
|
transaction do
|
2022-01-23 08:46:30 -06:00
|
|
|
update(password: SecureRandom.hex)
|
2021-07-07 22:31:28 -05:00
|
|
|
session_activations.destroy_all
|
|
|
|
end
|
|
|
|
|
|
|
|
# Then, remove all authorized applications and connected push subscriptions
|
|
|
|
Doorkeeper::AccessGrant.by_resource_owner(self).in_batches.update_all(revoked_at: Time.now.utc)
|
|
|
|
|
|
|
|
Doorkeeper::AccessToken.by_resource_owner(self).in_batches do |batch|
|
|
|
|
batch.update_all(revoked_at: Time.now.utc)
|
|
|
|
Web::PushSubscription.where(access_token_id: batch).delete_all
|
|
|
|
end
|
|
|
|
|
|
|
|
# Finally, send a reset password prompt to the user
|
|
|
|
send_reset_password_instructions
|
|
|
|
end
|
|
|
|
|
2018-09-24 22:09:35 -05:00
|
|
|
def show_all_media?
|
|
|
|
setting_display_media == 'show_all'
|
|
|
|
end
|
|
|
|
|
|
|
|
def hide_all_media?
|
|
|
|
setting_display_media == 'hide_all'
|
|
|
|
end
|
|
|
|
|
2017-05-30 08:28:56 -05:00
|
|
|
protected
|
|
|
|
|
2021-05-06 07:22:54 -05:00
|
|
|
def send_devise_notification(notification, *args, **kwargs)
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
# This method can be called in `after_update` and `after_commit` hooks,
|
|
|
|
# but we must make sure the mailer is actually called *after* commit,
|
|
|
|
# otherwise it may work on stale data. To do this, figure out if we are
|
|
|
|
# within a transaction.
|
2021-05-06 07:22:54 -05:00
|
|
|
|
|
|
|
# It seems like devise sends keyword arguments as a hash in the last
|
|
|
|
# positional argument
|
|
|
|
kwargs = args.pop if args.last.is_a?(Hash) && kwargs.empty?
|
|
|
|
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
if ActiveRecord::Base.connection.current_transaction.try(:records)&.include?(self)
|
2021-05-06 07:22:54 -05:00
|
|
|
pending_devise_notifications << [notification, args, kwargs]
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
else
|
2021-05-06 07:22:54 -05:00
|
|
|
render_and_send_devise_message(notification, *args, **kwargs)
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
end
|
2017-05-30 08:28:56 -05:00
|
|
|
end
|
|
|
|
|
2017-05-07 20:32:52 -05:00
|
|
|
private
|
|
|
|
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
def send_pending_devise_notifications
|
2021-05-06 07:22:54 -05:00
|
|
|
pending_devise_notifications.each do |notification, args, kwargs|
|
|
|
|
render_and_send_devise_message(notification, *args, **kwargs)
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
# Empty the pending notifications array because the
|
|
|
|
# after_commit hook can be called multiple times which
|
|
|
|
# could cause multiple emails to be sent.
|
|
|
|
pending_devise_notifications.clear
|
|
|
|
end
|
|
|
|
|
|
|
|
def pending_devise_notifications
|
|
|
|
@pending_devise_notifications ||= []
|
|
|
|
end
|
|
|
|
|
2021-05-06 07:22:54 -05:00
|
|
|
def render_and_send_devise_message(notification, *args, **kwargs)
|
|
|
|
devise_mailer.send(notification, self, *args, **kwargs).deliver_later
|
Fix “Email changed” notification sometimes having wrong e-mail (#13475)
* Fix “Email changed” notification sometimes having wrong e-mail
Fixes #6778
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
In that case, `changed?` is false and `saved_changes?` is true, so
if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
notification.
In that case, `changed?` is still false, and `saved_changes?` still true,
so if we use the latter, that second notification email is simply not
going to be sent (as we would be queuing the notification *after*
executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194
* Fix cases when sending notifications without changing the model
* Defer sending if and only if in transaction including current record
2020-04-15 09:13:44 -05:00
|
|
|
end
|
|
|
|
|
2019-03-13 23:28:30 -05:00
|
|
|
def set_approved
|
2020-10-12 09:33:49 -05:00
|
|
|
self.approved = begin
|
|
|
|
if sign_up_from_ip_requires_approval?
|
|
|
|
false
|
|
|
|
else
|
|
|
|
open_registrations? || valid_invitation? || external?
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def sign_up_from_ip_requires_approval?
|
|
|
|
!sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
|
2019-03-22 20:23:48 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def open_registrations?
|
|
|
|
Setting.registrations_mode == 'open'
|
2019-03-13 23:28:30 -05:00
|
|
|
end
|
|
|
|
|
2019-04-24 19:49:25 -05:00
|
|
|
def external?
|
2019-04-27 16:55:16 -05:00
|
|
|
!!@external
|
2019-04-24 19:49:25 -05:00
|
|
|
end
|
|
|
|
|
2020-12-22 10:14:32 -06:00
|
|
|
def bypass_invite_request_check?
|
|
|
|
@bypass_invite_request_check
|
|
|
|
end
|
|
|
|
|
2017-05-07 20:32:52 -05:00
|
|
|
def sanitize_languages
|
2018-06-17 06:54:02 -05:00
|
|
|
return if chosen_languages.nil?
|
|
|
|
chosen_languages.reject!(&:blank?)
|
|
|
|
self.chosen_languages = nil if chosen_languages.empty?
|
2017-05-07 20:32:52 -05:00
|
|
|
end
|
2017-12-29 12:52:04 -06:00
|
|
|
|
2022-07-04 19:41:40 -05:00
|
|
|
def sanitize_role
|
|
|
|
return if role.nil?
|
|
|
|
self.role = nil if role.everyone?
|
|
|
|
end
|
|
|
|
|
2018-01-23 13:52:30 -06:00
|
|
|
def prepare_new_user!
|
2017-12-29 12:52:04 -06:00
|
|
|
BootstrapTimelineWorker.perform_async(account_id)
|
|
|
|
ActivityTracker.increment('activity:accounts:local')
|
2018-01-18 12:17:25 -06:00
|
|
|
UserMailer.welcome(self).deliver_later
|
2017-12-29 12:52:04 -06:00
|
|
|
end
|
2018-01-23 13:52:30 -06:00
|
|
|
|
|
|
|
def prepare_returning_user!
|
|
|
|
ActivityTracker.record('activity:logins', id)
|
|
|
|
regenerate_feed! if needs_feed_update?
|
|
|
|
end
|
|
|
|
|
2019-03-13 23:28:30 -05:00
|
|
|
def notify_staff_about_pending_account!
|
2022-07-04 19:41:40 -05:00
|
|
|
User.those_who_can(:manage_users).includes(:account).find_each do |u|
|
2019-04-09 17:35:49 -05:00
|
|
|
next unless u.allows_pending_account_emails?
|
2019-03-13 23:28:30 -05:00
|
|
|
AdminMailer.new_pending_account(u.account, self).deliver_later
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-01-23 13:52:30 -06:00
|
|
|
def regenerate_feed!
|
2022-04-28 10:47:34 -05:00
|
|
|
RegenerationWorker.perform_async(account_id) if redis.set("account:#{account_id}:regeneration", true, nx: true, ex: 1.day.seconds)
|
2018-01-23 13:52:30 -06:00
|
|
|
end
|
|
|
|
|
|
|
|
def needs_feed_update?
|
|
|
|
last_sign_in_at < ACTIVE_DURATION.ago
|
|
|
|
end
|
2018-12-10 15:53:25 -06:00
|
|
|
|
|
|
|
def validate_email_dns?
|
2021-03-19 11:15:36 -05:00
|
|
|
email_changed? && !external? && !(Rails.env.test? || Rails.env.development?)
|
2018-12-10 15:53:25 -06:00
|
|
|
end
|
2020-12-22 10:14:32 -06:00
|
|
|
|
2022-07-04 19:41:40 -05:00
|
|
|
def validate_role_elevation
|
|
|
|
errors.add(:role_id, :elevated) if defined?(@current_account) && role&.overrides?(@current_account&.user_role)
|
|
|
|
end
|
|
|
|
|
2020-12-22 10:14:32 -06:00
|
|
|
def invite_text_required?
|
|
|
|
Setting.require_invite_text && !invited? && !external? && !bypass_invite_request_check?
|
|
|
|
end
|
2022-06-09 14:57:36 -05:00
|
|
|
|
|
|
|
def trigger_webhooks
|
|
|
|
TriggerWebhookWorker.perform_async('account.created', 'Account', account_id)
|
|
|
|
end
|
2016-02-22 09:00:20 -06:00
|
|
|
end
|