2023-02-22 00:55:31 +00:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2016-02-22 15:00:20 +00:00
|
|
|
require 'rails_helper'
|
2017-04-15 11:26:03 +00:00
|
|
|
require 'devise_two_factor/spec_helpers'
|
2016-02-22 15:00:20 +00:00
|
|
|
|
2023-05-04 03:49:53 +00:00
|
|
|
RSpec.describe User do
|
2024-09-19 10:56:09 +00:00
|
|
|
subject { described_class.new(account: account) }
|
|
|
|
|
2023-02-18 22:17:59 +00:00
|
|
|
let(:password) { 'abcd1234' }
|
|
|
|
let(:account) { Fabricate(:account, username: 'alice') }
|
|
|
|
|
2017-04-15 11:26:03 +00:00
|
|
|
it_behaves_like 'two_factor_backupable'
|
|
|
|
|
2024-05-02 09:31:41 +00:00
|
|
|
describe 'legacy_otp_secret' do
|
2017-05-30 13:28:56 +00:00
|
|
|
it 'is encrypted with OTP_SECRET environment variable' do
|
|
|
|
user = Fabricate(:user,
|
|
|
|
encrypted_otp_secret: "Fttsy7QAa0edaDfdfSz094rRLAxc8cJweDQ4BsWH/zozcdVA8o9GLqcKhn2b\nGi/V\n",
|
|
|
|
encrypted_otp_secret_iv: 'rys3THICkr60BoWC',
|
|
|
|
encrypted_otp_secret_salt: '_LMkAGvdg7a+sDIKjI3mR2Q==')
|
|
|
|
|
2024-05-02 09:31:41 +00:00
|
|
|
expect(user.send(:legacy_otp_secret)).to eq 'anotpsecretthatshouldbeencrypted'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'otp_secret' do
|
|
|
|
it 'encrypts the saved value' do
|
|
|
|
user = Fabricate(:user, otp_secret: '123123123')
|
|
|
|
|
|
|
|
user.reload
|
|
|
|
|
|
|
|
expect(user.otp_secret).to eq '123123123'
|
|
|
|
expect(user.attributes_before_type_cast[:otp_secret]).to_not eq '123123123'
|
2017-05-30 13:28:56 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2024-11-25 08:18:10 +00:00
|
|
|
describe 'Associations' do
|
2024-09-05 15:36:05 +00:00
|
|
|
it { is_expected.to belong_to(:account).required }
|
2024-11-25 08:18:10 +00:00
|
|
|
end
|
2016-02-24 23:17:01 +00:00
|
|
|
|
2024-11-25 08:18:10 +00:00
|
|
|
describe 'Validations' do
|
|
|
|
it { is_expected.to_not allow_value('john@').for(:email) }
|
2017-05-08 01:32:52 +00:00
|
|
|
|
2017-06-08 13:22:01 +00:00
|
|
|
it 'is valid with an invalid e-mail that has already been saved' do
|
|
|
|
user = Fabricate.build(:user, email: 'invalid-email')
|
|
|
|
user.save(validate: false)
|
|
|
|
expect(user.valid?).to be true
|
|
|
|
end
|
2024-04-05 07:48:45 +00:00
|
|
|
|
2024-11-25 08:18:10 +00:00
|
|
|
it { is_expected.to allow_value('admin@localhost').for(:email) }
|
2024-01-10 13:36:06 +00:00
|
|
|
end
|
2017-06-08 13:22:01 +00:00
|
|
|
|
2024-01-10 13:36:06 +00:00
|
|
|
describe 'Normalizations' do
|
|
|
|
describe 'locale' do
|
2024-09-04 05:12:40 +00:00
|
|
|
it { is_expected.to_not normalize(:locale).from('en') }
|
|
|
|
it { is_expected.to normalize(:locale).from('toto').to(nil) }
|
2023-11-22 11:38:07 +00:00
|
|
|
end
|
|
|
|
|
2024-01-10 13:36:06 +00:00
|
|
|
describe 'time_zone' do
|
2024-09-04 05:12:40 +00:00
|
|
|
it { is_expected.to_not normalize(:time_zone).from('UTC') }
|
|
|
|
it { is_expected.to normalize(:time_zone).from('toto').to(nil) }
|
2023-11-22 11:38:07 +00:00
|
|
|
end
|
|
|
|
|
2024-09-04 05:12:40 +00:00
|
|
|
describe 'chosen_languages' do
|
|
|
|
it { is_expected.to normalize(:chosen_languages).from(['en', 'fr', '']).to(%w(en fr)) }
|
|
|
|
it { is_expected.to normalize(:chosen_languages).from(['']).to(nil) }
|
2017-05-08 01:32:52 +00:00
|
|
|
end
|
2017-04-04 22:29:56 +00:00
|
|
|
end
|
|
|
|
|
2024-07-08 16:01:08 +00:00
|
|
|
describe 'scopes', :inline_jobs do
|
2017-04-04 22:29:56 +00:00
|
|
|
describe 'recent' do
|
|
|
|
it 'returns an array of recent users ordered by id' do
|
2023-10-18 12:26:22 +00:00
|
|
|
first_user = Fabricate(:user)
|
|
|
|
second_user = Fabricate(:user)
|
|
|
|
expect(described_class.recent).to eq [second_user, first_user]
|
2017-04-04 22:29:56 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'confirmed' do
|
|
|
|
it 'returns an array of users who are confirmed' do
|
2023-10-19 14:55:06 +00:00
|
|
|
Fabricate(:user, confirmed_at: nil)
|
2023-10-18 12:26:22 +00:00
|
|
|
confirmed_user = Fabricate(:user, confirmed_at: Time.zone.now)
|
|
|
|
expect(described_class.confirmed).to contain_exactly(confirmed_user)
|
2017-04-04 22:29:56 +00:00
|
|
|
end
|
|
|
|
end
|
2017-05-30 13:28:56 +00:00
|
|
|
|
2024-04-08 13:53:49 +00:00
|
|
|
describe 'signed_in_recently' do
|
|
|
|
it 'returns a relation of users who have signed in during the recent period' do
|
|
|
|
recent_sign_in_user = Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
|
|
|
|
Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
|
2017-05-30 13:28:56 +00:00
|
|
|
|
2024-04-08 13:53:49 +00:00
|
|
|
expect(described_class.signed_in_recently)
|
|
|
|
.to contain_exactly(recent_sign_in_user)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'not_signed_in_recently' do
|
|
|
|
it 'returns a relation of users who have not signed in during the recent period' do
|
|
|
|
no_recent_sign_in_user = Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
|
|
|
|
Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
|
|
|
|
|
|
|
|
expect(described_class.not_signed_in_recently)
|
|
|
|
.to contain_exactly(no_recent_sign_in_user)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'account_not_suspended' do
|
|
|
|
it 'returns with linked accounts that are not suspended' do
|
|
|
|
suspended_account = Fabricate(:account, suspended_at: 10.days.ago)
|
|
|
|
non_suspended_account = Fabricate(:account, suspended_at: nil)
|
|
|
|
suspended_user = Fabricate(:user, account: suspended_account)
|
|
|
|
non_suspended_user = Fabricate(:user, account: non_suspended_account)
|
|
|
|
|
|
|
|
expect(described_class.account_not_suspended)
|
|
|
|
.to include(non_suspended_user)
|
|
|
|
.and not_include(suspended_user)
|
2017-05-30 13:28:56 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'matches_email' do
|
|
|
|
it 'returns a relation of users whose email starts with the given string' do
|
|
|
|
specified = Fabricate(:user, email: 'specified@spec')
|
|
|
|
Fabricate(:user, email: 'unspecified@spec')
|
|
|
|
|
2023-06-06 11:58:33 +00:00
|
|
|
expect(described_class.matches_email('specified')).to contain_exactly(specified)
|
2017-05-30 13:28:56 +00:00
|
|
|
end
|
|
|
|
end
|
2022-02-16 12:14:53 +00:00
|
|
|
|
|
|
|
describe 'matches_ip' do
|
|
|
|
it 'returns a relation of users whose ip address is matching with the given CIDR' do
|
|
|
|
user1 = Fabricate(:user)
|
|
|
|
user2 = Fabricate(:user)
|
|
|
|
Fabricate(:session_activation, user: user1, ip: '2160:2160::22', session_id: '1')
|
|
|
|
Fabricate(:session_activation, user: user1, ip: '2160:2160::23', session_id: '2')
|
|
|
|
Fabricate(:session_activation, user: user2, ip: '2160:8888::24', session_id: '3')
|
|
|
|
Fabricate(:session_activation, user: user2, ip: '2160:8888::25', session_id: '4')
|
|
|
|
|
2023-06-06 11:58:33 +00:00
|
|
|
expect(described_class.matches_ip('2160:2160::/32')).to contain_exactly(user1)
|
2022-02-16 12:14:53 +00:00
|
|
|
end
|
|
|
|
end
|
2024-04-08 13:53:49 +00:00
|
|
|
|
|
|
|
def exceed_duration_window_days
|
|
|
|
described_class::ACTIVE_DURATION + 2.days
|
|
|
|
end
|
|
|
|
|
|
|
|
def within_duration_window_days
|
|
|
|
described_class::ACTIVE_DURATION - 2.days
|
|
|
|
end
|
2017-04-05 01:31:26 +00:00
|
|
|
end
|
2017-04-05 01:27:38 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
describe 'email domains denylist integration' do
|
2023-11-07 09:10:36 +00:00
|
|
|
around do |example|
|
2024-08-13 07:37:32 +00:00
|
|
|
original = Rails.configuration.x.email_domains_denylist
|
2017-04-25 23:22:51 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
Rails.configuration.x.email_domains_denylist = 'mvrht.com'
|
2017-04-25 23:22:51 +00:00
|
|
|
|
|
|
|
example.run
|
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
Rails.configuration.x.email_domains_denylist = original
|
2017-04-25 23:22:51 +00:00
|
|
|
end
|
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
it 'allows a user with an email domain that is not on the denylist to be created' do
|
2023-06-06 11:58:33 +00:00
|
|
|
user = described_class.new(email: 'foo@example.com', account: account, password: password, agreement: true)
|
2017-04-04 15:04:44 +00:00
|
|
|
|
2023-05-23 14:49:11 +00:00
|
|
|
expect(user).to be_valid
|
2017-04-04 15:04:44 +00:00
|
|
|
end
|
2017-04-05 01:31:26 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
it 'does not allow a user with an email domain on the deylist to be created' do
|
2023-06-06 11:58:33 +00:00
|
|
|
user = described_class.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
|
2017-04-04 15:04:44 +00:00
|
|
|
|
2023-05-23 14:49:11 +00:00
|
|
|
expect(user).to_not be_valid
|
2017-04-04 15:04:44 +00:00
|
|
|
end
|
2017-04-25 23:22:51 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
it 'does not allow a user with an email where the subdomain is on the denylist to be created' do
|
2023-06-06 11:58:33 +00:00
|
|
|
user = described_class.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
|
2017-04-25 23:22:51 +00:00
|
|
|
|
2023-05-23 14:49:11 +00:00
|
|
|
expect(user).to_not be_valid
|
2017-04-25 23:22:51 +00:00
|
|
|
end
|
2017-04-04 15:04:44 +00:00
|
|
|
end
|
|
|
|
|
2024-11-25 08:18:10 +00:00
|
|
|
describe '#update_sign_in!' do
|
|
|
|
context 'with an existing user' do
|
|
|
|
let!(:user) { Fabricate :user, last_sign_in_at: 10.days.ago, current_sign_in_at: 1.hour.ago, sign_in_count: 123 }
|
|
|
|
|
|
|
|
context 'with new sign in false' do
|
|
|
|
it 'updates timestamps but not counts' do
|
|
|
|
expect { user.update_sign_in!(new_sign_in: false) }
|
|
|
|
.to change(user, :last_sign_in_at)
|
|
|
|
.and change(user, :current_sign_in_at)
|
|
|
|
.and not_change(user, :sign_in_count)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with new sign in true' do
|
|
|
|
it 'updates timestamps and counts' do
|
|
|
|
expect { user.update_sign_in!(new_sign_in: true) }
|
|
|
|
.to change(user, :last_sign_in_at)
|
|
|
|
.and change(user, :current_sign_in_at)
|
|
|
|
.and change(user, :sign_in_count).by(1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with a new user' do
|
|
|
|
let(:user) { Fabricate.build :user }
|
|
|
|
|
|
|
|
it 'does not persist the user' do
|
|
|
|
expect { user.update_sign_in! }
|
|
|
|
.to_not change(user, :persisted?).from(false)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-04-23 02:43:42 +00:00
|
|
|
describe '#confirmed?' do
|
|
|
|
it 'returns true when a confirmed_at is set' do
|
|
|
|
user = Fabricate.build(:user, confirmed_at: Time.now.utc)
|
|
|
|
expect(user.confirmed?).to be true
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false if a confirmed_at is nil' do
|
|
|
|
user = Fabricate.build(:user, confirmed_at: nil)
|
|
|
|
expect(user.confirmed?).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-01-04 23:15:35 +00:00
|
|
|
describe '#confirm' do
|
2023-01-24 18:40:21 +00:00
|
|
|
subject { user.confirm }
|
|
|
|
|
2023-02-20 04:24:14 +00:00
|
|
|
let(:new_email) { 'new-email@example.com' }
|
|
|
|
|
2023-01-24 18:40:21 +00:00
|
|
|
before do
|
|
|
|
allow(TriggerWebhookWorker).to receive(:perform_async)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user is already confirmed' do
|
|
|
|
let!(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: true, unconfirmed_email: new_email) }
|
|
|
|
|
2024-01-26 16:22:44 +00:00
|
|
|
it 'sets email to unconfirmed_email and does not trigger web hook' do
|
2023-01-24 18:40:21 +00:00
|
|
|
expect { subject }.to change { user.reload.email }.to(new_email)
|
|
|
|
|
2023-02-20 01:33:27 +00:00
|
|
|
expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
|
2023-01-24 18:40:21 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user is a new user' do
|
|
|
|
let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email) }
|
|
|
|
|
|
|
|
context 'when the user is already approved' do
|
|
|
|
before do
|
2023-12-19 15:17:22 +00:00
|
|
|
Setting.registrations_mode = 'approved'
|
2023-01-24 18:40:21 +00:00
|
|
|
user.approve!
|
|
|
|
end
|
|
|
|
|
2024-01-26 16:22:44 +00:00
|
|
|
it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
|
2023-01-24 18:40:21 +00:00
|
|
|
expect { subject }.to change { user.reload.email }.to(new_email)
|
|
|
|
|
|
|
|
expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user does not require explicit approval' do
|
2023-12-19 15:17:22 +00:00
|
|
|
before do
|
2023-01-24 18:40:21 +00:00
|
|
|
Setting.registrations_mode = 'open'
|
|
|
|
end
|
|
|
|
|
2024-01-26 16:22:44 +00:00
|
|
|
it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
|
2023-01-24 18:40:21 +00:00
|
|
|
expect { subject }.to change { user.reload.email }.to(new_email)
|
|
|
|
|
|
|
|
expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user requires explicit approval but is not approved' do
|
2023-12-19 15:17:22 +00:00
|
|
|
before do
|
2023-01-24 18:40:21 +00:00
|
|
|
Setting.registrations_mode = 'approved'
|
|
|
|
end
|
|
|
|
|
2024-01-26 16:22:44 +00:00
|
|
|
it 'sets email to unconfirmed_email and does not trigger web hook' do
|
2023-01-24 18:40:21 +00:00
|
|
|
expect { subject }.to change { user.reload.email }.to(new_email)
|
|
|
|
|
|
|
|
expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#approve!' do
|
|
|
|
subject { user.approve! }
|
|
|
|
|
|
|
|
before do
|
2023-12-19 15:17:22 +00:00
|
|
|
Setting.registrations_mode = 'approved'
|
2023-01-24 18:40:21 +00:00
|
|
|
allow(TriggerWebhookWorker).to receive(:perform_async)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user is already confirmed' do
|
|
|
|
let(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: false) }
|
|
|
|
|
2024-01-26 16:22:44 +00:00
|
|
|
it 'sets the approved flag and triggers `account.approved` web hook' do
|
2023-01-24 18:40:21 +00:00
|
|
|
expect { subject }.to change { user.reload.approved? }.to(true)
|
|
|
|
|
|
|
|
expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user is not confirmed' do
|
|
|
|
let(:user) { Fabricate(:user, confirmed_at: nil, approved: false) }
|
|
|
|
|
2024-01-26 16:22:44 +00:00
|
|
|
it 'sets the approved flag and does not trigger web hook' do
|
2023-01-24 18:40:21 +00:00
|
|
|
expect { subject }.to change { user.reload.approved? }.to(true)
|
|
|
|
|
2023-02-20 01:33:27 +00:00
|
|
|
expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
|
2023-01-24 18:40:21 +00:00
|
|
|
end
|
2018-01-04 23:15:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-05-02 19:07:12 +00:00
|
|
|
describe '#disable_two_factor!' do
|
2017-05-30 13:28:56 +00:00
|
|
|
it 'saves false for otp_required_for_login' do
|
2017-05-02 19:07:12 +00:00
|
|
|
user = Fabricate.build(:user, otp_required_for_login: true)
|
|
|
|
user.disable_two_factor!
|
2017-05-30 13:28:56 +00:00
|
|
|
expect(user.reload.otp_required_for_login).to be false
|
2017-05-02 19:07:12 +00: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 14:46:27 +00:00
|
|
|
it 'saves nil for otp_secret' do
|
|
|
|
user = Fabricate.build(:user, otp_secret: 'oldotpcode')
|
|
|
|
user.disable_two_factor!
|
2023-02-17 12:45:27 +00:00
|
|
|
expect(user.reload.otp_secret).to be_nil
|
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 14:46:27 +00:00
|
|
|
end
|
|
|
|
|
2017-05-30 13:28:56 +00:00
|
|
|
it 'saves cleared otp_backup_codes' do
|
2017-06-08 11:24:28 +00:00
|
|
|
user = Fabricate.build(:user, otp_backup_codes: %w(dummy dummy))
|
2017-05-02 19:07:12 +00:00
|
|
|
user.disable_two_factor!
|
2017-05-30 13:28:56 +00:00
|
|
|
expect(user.reload.otp_backup_codes.empty?).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#send_confirmation_instructions' do
|
|
|
|
around do |example|
|
|
|
|
queue_adapter = ActiveJob::Base.queue_adapter
|
|
|
|
example.run
|
|
|
|
ActiveJob::Base.queue_adapter = queue_adapter
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'delivers confirmation instructions later' do
|
|
|
|
user = Fabricate(:user)
|
|
|
|
ActiveJob::Base.queue_adapter = :test
|
|
|
|
|
2021-03-24 09:44:31 +00:00
|
|
|
expect { user.send_confirmation_instructions }.to have_enqueued_job(ActionMailer::MailDeliveryJob)
|
2017-05-30 13:28:56 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-11-15 15:05:20 +00:00
|
|
|
describe 'settings' do
|
2023-03-30 12:44:00 +00:00
|
|
|
it 'is instance of UserSettings' do
|
2017-05-30 13:28:56 +00:00
|
|
|
user = Fabricate(:user)
|
2023-03-30 12:44:00 +00:00
|
|
|
expect(user.settings).to be_a UserSettings
|
2017-05-30 13:28:56 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#setting_default_privacy' do
|
|
|
|
it 'returns default privacy setting if user has configured' do
|
|
|
|
user = Fabricate(:user)
|
|
|
|
user.settings[:default_privacy] = 'unlisted'
|
|
|
|
expect(user.setting_default_privacy).to eq 'unlisted'
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns 'private' if user has not configured default privacy setting and account is locked" do
|
2022-01-27 23:46:42 +00:00
|
|
|
user = Fabricate(:account, locked: true).user
|
2017-05-30 13:28:56 +00:00
|
|
|
expect(user.setting_default_privacy).to eq 'private'
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns 'public' if user has not configured default privacy setting and account is not locked" do
|
2022-01-27 23:46:42 +00:00
|
|
|
user = Fabricate(:account, locked: false).user
|
2017-05-30 13:28:56 +00:00
|
|
|
expect(user.setting_default_privacy).to eq 'public'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
describe 'allowlist integration' do
|
2023-11-07 09:10:36 +00:00
|
|
|
around do |example|
|
2024-08-13 07:37:32 +00:00
|
|
|
original = Rails.configuration.x.email_domains_allowlist
|
2017-04-04 15:04:44 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
Rails.configuration.x.email_domains_allowlist = 'mastodon.space'
|
2017-04-04 15:04:44 +00:00
|
|
|
|
|
|
|
example.run
|
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
Rails.configuration.x.email_domains_allowlist = original
|
2017-04-04 15:04:44 +00:00
|
|
|
end
|
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
it 'does not allow a user to be created when their email is not on the allowlist' do
|
2023-06-06 11:58:33 +00:00
|
|
|
user = described_class.new(email: 'foo@example.com', account: account, password: password, agreement: true)
|
2023-05-23 14:49:11 +00:00
|
|
|
expect(user).to_not be_valid
|
2017-04-04 15:04:44 +00:00
|
|
|
end
|
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
it 'allows a user to be created when their email is on the allowlist' do
|
2023-06-06 11:58:33 +00:00
|
|
|
user = described_class.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
|
2023-05-23 14:49:11 +00:00
|
|
|
expect(user).to be_valid
|
2017-04-05 01:27:38 +00:00
|
|
|
end
|
2017-04-25 23:22:51 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
it 'does not allow a user with an email subdomain included on the top level domain allowlist to be created' do
|
2023-06-06 11:58:33 +00:00
|
|
|
user = described_class.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
|
2023-05-23 14:49:11 +00:00
|
|
|
expect(user).to_not be_valid
|
2017-04-25 23:22:51 +00:00
|
|
|
end
|
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
context 'with a subdomain on the denylist' do
|
2017-05-30 13:28:56 +00:00
|
|
|
around do |example|
|
2024-08-13 07:37:32 +00:00
|
|
|
original = Rails.configuration.x.email_domains_denylist
|
2017-05-30 13:28:56 +00:00
|
|
|
example.run
|
2024-08-13 07:37:32 +00:00
|
|
|
Rails.configuration.x.email_domains_denylist = original
|
2017-05-30 13:28:56 +00:00
|
|
|
end
|
2017-04-25 23:22:51 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
it 'does not allow a user to be created with an email subdomain on the denylist even if the top domain is on the allowlist' do
|
|
|
|
Rails.configuration.x.email_domains_denylist = 'denylisted.mastodon.space'
|
2017-04-25 23:22:51 +00:00
|
|
|
|
2024-08-13 07:37:32 +00:00
|
|
|
user = described_class.new(email: 'foo@denylisted.mastodon.space', account: account, password: password)
|
2023-05-23 14:49:11 +00:00
|
|
|
expect(user).to_not be_valid
|
2017-05-30 13:28:56 +00:00
|
|
|
end
|
2017-04-25 23:22:51 +00:00
|
|
|
end
|
2017-04-04 22:29:56 +00:00
|
|
|
end
|
2017-06-04 15:07:39 +00:00
|
|
|
|
2024-10-15 13:43:08 +00:00
|
|
|
describe '#token_for_app' do
|
2017-08-22 16:33:57 +00:00
|
|
|
let(:user) { Fabricate(:user) }
|
|
|
|
|
2024-10-15 13:43:08 +00:00
|
|
|
context 'when user owns app but does not have tokens' do
|
|
|
|
let(:app) { Fabricate(:application, owner: user) }
|
|
|
|
|
|
|
|
it 'creates and returns a persisted token' do
|
|
|
|
expect { user.token_for_app(app) }
|
|
|
|
.to change(Doorkeeper::AccessToken.where(resource_owner_id: user.id, application: app), :count).by(1)
|
|
|
|
end
|
2017-08-22 16:33:57 +00:00
|
|
|
end
|
|
|
|
|
2024-10-15 13:43:08 +00:00
|
|
|
context 'when user owns app and already has tokens' do
|
|
|
|
let(:app) { Fabricate(:application, owner: user) }
|
|
|
|
let!(:token) { Fabricate :access_token, application: app, resource_owner_id: user.id }
|
|
|
|
|
|
|
|
it 'returns a persisted token' do
|
|
|
|
expect(user.token_for_app(app))
|
|
|
|
.to be_a(Doorkeeper::AccessToken)
|
|
|
|
.and eq(token)
|
|
|
|
end
|
2017-08-22 16:33:57 +00:00
|
|
|
end
|
|
|
|
|
2024-10-15 13:43:08 +00:00
|
|
|
context 'when user does not own app' do
|
|
|
|
let(:app) { Fabricate(:application) }
|
2017-08-22 16:33:57 +00:00
|
|
|
|
2024-10-15 13:43:08 +00:00
|
|
|
it 'returns nil' do
|
|
|
|
expect(user.token_for_app(app))
|
|
|
|
.to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when app is nil' do
|
|
|
|
it 'returns nil' do
|
|
|
|
expect(user.token_for_app(nil))
|
|
|
|
.to be_nil
|
|
|
|
end
|
2017-08-22 16:33:57 +00:00
|
|
|
end
|
|
|
|
end
|
2017-11-27 15:07:59 +00:00
|
|
|
|
2018-05-02 12:13:52 +00:00
|
|
|
describe '#disable!' do
|
|
|
|
subject(:user) { Fabricate(:user, disabled: false, current_sign_in_at: current_sign_in_at, last_sign_in_at: nil) }
|
2023-02-20 01:46:00 +00:00
|
|
|
|
2018-05-02 12:13:52 +00:00
|
|
|
let(:current_sign_in_at) { Time.zone.now }
|
|
|
|
|
|
|
|
before do
|
|
|
|
user.disable!
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'disables user' do
|
2020-01-25 04:22:35 +00:00
|
|
|
expect(user).to have_attributes(disabled: true)
|
2018-05-02 12:13:52 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#enable!' do
|
|
|
|
subject(:user) { Fabricate(:user, disabled: true) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
user.enable!
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'enables user' do
|
|
|
|
expect(user).to have_attributes(disabled: false)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-07-08 03:31:28 +00:00
|
|
|
describe '#reset_password!' do
|
2024-09-23 09:18:04 +00:00
|
|
|
subject(:user) { Fabricate(:user, password: original_password) }
|
|
|
|
|
|
|
|
let(:original_password) { 'foobar12345' }
|
2021-07-08 03:31:28 +00:00
|
|
|
|
|
|
|
let!(:session_activation) { Fabricate(:session_activation, user: user) }
|
|
|
|
let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
|
|
|
|
let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
|
|
|
|
|
2024-02-14 14:15:34 +00:00
|
|
|
let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
|
|
|
|
|
2024-09-23 09:18:04 +00:00
|
|
|
before { stub_redis }
|
|
|
|
|
|
|
|
it 'changes the password immediately and revokes related access' do
|
|
|
|
expect { user.reset_password! }
|
|
|
|
.to remove_activated_sessions
|
|
|
|
.and remove_active_user_tokens
|
|
|
|
.and remove_user_web_subscriptions
|
2021-07-08 03:31:28 +00:00
|
|
|
|
2024-09-23 09:18:04 +00:00
|
|
|
expect(user)
|
|
|
|
.to_not be_external_or_valid_password(original_password)
|
|
|
|
expect { session_activation.reload }
|
|
|
|
.to raise_error(ActiveRecord::RecordNotFound)
|
|
|
|
expect { web_push_subscription.reload }
|
|
|
|
.to raise_error(ActiveRecord::RecordNotFound)
|
|
|
|
expect(redis_pipeline_stub)
|
|
|
|
.to have_received(:publish).with("timeline:access_token:#{access_token.id}", Oj.dump(event: :kill)).once
|
2021-07-08 03:31:28 +00:00
|
|
|
end
|
|
|
|
|
2024-09-23 09:18:04 +00:00
|
|
|
def remove_activated_sessions
|
|
|
|
change(user.session_activations, :count).to(0)
|
2021-07-08 03:31:28 +00:00
|
|
|
end
|
|
|
|
|
2024-09-23 09:18:04 +00:00
|
|
|
def remove_active_user_tokens
|
|
|
|
change { Doorkeeper::AccessToken.active_for(user).count }.to(0)
|
2021-07-08 03:31:28 +00:00
|
|
|
end
|
|
|
|
|
2024-09-23 09:18:04 +00:00
|
|
|
def remove_user_web_subscriptions
|
|
|
|
change { Web::PushSubscription.where(user: user).or(Web::PushSubscription.where(access_token: access_token)).count }.to(0)
|
2024-02-14 14:15:34 +00:00
|
|
|
end
|
|
|
|
|
2024-09-23 09:18:04 +00:00
|
|
|
def stub_redis
|
|
|
|
allow(redis)
|
|
|
|
.to receive(:pipelined)
|
|
|
|
.and_yield(redis_pipeline_stub)
|
2021-07-08 03:31:28 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2024-01-15 18:04:58 +00:00
|
|
|
describe '#mark_email_as_confirmed!' do
|
2024-02-16 13:01:04 +00:00
|
|
|
subject { user.mark_email_as_confirmed! }
|
2018-05-02 12:13:52 +00:00
|
|
|
|
2024-02-16 13:01:04 +00:00
|
|
|
let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
|
|
|
|
|
2018-05-02 12:13:52 +00:00
|
|
|
context 'when user is new' do
|
|
|
|
let(:confirmed_at) { nil }
|
|
|
|
|
2024-07-08 16:01:08 +00:00
|
|
|
it 'confirms user and delivers welcome email', :inline_jobs do
|
2024-02-19 15:57:47 +00:00
|
|
|
emails = capture_emails { subject }
|
2018-05-02 12:13:52 +00:00
|
|
|
|
2024-02-16 13:01:04 +00:00
|
|
|
expect(user.confirmed_at).to be_present
|
2024-02-19 15:57:47 +00:00
|
|
|
expect(emails.size)
|
|
|
|
.to eq(1)
|
|
|
|
expect(emails.first)
|
|
|
|
.to have_attributes(
|
|
|
|
to: contain_exactly(user.email),
|
|
|
|
subject: eq(I18n.t('user_mailer.welcome.subject'))
|
|
|
|
)
|
2018-05-02 12:13:52 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not new' do
|
|
|
|
let(:confirmed_at) { Time.zone.now }
|
|
|
|
|
2024-02-16 13:01:04 +00:00
|
|
|
it 'confirms user but does not deliver welcome email' do
|
2024-02-19 15:57:47 +00:00
|
|
|
emails = capture_emails { subject }
|
2018-05-02 12:13:52 +00:00
|
|
|
|
2024-02-16 13:01:04 +00:00
|
|
|
expect(user.confirmed_at).to be_present
|
2024-02-19 15:57:47 +00:00
|
|
|
expect(emails).to be_empty
|
2018-05-02 12:13:52 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#active_for_authentication?' do
|
|
|
|
subject { user.active_for_authentication? }
|
2023-02-20 01:46:00 +00:00
|
|
|
|
2018-05-02 12:13:52 +00:00
|
|
|
let(:user) { Fabricate(:user, disabled: disabled, confirmed_at: confirmed_at) }
|
|
|
|
|
|
|
|
context 'when user is disabled' do
|
|
|
|
let(:disabled) { true }
|
|
|
|
|
|
|
|
context 'when user is confirmed' do
|
|
|
|
let(:confirmed_at) { Time.zone.now }
|
|
|
|
|
2018-08-23 21:26:29 +00:00
|
|
|
it { is_expected.to be true }
|
2018-05-02 12:13:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not confirmed' do
|
|
|
|
let(:confirmed_at) { nil }
|
|
|
|
|
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 08:48:50 +00:00
|
|
|
it { is_expected.to be true }
|
2018-05-02 12:13:52 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not disabled' do
|
|
|
|
let(:disabled) { false }
|
|
|
|
|
|
|
|
context 'when user is confirmed' do
|
|
|
|
let(:confirmed_at) { Time.zone.now }
|
|
|
|
|
|
|
|
it { is_expected.to be true }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not confirmed' do
|
|
|
|
let(:confirmed_at) { nil }
|
|
|
|
|
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 08:48:50 +00:00
|
|
|
it { is_expected.to be true }
|
2018-05-02 12:13:52 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2022-07-05 00:41:40 +00:00
|
|
|
|
|
|
|
describe '.those_who_can' do
|
2023-06-06 11:58:33 +00:00
|
|
|
before { Fabricate(:user, role: UserRole.find_by(name: 'Moderator')) }
|
2023-04-29 20:03:36 +00:00
|
|
|
|
|
|
|
context 'when there are not any user roles' do
|
|
|
|
before { UserRole.destroy_all }
|
|
|
|
|
|
|
|
it 'returns an empty list' do
|
2023-06-06 11:58:33 +00:00
|
|
|
expect(described_class.those_who_can(:manage_blocks)).to eq([])
|
2023-04-29 20:03:36 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there are not users with the needed role' do
|
|
|
|
it 'returns an empty list' do
|
2023-06-06 11:58:33 +00:00
|
|
|
expect(described_class.those_who_can(:manage_blocks)).to eq([])
|
2023-04-29 20:03:36 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there are users with roles' do
|
|
|
|
let!(:admin_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
|
|
|
|
|
|
|
|
it 'returns the users with the role' do
|
2023-06-06 11:58:33 +00:00
|
|
|
expect(described_class.those_who_can(:manage_blocks)).to eq([admin_user])
|
2023-04-29 20:03:36 +00:00
|
|
|
end
|
|
|
|
end
|
2022-07-05 00:41:40 +00:00
|
|
|
end
|
2024-11-15 15:52:37 +00:00
|
|
|
|
|
|
|
describe '#applications_last_used' do
|
|
|
|
let!(:user) { Fabricate(:user) }
|
|
|
|
|
|
|
|
let!(:never_used_application) { Fabricate :application, owner: user }
|
|
|
|
let!(:application_one) { Fabricate :application, owner: user }
|
|
|
|
let!(:application_two) { Fabricate :application, owner: user }
|
|
|
|
|
|
|
|
before do
|
|
|
|
_other_user_token = Fabricate :access_token, last_used_at: 3.days.ago
|
|
|
|
_never_used_token = Fabricate :access_token, application: never_used_application, resource_owner_id: user.id, last_used_at: nil
|
|
|
|
_app_one_old_token = Fabricate :access_token, application: application_one, resource_owner_id: user.id, last_used_at: 5.days.ago
|
|
|
|
_app_one_new_token = Fabricate :access_token, application: application_one, resource_owner_id: user.id, last_used_at: 1.day.ago
|
|
|
|
_never_used_token = Fabricate :access_token, application: application_two, resource_owner_id: user.id, last_used_at: 5.days.ago
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns a hash of unique applications with last used values' do
|
|
|
|
expect(user.applications_last_used)
|
|
|
|
.to include(application_one.id => be_within(1.0).of(1.day.ago))
|
|
|
|
.and include(application_two.id => be_within(1.0).of(5.days.ago))
|
|
|
|
.and not_include(never_used_application.id)
|
|
|
|
end
|
|
|
|
end
|
2016-02-22 15:00:20 +00:00
|
|
|
end
|