Merge branch 'fix-ssh-key-mutation' into 'master'
Ensure key fingerprints are generated correctly when modified See merge request gitlab-org/gitlab-ce!14663
This commit is contained in:
commit
f0b4fe2fc2
2 changed files with 11 additions and 0 deletions
|
@ -34,6 +34,7 @@ class Key < ActiveRecord::Base
|
|||
value&.delete!("\n\r")
|
||||
value.strip! unless value.blank?
|
||||
write_attribute(:key, value)
|
||||
@public_key = nil
|
||||
end
|
||||
|
||||
def publishable_key
|
||||
|
|
|
@ -155,5 +155,15 @@ describe Key, :mailer do
|
|||
it 'strips white spaces' do
|
||||
expect(described_class.new(key: " #{valid_key} ").key).to eq(valid_key)
|
||||
end
|
||||
|
||||
it 'invalidates the public_key attribute' do
|
||||
key = build(:key)
|
||||
|
||||
original = key.public_key
|
||||
key.key = valid_key
|
||||
|
||||
expect(original.key_text).not_to be_nil
|
||||
expect(key.public_key.key_text).to eq(valid_key)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue