summaryrefslogtreecommitdiff
path: root/lib/gitlab/ssh_public_key.rb
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2018-02-12 12:39:47 -0500
committerRubén Dávila <ruben@gitlab.com>2018-02-12 12:39:47 -0500
commit740499bab5524d490218fd36033402cf67ec49f0 (patch)
treef1d0f12360823fc75b79fe873d1c7f89bdf66bf9 /lib/gitlab/ssh_public_key.rb
parent80c1626b2776b300acaaee85d11012b96893d004 (diff)
downloadgitlab-ce-740499bab5524d490218fd36033402cf67ec49f0.tar.gz
Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'"rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key
This reverts commit a58f8c32c62bcf5824d1fe1d0de53e9bda974d65, reversing changes made to cd5d75c362cdf06efb8174eddfbd0f4b65687dec.
Diffstat (limited to 'lib/gitlab/ssh_public_key.rb')
-rw-r--r--lib/gitlab/ssh_public_key.rb28
1 files changed, 6 insertions, 22 deletions
diff --git a/lib/gitlab/ssh_public_key.rb b/lib/gitlab/ssh_public_key.rb
index 545e7c74f7e..89ca1298120 100644
--- a/lib/gitlab/ssh_public_key.rb
+++ b/lib/gitlab/ssh_public_key.rb
@@ -21,22 +21,6 @@ module Gitlab
technology(name)&.supported_sizes
end
- def self.sanitize(key_content)
- ssh_type, *parts = key_content.strip.split
-
- return key_content if parts.empty?
-
- parts.each_with_object("#{ssh_type} ").with_index do |(part, content), index|
- content << part
-
- if Gitlab::SSHPublicKey.new(content).valid?
- break [content, parts[index + 1]].compact.join(' ') # Add the comment part if present
- elsif parts.size == index + 1 # return original content if we've reached the last element
- break key_content
- end
- end
- end
-
attr_reader :key_text, :key
# Unqualified MD5 fingerprint for compatibility
@@ -53,23 +37,23 @@ module Gitlab
end
def valid?
- key.present? && bits && technology.supported_sizes.include?(bits)
+ key.present?
end
def type
- technology.name if key.present?
+ technology.name if valid?
end
def bits
- return if key.blank?
+ return unless valid?
case type
when :rsa
- key.n&.num_bits
+ key.n.num_bits
when :dsa
- key.p&.num_bits
+ key.p.num_bits
when :ecdsa
- key.group.order&.num_bits
+ key.group.order.num_bits
when :ed25519
256
else