From 191efeaff197190ba396e32a7502504dfce9e63b Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 28 Mar 2017 14:49:51 +0200
Subject: [PATCH] security/acme-client: version 1.5

(cherry picked from commit f8a53f493fcf94f4cb46affe8fd434059d545e62)
(cherry picked from commit 119c6d31bb72c3a8f0f89beb7a960a13273f7af4)
(cherry picked from commit 5c864ddf974e5ec3bf4a619da5606612125018d2)
---
 security/acme-client/Makefile                                 | 2 +-
 .../OPNsense/AcmeClient/forms/dialogValidation.xml            | 4 ++--
 .../src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile
index dc4001662..9b97d9deb 100644
--- a/security/acme-client/Makefile
+++ b/security/acme-client/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		acme-client
-PLUGIN_VERSION=		1.4
+PLUGIN_VERSION=		1.5
 PLUGIN_COMMENT=		Let's Encrypt client
 PLUGIN_MAINTAINER=	opnsense@moov.de
 
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
index 30bceb613..90a7c93a4 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
@@ -19,9 +19,9 @@
     </field>
     <field>
         <id>validation.method</id>
-        <label>Validation Method</label>
+        <label>Challenge Type</label>
         <type>dropdown</type>
-        <help><![CDATA[Set the Let's Encrypt validation method. You'll have to add configuration for the selected method below.]]></help>
+        <help><![CDATA[Set the Let's Encrypt challenge type. You'll have to add configuration for the selected challenge type below.]]></help>
     </field>
     <field>
         <label>HTTP-01</label>
diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
index bd2840b34..493f31a1c 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -723,6 +723,8 @@ function run_acme_validation($certObj, $valObj, $acctObj)
     // HTTP-01: flush OPNsense port forward rules
     if (($val_method == 'http01') and ((string)$valObj->http_service == 'opnsense')) {
         mwexec('/sbin/pfctl -a acme-client -F all');
+        # XXX: workaround to solve disconnection issues reported by some users
+        $response = $backend->configdRun('filter reload');
     }
 
     // Check validation result