From 200436b06ea7ee4b91f59eaee61a5a9263c4bf0f Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 16 Jun 2025 18:00:13 +0200
Subject: [PATCH] security/acme-client: fix acme.sh is always called with
 "--days 1", refs #4711

---
 security/acme-client/pkg-descr                               | 5 +++++
 .../mvc/app/library/OPNsense/AcmeClient/LeCertificate.php    | 3 ++-
 .../app/library/OPNsense/AcmeClient/LeValidation/Base.php    | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index 9a3c8d013..0e8663411 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -8,6 +8,11 @@ WWW: https://github.com/acmesh-official/acme.sh
 Plugin Changelog
 ================
 
+4.10
+
+Fixed:
+* acme.sh is always called with "--days 1" (#4711)
+
 4.9
 
 Added:
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
index 518a2c0f7..edc3c2356 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
@@ -642,7 +642,8 @@ class LeCertificate extends LeCommon
 
             // Configure validation object
             $val->setNames($this->config->name, $this->config->altNames, $this->config->aliasmode, $this->config->domainalias, $this->config->challengealias);
-            $val->setRenewal((int)$this->config->renewInterval);
+            $renewInterval = (string)$this->config->renewInterval;
+            $val->setRenewal((int)$renewInterval);
             $val->setForce($this->force);
             $val->setOcsp((string)$this->config->ocsp == 1 ? true : false);
             // strip prefix from key value
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php
index b28effbb6..1946ab3b9 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2020-2024 Frank Wall
+ * Copyright (C) 2020-2025 Frank Wall
  * Copyright (C) 2018 Deciso B.V.
  * Copyright (C) 2018 Franco Fichtner <franco@opnsense.org>
  * All rights reserved.
@@ -286,6 +286,6 @@ abstract class Base extends \OPNsense\AcmeClient\LeCommon
      */
     public function setRenewal(int $interval = 60)
     {
-        $this->acme_args[] = LeUtils::execSafe('--days %s', (string)$interval);
+        $this->acme_args[] = LeUtils::execSafe('--days %s', $interval);
     }
 }