mirror of
https://github.com/internetee/registry.git
synced 2025-07-29 05:56:20 +02:00
fixed tests
This commit is contained in:
parent
0ba69ea848
commit
072f4440e2
7 changed files with 81 additions and 306 deletions
|
@ -150,11 +150,6 @@ module Repp
|
|||
crt = request.headers['User-Certificate']
|
||||
com = request.headers['User-Certificate-CN']
|
||||
|
||||
Rails.logger.info '============== crts =============='
|
||||
Rails.logger.info crt
|
||||
Rails.logger.info com
|
||||
Rails.logger.info '============== crts =============='
|
||||
|
||||
return if @current_user.pki_ok?(crt, com, api: false)
|
||||
|
||||
render_invalid_cert_response
|
||||
|
|
|
@ -39,8 +39,8 @@ module Repp
|
|||
extension = case params[:type]
|
||||
when 'p12' then 'p12'
|
||||
when 'private_key' then 'key'
|
||||
when 'csr' then 'csr'
|
||||
when 'crt' then 'crt'
|
||||
when 'csr' then 'csr.pem'
|
||||
when 'crt' then 'crt.pem'
|
||||
else 'pem'
|
||||
end
|
||||
|
||||
|
|
|
@ -80,12 +80,6 @@ class ApiUser < User
|
|||
cert = machine_readable_certificate(crt)
|
||||
md5 = OpenSSL::Digest::MD5.new(cert.to_der).to_s
|
||||
|
||||
Rails.logger.info '============== pki_ok? =============='
|
||||
Rails.logger.info md5
|
||||
Rails.logger.info com
|
||||
Rails.logger.info origin.exists?(md5: md5, common_name: com, revoked: false)
|
||||
Rails.logger.info '============== pki_ok? =============='
|
||||
|
||||
origin.exists?(md5: md5, common_name: com, revoked: false)
|
||||
end
|
||||
|
||||
|
|
|
@ -102,10 +102,10 @@ module Certificates
|
|||
ca_key = OpenSSL::PKey::RSA.new(File.read(ca_key_path), ca_password)
|
||||
|
||||
cert = OpenSSL::X509::Certificate.new
|
||||
cert.serial = self.class.generate_serial_number # Используем новый метод генерации серийного номера
|
||||
cert.serial = self.class.generate_serial_number
|
||||
cert.version = 2
|
||||
cert.not_before = Time.now
|
||||
cert.not_after = Time.now + 365 * 24 * 60 * 60 # 1 год
|
||||
cert.not_after = Time.now + 365 * 24 * 60 * 60 # TODO: 1 year (temporary)
|
||||
|
||||
cert.subject = csr.subject
|
||||
cert.public_key = csr.public_key
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue