netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

security/acme-client: fix calculation of renewal date, closes #2721

Browse Source 
Now we read the validFrom information directly from the cert file
in order to calculate the renewal date.

This is necessary, because in ae69739229
we made the import feature available to the end-user. As a result,
the value of lastUpdate() does not only change after issue/renewal,
but also everytime the user clicks on the "import" button.
This commit is contained in:
Frank Wall
2022-01-05 12:50:11 +01:00
parent ed25316489
commit 0cac1cadc2
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
+24 -1
View File
@@ -414,8 +414,31 @@ class LeCertificate extends LeCommon
{
$return = false;
// Try to get issue date from certificate
if (is_file($this->cert_file)) {
// Read contents from certificate file
$cert_content = @file_get_contents($this->cert_file);
if ($cert_content != false) {
$cert_info = @openssl_x509_parse($cert_content);
if (!empty($cert_info['validFrom_time_t'])) {
$last_update = $cert_info['validFrom_time_t'];
} else {
LeUtils::log_error('unable to get expiration time from certificate for ' . (string)$this->config->name);
$last_update = 0; // Just assume the cert requires renewal.
}
} else {
LeUtils::log_error('unable to read certificate content from file for ' . (string)$this->config->name);
$last_update = 0; // Just assume the cert requires renewal.
}
} elseif (!empty((string)$this->config->lastUpdate)) {
// Fallback to lastUpdate() state, although it may not be correct
// if the cert was imported manually after issue/renewal.
$last_update = (string)$this->config->lastUpdate;
} else {
$last_update = 0; // Just assume the cert requires renewal.
}
// Collect required information
$last_update = !empty((string)$this->config->lastUpdate) ? (string)$this->config->lastUpdate : 0;
$current_time = new \DateTime();
$last_update_time = new \DateTime();
$last_update_time->setTimestamp($last_update);