5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
59 lines
2 KiB
Ruby
59 lines
2 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Gitlab::Auth::UniqueIpsLimiter, :clean_gitlab_redis_shared_state do
|
|
include_context 'unique ips sign in limit'
|
|
let(:user) { create(:user) }
|
|
|
|
describe '#count_unique_ips' do
|
|
context 'non unique IPs' do
|
|
it 'properly counts them' do
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip1')).to eq(1)
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip1')).to eq(1)
|
|
end
|
|
end
|
|
|
|
context 'unique IPs' do
|
|
it 'properly counts them' do
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip2')).to eq(1)
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip3')).to eq(2)
|
|
end
|
|
end
|
|
|
|
it 'resets count after specified time window' do
|
|
Timecop.freeze do
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip2')).to eq(1)
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip3')).to eq(2)
|
|
|
|
Timecop.travel(Time.now.utc + described_class.config.unique_ips_limit_time_window) do
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip4')).to eq(1)
|
|
expect(described_class.update_and_return_ips_count(user.id, 'ip5')).to eq(2)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#limit_user!' do
|
|
include_examples 'user login operation with unique ip limit' do
|
|
def operation
|
|
described_class.limit_user! { user }
|
|
end
|
|
end
|
|
|
|
context 'allow 2 unique ips' do
|
|
before do
|
|
Gitlab::CurrentSettings.current_application_settings.update!(unique_ips_limit_per_user: 2)
|
|
end
|
|
|
|
it 'blocks user trying to login from third ip' do
|
|
change_ip('ip1')
|
|
expect(described_class.limit_user! { user }).to eq(user)
|
|
|
|
change_ip('ip2')
|
|
expect(described_class.limit_user! { user }).to eq(user)
|
|
|
|
change_ip('ip3')
|
|
expect { described_class.limit_user! { user } }.to raise_error(Gitlab::Auth::TooManyIps)
|
|
end
|
|
end
|
|
end
|
|
end
|