Fix certificate validators
This commit is contained in:
parent
8f09ec2837
commit
63eb415610
|
@ -16,7 +16,7 @@ class CertificateKeyValidator < ActiveModel::EachValidator
|
||||||
private
|
private
|
||||||
|
|
||||||
def valid_private_key_pem?(value)
|
def valid_private_key_pem?(value)
|
||||||
return unless value
|
return false unless value
|
||||||
pkey = OpenSSL::PKey::RSA.new(value)
|
pkey = OpenSSL::PKey::RSA.new(value)
|
||||||
pkey.private?
|
pkey.private?
|
||||||
rescue OpenSSL::PKey::PKeyError
|
rescue OpenSSL::PKey::PKeyError
|
||||||
|
|
|
@ -16,9 +16,9 @@ class CertificateValidator < ActiveModel::EachValidator
|
||||||
private
|
private
|
||||||
|
|
||||||
def valid_certificate_pem?(value)
|
def valid_certificate_pem?(value)
|
||||||
return unless value
|
return false unless value
|
||||||
OpenSSL::X509::Certificate.new(value)
|
OpenSSL::X509::Certificate.new(value).present?
|
||||||
rescue OpenSSL::X509::CertificateError
|
rescue OpenSSL::X509::CertificateError
|
||||||
nil
|
false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue