From 059300dde6f09c32f8016b6f750a87df39a1834d Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 3 Nov 2023 13:40:41 +0100 Subject: [PATCH 1/2] update check_ssl_cert --- lib/check_ssl_cert | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/check_ssl_cert b/lib/check_ssl_cert index 0af396b..3935a6d 160000 --- a/lib/check_ssl_cert +++ b/lib/check_ssl_cert @@ -1 +1 @@ -Subproject commit 0af396b41a5dc159e31689812bdbdd0203394cfd +Subproject commit 3935a6d0ac8239bde3207d2a39681db0e6d517d4 From 1dc4a473206572ab23da60a720f8f7b7deff5277 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 3 Nov 2023 13:40:53 +0100 Subject: [PATCH 2/2] update parser with new version of check_ssl_cert --- src/Deblan/Command/CheckHttpsCertificatesCommand.php | 4 ++-- src/Deblan/Parser/SslCertParser.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Deblan/Command/CheckHttpsCertificatesCommand.php b/src/Deblan/Command/CheckHttpsCertificatesCommand.php index 384aca7..a106c59 100644 --- a/src/Deblan/Command/CheckHttpsCertificatesCommand.php +++ b/src/Deblan/Command/CheckHttpsCertificatesCommand.php @@ -104,8 +104,8 @@ EOF ]); $process->run(); - $whois = $process->getOutput(); - $parser = new Parser($whois); + $content = $process->getOutput(); + $parser = new Parser($content); $expiryDate = $parser->getExpiryDate(); if ($expiryDate) { diff --git a/src/Deblan/Parser/SslCertParser.php b/src/Deblan/Parser/SslCertParser.php index f6f6a6a..98e943a 100644 --- a/src/Deblan/Parser/SslCertParser.php +++ b/src/Deblan/Parser/SslCertParser.php @@ -31,7 +31,7 @@ class SslCertParser */ public function getExpiryDate(): ? \DateTime { - preg_match('/days=([^;]+);/', $this->check, $match); + preg_match('/expires in ([^\s]+)\s+/', $this->check, $match); if (isset($match[1])) { $days = (int) $match[1];