zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-28 21:46:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed password field in p12 container

Browse source
This commit is contained in:
oleghasjanov 2025-03-04 13:11:34 +02:00
parent 36968f363e
commit d85b93b8f2
4 changed files with 120 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/controllers/repp/v1/certificates_controller.rb
View file

@ -61,7 +61,12 @@ module Repp
)
result = generator.call
@certificate.update(crt: result[:crt], expires_at: result[:expires_at])
@certificate.update(
crt: result[:crt],
expires_at: result[:expires_at],
p12: result[:p12],
private_key: result[:private_key]
)
# Make sure we definitely call notify_admins
notify_admins
@ -83,8 +88,24 @@ module Repp
desc "Download a specific api user's specific certificate"
param :type, String, required: true, desc: 'Type of certificate (csr or crt)'
def download
filename = "#{@api_user.username}_#{Time.zone.today.strftime('%y%m%d')}_portal.#{params[:type]}.pem"
send_data @certificate[params[:type].to_s], filename: filename
extension = params[:type] == 'p12' ? 'p12' : 'pem'
filename = "#{@api_user.username}_#{Time.zone.today.strftime('%y%m%d')}_portal.#{extension}"
# Добавим логирование для отладки
Rails.logger.info("Download certificate type: #{params[:type]}")
Rails.logger.info("Certificate has p12: #{@certificate.p12.present?}")
data = if params[:type] == 'p12' && @certificate.p12.present?
Rails.logger.info("Decoding p12 from Base64")
decoded = Base64.decode64(@certificate.p12)
Rails.logger.info("Decoded p12 size: #{decoded.bytesize} bytes")
decoded
else
Rails.logger.info("Using raw data from certificate: #{params[:type]}")
@certificate[params[:type].to_s]
end
send_data data, filename: filename
end
private

16
app/models/certificate.rb
View file

@ -56,17 +56,27 @@ class Certificate < ApplicationRecord
return nil if private_key.blank?
decoded_key = Base64.decode64(private_key)
OpenSSL::PKey::RSA.new(decoded_key, Certificates::CertificateGenerator::CA_PASSWORD)
OpenSSL::PKey::RSA.new(decoded_key, Certificates::CertificateGenerator.ca_password)
rescue OpenSSL::PKey::RSAError
nil
end
# def parsed_p12
# return nil if p12.blank?
# decoded_p12 = Base64.decode64(p12)
# OpenSSL::PKCS12.new(decoded_p12)
# rescue OpenSSL::PKCS12::PKCS12Error
# nil
# end
def parsed_p12
return nil if p12.blank?
decoded_p12 = Base64.decode64(p12)
OpenSSL::PKCS12.new(decoded_p12)
rescue OpenSSL::PKCS12::PKCS12Error
OpenSSL::PKCS12.new(decoded_p12, '123456')
rescue OpenSSL::PKCS12::PKCS12Error => e
Rails.logger.error("Ошибка разбора PKCS12: #{e.message}")
nil
end

112
app/services/certificates/certificate_generator.rb
View file

