didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pdf signature validation and certs

Browse Source
This commit is contained in:
Alex Turchyn
2023-08-31 01:49:14 +03:00
parent c098e61947
commit c4daf8ed49
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/esign_settings_controller.rb
+4 -2
View File
@@ -42,9 +42,10 @@ class EsignSettingsController < ApplicationController
def create def create
@cert_record = CertFormRecord.new(**cert_params) @cert_record = CertFormRecord.new(**cert_params)
cert_configs = EncryptedConfig.find_by(account: current_account, key: EncryptedConfig::ESIGN_CERTS_KEY) cert_configs = EncryptedConfig.find_or_initialize_by(account: current_account,
key: EncryptedConfig::ESIGN_CERTS_KEY)
if cert_configs.value['custom']&.any? { |e| e['name'] == @cert_record.name } || if (cert_configs.value && cert_configs.value['custom']&.any? { |e| e['name'] == @cert_record.name }) ||
@cert_record.name == DEFAULT_CERT_NAME @cert_record.name == DEFAULT_CERT_NAME
@cert_record.errors.add(:name, 'already exists') @cert_record.errors.add(:name, 'already exists')
@@ -89,6 +90,7 @@ class EsignSettingsController < ApplicationController
def save_new_cert!(cert_configs, cert_record) def save_new_cert!(cert_configs, cert_record)
pkcs = OpenSSL::PKCS12.new(cert_record.file.read, cert_record.password) pkcs = OpenSSL::PKCS12.new(cert_record.file.read, cert_record.password)
cert_configs.value ||= {}
cert_configs.value['custom'] ||= [] cert_configs.value['custom'] ||= []
cert_configs.value['custom'].each { |e| e['status'] = 'validate' } cert_configs.value['custom'].each { |e| e['status'] = 'validate' }
cert_configs.value['custom'] << { cert_configs.value['custom'] << {
app/controllers/verify_pdf_signature_controller.rb
+5 -2
View File
@@ -7,8 +7,11 @@ class VerifyPdfSignatureController < ApplicationController
HexaPDF::Document.new(io: file.open) HexaPDF::Document.new(io: file.open)
end end
cert_data = EncryptedConfig.find_by(account: current_account, cert_data = if Docuseal.multitenant?
key: EncryptedConfig::ESIGN_CERTS_KEY)&.value || {} Docuseal::CERTS
else
EncryptedConfig.find_by(account:, key: EncryptedConfig::ESIGN_CERTS_KEY)&.value || {}
end
default_pkcs = GenerateCertificate.load_pkcs(cert_data) default_pkcs = GenerateCertificate.load_pkcs(cert_data)