kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-ssh-key-mutation' into 'master'

Browse source 
Ensure key fingerprints are generated correctly when modified

See merge request gitlab-org/gitlab-ce!14663
This commit is contained in:
Douwe Maan 2017-10-04 08:06:49 +00:00
commit f0b4fe2fc2
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/key.rb
View file

@ -34,6 +34,7 @@ class Key < ActiveRecord::Base
value&.delete!("\n\r") value&.delete!("\n\r")
value.strip! unless value.blank? value.strip! unless value.blank?
write_attribute(:key, value) write_attribute(:key, value)
@public_key = nil
end end
def publishable_key def publishable_key

10
spec/models/key_spec.rb
View file

@ -155,5 +155,15 @@ describe Key, :mailer do
it 'strips white spaces' do it 'strips white spaces' do
expect(described_class.new(key: " #{valid_key} ").key).to eq(valid_key) expect(described_class.new(key: " #{valid_key} ").key).to eq(valid_key)
end 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
end end