Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-11 00:14:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cache S/MIME certificates info #259

Browse source
This commit is contained in:
the-djmaze 2024-02-20 11:11:10 +01:00
parent f5f3a90275
commit 479452ad7b
2 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
View file

@ -51,20 +51,6 @@ trait SMime
$this->SMIME()->certificates()
);
}
/*
DoGetPGPKeys() : array
DoPgpSearchKey() : array
DoGnupgDecrypt() : array
DoGnupgGetKeys() : array
DoGnupgExportKey() : array
DoGnupgGenerateKey() : array
DoGnupgDeleteKey() : array
DoPgpImportKey() : array
DoGetStoredPGPKeys() : array
DoPgpStoreKeyPair() : array
DoStorePGPKey() : array
DoPgpVerifyMessage() : array
*/
/**
* Can be use by Identity

88
snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
View file

@ -28,46 +28,60 @@ class OpenSSL
public function certificates() : array
{
$keys = [];
foreach (\glob("{$this->homedir}/*.key") as $file) {
$data = \file_get_contents($file);
// Can't check ENCRYPTED PRIVATE KEY
if (\str_contains($data, '-----BEGIN PRIVATE KEY-----')) {
$keys[] = [\basename($file), $data];
}
}
$result = [];
foreach (\glob("{$this->homedir}/*.crt") as $file) {
$name = \basename($file);
$certificate = \file_get_contents($file);
$data = \openssl_x509_parse($certificate);
if ($data) {
$short = [
'file' => \basename($file),
'CN' => $data['subject']['CN'],
'emailAddress' => $data['subject']['emailAddress'],
// 'validTo' => \gmdate('Y-m-d\\TH:i:s\\Z', $data['validTo_time_t']),
'validTo_time_t' => $data['validTo_time_t'],
'smimesign' => false,
'smimeencrypt' => false,
'privateKey' => null // not found or encrypted
];
foreach ($data['purposes'] as $purpose) {
if ('smimesign' === $purpose[2] || 'smimeencrypt' === $purpose[2]) {
// [general availability, tested purpose]
$short[$purpose[2]] = $purpose[0] || $purpose[1];
}
$cacheFile = "{$this->homedir}/certificates.json";
if (\file_exists($cacheFile)) {
$keys = \json_decode(\file_get_contents($cacheFile), true);
} else {
foreach (\glob("{$this->homedir}/*.key") as $file) {
$data = \file_get_contents($file);
// Can't check ENCRYPTED PRIVATE KEY
if (\str_contains($data, '-----BEGIN PRIVATE KEY-----')) {
$keys[] = [\basename($file), $data];
}
foreach ($keys as $key) {
if (\openssl_x509_check_private_key($certificate, $key[1])) {
$short['privateKey'] = $key[0];
break;
}
}
$result[] = $short;
} else {
\error_log("OpenSSL parse({$file}): " . \openssl_error_string());
}
$result = [];
foreach (\glob("{$this->homedir}/*.crt") as $file) {
$filename = \basename($file);
$certificate = \file_get_contents($file);
$data = \openssl_x509_parse($certificate);
if ($data) {
$key = \str_replace(':', '', $data['extensions']['subjectKeyIdentifier'] ?? $data['hash']);
if ("{$key}.crt" != $filename && \rename("{$this->homedir}/{$filename}", "{$this->homedir}/{$key}.crt")) {
$filename = "{$key}.crt";
}
// Use $data['extensions']['authorityKeyIdentifier'] to bundle parent certificate
$short = [
'file' => $filename,
'id' => $key,
'CN' => $data['subject']['CN'],
'emailAddress' => $data['subject']['emailAddress'],
// 'validTo' => \gmdate('Y-m-d\\TH:i:s\\Z', $data['validTo_time_t']),
'validTo_time_t' => $data['validTo_time_t'],
'smimesign' => false,
'smimeencrypt' => false,
'privateKey' => null // not found or encrypted
];
foreach ($data['purposes'] as $purpose) {
if ('smimesign' === $purpose[2] || 'smimeencrypt' === $purpose[2]) {
// [general availability, tested purpose]
$short[$purpose[2]] = $purpose[0] || $purpose[1];
}
}
foreach ($keys as $key) {
if (\openssl_x509_check_private_key($certificate, $key[1])) {
$short['privateKey'] = $key[0];
break;
}
}
$result[] = $short;
} else {
\error_log("OpenSSL parse({$file}): " . \openssl_error_string());
}
}
\file_put_contents($cacheFile, \json_encode($result));
}
return $result;
}