@ -15,10 +15,31 @@ module Certificates
USER_CRT_NAME = 'user.crt'
USER_P12_NAME = 'user.p12'
# CA files
CA_CERT_PATH = Rails.root.join('test/fixtures/files/test_ca/certs/ca.crt.pem')
CA_KEY_PATH = Rails.root.join('test/fixtures/files/test_ca/private/ca.key.pem')
CA_PASSWORD = '123456'
# CA файлы - используем методы вместо констант для возможности переопределения из ENV
def self.ca_cert_path
ENV['ca_cert_path'] || Rails.root.join('test/fixtures/files/test_ca/certs/ca.crt.pem').to_s
end
def self.ca_key_path
ENV['ca_key_path'] || Rails.root.join('test/fixtures/files/test_ca/private/ca.key.pem').to_s
end
def self.ca_password
ENV['ca_key_password'] || '123456'
end
# Методы экземпляра для доступа к CA путям
def ca_cert_path
self.class.ca_cert_path
end
def ca_key_path
self.class.ca_key_path
end
def ca_password
self.class.ca_password
end
def initialize(*)
super
@ -44,20 +65,17 @@ module Certificates
cert = sign_certificate(csr)
# Only create p12 when we have the original key
p12 = user_csr ? nil : create_p12(key, cert)
# Always create p12 when we have a key, regardless of user_csr
p12_data = create_p12(key, cert)
result = {
csr: csr.to_pem,
crt: cert.to_pem,
expires_at: cert.not_after
expires_at: cert.not_after,
private_key: key.export(OpenSSL::Cipher.new('AES-256-CBC'), ca_password),
p12: p12_data
}
unless user_csr
result[:private_key] = key.export(OpenSSL::Cipher.new('AES-256-CBC'), CA_PASSWORD)
result[:p12] = p12.to_der if p12
end
result
end
@ -90,7 +108,7 @@ module Certificates
request.version = 0
request.subject = OpenSSL::X509::Name.new([
['CN', username, OpenSSL::ASN1::UTF8STRING],
['OU', registrar_code, OpenSSL::ASN1::UTF8STRING],
['OU', 'REGISTRAR', OpenSSL::ASN1::UTF8STRING],
['O', registrar_name, OpenSSL::ASN1::UTF8STRING]
])
@ -98,18 +116,18 @@ module Certificates
request.sign(key, OpenSSL::Digest::SHA256.new)
save_csr(request)
save_private_key(key.export(OpenSSL::Cipher.new('AES-256-CBC'), CA_PASSWORD))
save_private_key(key.export(OpenSSL::Cipher.new('AES-256-CBC'), ca_password))
[request, key]
end
def sign_certificate(csr)
begin
ca_key_content = File.read(CA_KEY_PATH)
ca_key_content = File.read(ca_key_path)
Rails.logger.debug("CA key file exists and has size: #{ca_key_content.size} bytes")
# Try different password combinations
passwords_to_try = [CA_PASSWORD, '', 'changeit', 'password']
passwords_to_try = [ca_password, '', 'changeit', 'password']
ca_key = nil
last_error = nil
@ -117,11 +135,11 @@ module Certificates
passwords_to_try.each do |password|
begin
ca_key = OpenSSL::PKey::RSA.new(ca_key_content, password)
Rails.logger.debug("Successfully loaded CA key with password: #{password == CA_PASSWORD ? 'default' : password}")
Rails.logger.debug("Successfully loaded CA key with password: #{password == ca_password ? 'default' : password}")
break
rescue => e
last_error = e
Rails.logger.debug("Failed to load CA key with password: #{password == CA_PASSWORD ? 'default' : password}, error: #{e.message}")
Rails.logger.debug("Failed to load CA key with password: #{password == ca_password ? 'default' : password}, error: #{e.message}")
end
end
@ -139,7 +157,7 @@ module Certificates
end
end
ca_cert = OpenSSL::X509::Certificate.new(File.read(CA_CERT_PATH))
ca_cert = OpenSSL::X509::Certificate.new(File.read(ca_cert_path))
cert = OpenSSL::X509::Certificate.new
cert.serial = Time.now.to_i + Random.rand(1000)
@ -165,7 +183,7 @@ module Certificates
cert
rescue => e
Rails.logger.error("Error signing certificate: #{e.message}")
Rails.logger.error("CA key path: #{CA_KEY_PATH}, exists: #{File.exist?(CA_KEY_PATH)}")
Rails.logger.error("CA key path: #{ca_key_path}, exists: #{File.exist?(ca_key_path)}")
# For test purposes, we'll create a self-signed certificate as a fallback
key = generate_key
@ -193,21 +211,57 @@ module Certificates
end
def create_p12(key, cert)
ca_cert = OpenSSL::X509::Certificate.new(File.read(CA_CERT_PATH))
ca_cert = OpenSSL::X509::Certificate.new(File.read(ca_cert_path))
p12 = OpenSSL::PKCS12.create(
nil, # password
username,
key,
cert,
[ca_cert]
)
Rails.logger.info("Creating PKCS12 container for #{username}")
Rails.logger.info("Certificate Subject: #{cert.subject}")
Rails.logger.info("Certificate Issuer: #{cert.issuer}")
# Используем стандартные алгоритмы для максимальной совместимости
# p12 = OpenSSL::PKCS12.create(
# # "changeit", # Стандартный пароль для Java keystore
# "",
# "#{username}",
# key,
# cert,
# [ca_cert]
# )
begin
p12 = OpenSSL::PKCS12.create(
'123456', # Используем пароль '123456'
username,
key,
cert,
[ca_cert],
"PBE-SHA1-3DES",
"PBE-SHA1-3DES",
2048,
2048 # Увеличиваем mac_iter до 2048 для совместимости
)
rescue => e
Rails.logger.error("Ошибка при создании PKCS12: #{e.message}")
raise
end
# # Преобразуем PKCS12 объект в бинарные данные
# p12_data = p12.to_der
# # Сохраняем копию для отладки
# pkcs12_path = CERTS_PATH.join(USER_P12_NAME)
# File.open(pkcs12_path, 'wb') do |file|
# file.write(p12_data)
# end
File.open(CERTS_PATH.join(USER_P12_NAME), 'wb') do |file|
file.write(p12.to_der)
end
p12
# Rails.logger.info("Created PKCS12 with standard algorithms (size: #{p12_data.bytesize} bytes)")
# Возвращаем бинарные данные
# p12_data
p12.to_der
end
def ensure_directories_exist

1
test/integration/p12_creation_test.rb
View file

@ -1 +0,0 @@