From 5e760e16960159d9d8943bc87b65d278031a4647 Mon Sep 17 00:00:00 2001
From: Bjorn Peeters <tech@peeters.io>
Date: Sat, 28 Mar 2020 12:54:40 +0100
Subject: [PATCH] letsencrypt/upload_sftp

add export of fullchain.pem
---
 .../opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php
index 70c62cdf7..8f3a80a74 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php
@@ -66,7 +66,7 @@ const COMMANDS = [
         "options" => [
             "host::", "port::", "host-key::", "user::", "identity-type::", "remote-path::",
             "certificates::", "files::", "chgrp::", "chmod::", "chmod-key::",
-            "cert-name::", "key-name::", "ca-name::"],
+            "cert-name::", "key-name::", "ca-name::", "fullchain-name::"],
         "implementation" => "commandUpload",
         "default" => true,
     ],
@@ -119,6 +119,8 @@ const UPLOAD_NAME_TEMPLATES = [
     "cert" => ["default" => "{{name}}/cert.pem", "option" => "cert-name"],
     "key" => ["default" => "{{name}}/key.pem", "option" => "key-name"],
     "ca" => ["default" => "{{name}}/ca.pem", "option" => "ca-name"],
+    "fullchain" => ["default" => "{{name}}/fullchain.pem", "option" => "fullchain-name"],
+
 ];
 
 // Exit codes
@@ -420,6 +422,7 @@ function getOptionsById($automation_id, $silent = false)
                 "cert-name" => trim((string)$action->sftp_filename_cert),
                 "key-name" => trim((string)$action->sftp_filename_key),
                 "ca-name" => trim((string)$action->sftp_filename_ca),
+                "fullchain-name" => trim((string)$action->sftp_filename_fullchain),
                 "certificates" => "", // defaults to all (= empty), may be overridden via CLI
             ];
         } elseif (!$silent) {
@@ -582,6 +585,8 @@ function exportCertificates(array $cert_refids)
             if (!empty((string)$cert->caref)) {
                 $cert = (array)$cert;
                 $item["ca"] = ca_chain($cert);
+            // combine files to export a fullchain.pem
+                $item["fullchain"] = $item["cert"].$item["ca"];
             }
             $result[$refid] = $item;
         }