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

Fix certificate validators

This commit is contained in:
Kamil Trzcinski 2016-02-16 14:40:54 +01:00 committed by James Edwards-Jones
parent 8f09ec2837
commit 63eb415610
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/validators/certificate_key_validator.rb
View File

@ -16,7 +16,7 @@ class CertificateKeyValidator < ActiveModel::EachValidator
private
def valid_private_key_pem?(value)
return unless value
return false unless value
pkey = OpenSSL::PKey::RSA.new(value)
pkey.private?
rescue OpenSSL::PKey::PKeyError

6
app/validators/certificate_validator.rb
View File

@ -16,9 +16,9 @@ class CertificateValidator < ActiveModel::EachValidator
private
def valid_certificate_pem?(value)
return unless value
OpenSSL::X509::Certificate.new(value)
return false unless value
OpenSSL::X509::Certificate.new(value).present?
rescue OpenSSL::X509::CertificateError
nil
false
end
end