mirror of
https://github.com/dyzulk/trustlab-api.git
synced 2026-01-26 05:15:35 +07:00
feat: fix CA setup identity and refine Archive Management Table with double sorting and CDN status
This commit is contained in:
@@ -60,12 +60,16 @@ class OpenSslService
|
|||||||
? $this->formatHex($rootDetails['serialNumberHex'])
|
? $this->formatHex($rootDetails['serialNumberHex'])
|
||||||
: $this->formatSerialToHex($rootDetails['serialNumber']);
|
: $this->formatSerialToHex($rootDetails['serialNumber']);
|
||||||
|
|
||||||
|
$familyId = (string) Str::uuid();
|
||||||
$ca = CaCertificate::create([
|
$ca = CaCertificate::create([
|
||||||
'ca_type' => 'root',
|
'ca_type' => 'root',
|
||||||
'cert_content' => $rootCertPem,
|
'cert_content' => $rootCertPem,
|
||||||
'key_content' => $rootKeyPem,
|
'key_content' => $rootKeyPem,
|
||||||
'serial_number' => $serialHex,
|
'serial_number' => $serialHex,
|
||||||
'common_name' => $rootDetails['subject']['CN'] ?? 'Root CA',
|
'common_name' => $rootDetails['subject']['CN'] ?? 'Root CA',
|
||||||
|
'issuer_name' => $rootDetails['subject']['CN'] ?? 'Root CA',
|
||||||
|
'issuer_serial' => $serialHex,
|
||||||
|
'family_id' => $familyId,
|
||||||
'organization' => $rootDetails['subject']['O'] ?? null,
|
'organization' => $rootDetails['subject']['O'] ?? null,
|
||||||
'valid_from' => date('Y-m-d H:i:s', $rootDetails['validFrom_time_t']),
|
'valid_from' => date('Y-m-d H:i:s', $rootDetails['validFrom_time_t']),
|
||||||
'valid_to' => date('Y-m-d H:i:s', $rootDetails['validTo_time_t']),
|
'valid_to' => date('Y-m-d H:i:s', $rootDetails['validTo_time_t']),
|
||||||
@@ -107,6 +111,9 @@ class OpenSslService
|
|||||||
'key_content' => $int4096KeyPem,
|
'key_content' => $int4096KeyPem,
|
||||||
'serial_number' => $serialHex4096,
|
'serial_number' => $serialHex4096,
|
||||||
'common_name' => $int4096Details['subject']['CN'] ?? 'Intermediate CA 4096',
|
'common_name' => $int4096Details['subject']['CN'] ?? 'Intermediate CA 4096',
|
||||||
|
'issuer_name' => $ca->common_name,
|
||||||
|
'issuer_serial' => $ca->serial_number,
|
||||||
|
'family_id' => $familyId,
|
||||||
'organization' => $int4096Details['subject']['O'] ?? null,
|
'organization' => $int4096Details['subject']['O'] ?? null,
|
||||||
'valid_from' => date('Y-m-d H:i:s', $int4096Details['validFrom_time_t']),
|
'valid_from' => date('Y-m-d H:i:s', $int4096Details['validFrom_time_t']),
|
||||||
'valid_to' => date('Y-m-d H:i:s', $int4096Details['validTo_time_t']),
|
'valid_to' => date('Y-m-d H:i:s', $int4096Details['validTo_time_t']),
|
||||||
@@ -147,6 +154,9 @@ class OpenSslService
|
|||||||
'key_content' => $int2048KeyPem,
|
'key_content' => $int2048KeyPem,
|
||||||
'serial_number' => $serialHex2048,
|
'serial_number' => $serialHex2048,
|
||||||
'common_name' => $int2048Details['subject']['CN'] ?? 'Intermediate CA 2048',
|
'common_name' => $int2048Details['subject']['CN'] ?? 'Intermediate CA 2048',
|
||||||
|
'issuer_name' => $ca->common_name,
|
||||||
|
'issuer_serial' => $ca->serial_number,
|
||||||
|
'family_id' => $familyId,
|
||||||
'organization' => $int2048Details['subject']['O'] ?? null,
|
'organization' => $int2048Details['subject']['O'] ?? null,
|
||||||
'valid_from' => date('Y-m-d H:i:s', $int2048Details['validFrom_time_t']),
|
'valid_from' => date('Y-m-d H:i:s', $int2048Details['validFrom_time_t']),
|
||||||
'valid_to' => date('Y-m-d H:i:s', $int2048Details['validTo_time_t']),
|
'valid_to' => date('Y-m-d H:i:s', $int2048Details['validTo_time_t']),
|
||||||
|
|||||||
Reference in New Issue
Block a user