b3566a0104
This makes things simpler as no scheduling is involved. Further we remove the need for running a SELECT + UPDATE just to get the key and update it, whereas we only need an UPDATE when setting last_used_at directly in a request. The added service class takes care of updating Key#last_used_at without using Sidekiq. Further it makes sure we only try to obtain a Redis lease if we're confident that we actually need to do so, instead of always obtaining it. We also make sure to _only_ update last_used_at instead of also updating updated_at. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
159 lines
4.8 KiB
Ruby
159 lines
4.8 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Key, :mailer do
|
|
include Gitlab::CurrentSettings
|
|
|
|
describe 'modules' do
|
|
subject { described_class }
|
|
it { is_expected.to include_module(Gitlab::CurrentSettings) }
|
|
end
|
|
|
|
describe "Associations" do
|
|
it { is_expected.to belong_to(:user) }
|
|
end
|
|
|
|
describe "Validation" do
|
|
it { is_expected.to validate_presence_of(:title) }
|
|
it { is_expected.to validate_length_of(:title).is_at_most(255) }
|
|
|
|
it { is_expected.to validate_presence_of(:key) }
|
|
it { is_expected.to validate_length_of(:key).is_at_most(5000) }
|
|
it { is_expected.to allow_value(attributes_for(:rsa_key_2048)[:key]).for(:key) }
|
|
it { is_expected.to allow_value(attributes_for(:dsa_key_2048)[:key]).for(:key) }
|
|
it { is_expected.to allow_value(attributes_for(:ecdsa_key_256)[:key]).for(:key) }
|
|
it { is_expected.to allow_value(attributes_for(:ed25519_key_256)[:key]).for(:key) }
|
|
it { is_expected.not_to allow_value('foo-bar').for(:key) }
|
|
end
|
|
|
|
describe "Methods" do
|
|
let(:user) { create(:user) }
|
|
it { is_expected.to respond_to :projects }
|
|
it { is_expected.to respond_to :publishable_key }
|
|
|
|
describe "#publishable_keys" do
|
|
it 'replaces SSH key comment with simple identifier of username + hostname' do
|
|
expect(build(:key, user: user).publishable_key).to include("#{user.name} (#{Gitlab.config.gitlab.host})")
|
|
end
|
|
end
|
|
|
|
describe "#update_last_used_at" do
|
|
it 'updates the last used timestamp' do
|
|
key = build(:key)
|
|
service = double(:service)
|
|
|
|
expect(Keys::LastUsedService).to receive(:new)
|
|
.with(key)
|
|
.and_return(service)
|
|
|
|
expect(service).to receive(:execute)
|
|
|
|
key.update_last_used_at
|
|
end
|
|
end
|
|
end
|
|
|
|
context "validation of uniqueness (based on fingerprint uniqueness)" do
|
|
let(:user) { create(:user) }
|
|
|
|
it "accepts the key once" do
|
|
expect(build(:key, user: user)).to be_valid
|
|
end
|
|
|
|
it "does not accept the exact same key twice" do
|
|
first_key = create(:key, user: user)
|
|
|
|
expect(build(:key, user: user, key: first_key.key)).not_to be_valid
|
|
end
|
|
|
|
it "does not accept a duplicate key with a different comment" do
|
|
first_key = create(:key, user: user)
|
|
duplicate = build(:key, user: user, key: first_key.key)
|
|
duplicate.key << ' extra comment'
|
|
|
|
expect(duplicate).not_to be_valid
|
|
end
|
|
end
|
|
|
|
context "validate it is a fingerprintable key" do
|
|
it "accepts the fingerprintable key" do
|
|
expect(build(:key)).to be_valid
|
|
end
|
|
|
|
it 'accepts a key with newline charecters after stripping them' do
|
|
key = build(:key)
|
|
key.key = key.key.insert(100, "\n")
|
|
key.key = key.key.insert(40, "\r\n")
|
|
expect(key).to be_valid
|
|
end
|
|
|
|
it 'rejects the unfingerprintable key (not a key)' do
|
|
expect(build(:key, key: 'ssh-rsa an-invalid-key==')).not_to be_valid
|
|
end
|
|
end
|
|
|
|
context 'validate it meets key restrictions' do
|
|
where(:factory, :minimum, :result) do
|
|
forbidden = ApplicationSetting::FORBIDDEN_KEY_VALUE
|
|
|
|
[
|
|
[:rsa_key_2048, 0, true],
|
|
[:dsa_key_2048, 0, true],
|
|
[:ecdsa_key_256, 0, true],
|
|
[:ed25519_key_256, 0, true],
|
|
|
|
[:rsa_key_2048, 1024, true],
|
|
[:rsa_key_2048, 2048, true],
|
|
[:rsa_key_2048, 4096, false],
|
|
|
|
[:dsa_key_2048, 1024, true],
|
|
[:dsa_key_2048, 2048, true],
|
|
[:dsa_key_2048, 4096, false],
|
|
|
|
[:ecdsa_key_256, 256, true],
|
|
[:ecdsa_key_256, 384, false],
|
|
|
|
[:ed25519_key_256, 256, true],
|
|
[:ed25519_key_256, 384, false],
|
|
|
|
[:rsa_key_2048, forbidden, false],
|
|
[:dsa_key_2048, forbidden, false],
|
|
[:ecdsa_key_256, forbidden, false],
|
|
[:ed25519_key_256, forbidden, false]
|
|
]
|
|
end
|
|
|
|
with_them do
|
|
subject(:key) { build(factory) }
|
|
|
|
before do
|
|
stub_application_setting("#{key.public_key.type}_key_restriction" => minimum)
|
|
end
|
|
|
|
it { expect(key.valid?).to eq(result) }
|
|
end
|
|
end
|
|
|
|
context 'callbacks' do
|
|
it 'adds new key to authorized_file' do
|
|
key = build(:personal_key, id: 7)
|
|
expect(GitlabShellWorker).to receive(:perform_async).with(:add_key, key.shell_id, key.key)
|
|
key.save!
|
|
end
|
|
|
|
it 'removes key from authorized_file' do
|
|
key = create(:personal_key)
|
|
expect(GitlabShellWorker).to receive(:perform_async).with(:remove_key, key.shell_id, key.key)
|
|
key.destroy
|
|
end
|
|
end
|
|
|
|
describe '#key=' do
|
|
let(:valid_key) do
|
|
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0= dummy@gitlab.com"
|
|
end
|
|
|
|
it 'strips white spaces' do
|
|
expect(described_class.new(key: " #{valid_key} ").key).to eq(valid_key)
|
|
end
|
|
end
|
|
end
|