From 7f90141b600b3fd3e8597816d83bb686cf959834 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 18 May 2020 16:40:47 +0200
Subject: [PATCH] security/stunnel: style and sync

---
 README.md                                                     | 1 +
 security/stunnel/Makefile                                     | 2 +-
 security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc        | 4 ++--
 .../controllers/OPNsense/Stunnel/Api/ServicesController.php   | 2 +-
 .../app/controllers/OPNsense/Stunnel/ServicesController.php   | 1 +
 .../stunnel/src/opnsense/scripts/stunnel/generate_certs.php   | 4 ++--
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 31cc612ce..809eb8cc3 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@ security/intrusion-detection-content-snort-vrt -- IDS Snort VRT ruleset (needs r
 security/maltrail -- Malicious traffic detection system
 security/openconnect -- OpenConnect Client
 security/softether -- Cross-platform Multi-protocol VPN Program (development only)
+security/stunnel -- stunnel TLS proxy (development only)
 security/tinc -- Tinc VPN
 security/tor -- The Onion Router
 sysutils/api-backup -- Provide the functionality to download the config.xml
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index d2a57c52b..25f1769de 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -2,7 +2,7 @@ PLUGIN_NAME=		stunnel
 PLUGIN_VERSION=		0.1
 PLUGIN_COMMENT=		stunnel TLS proxy
 PLUGIN_MAINTAINER=	ad@opnsense.org
-PLUGIN_DEPENDS=     stunnel
+PLUGIN_DEPENDS=		stunnel
 PLUGIN_DEVEL=		yes
 
 .include "../../Mk/plugins.mk"
diff --git a/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc b/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc
index 822abd73d..364caa028 100644
--- a/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc
+++ b/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc
@@ -28,9 +28,9 @@
 
 function stunnel_configure()
 {
-   return array(
+    return array(
        'crl' => array('stunnel_refresh_crls')
-   );
+    );
 }
 
 function stunnel_refresh_crls()
diff --git a/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/Api/ServicesController.php b/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/Api/ServicesController.php
index 30a0047b9..c0ed5b2db 100644
--- a/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/Api/ServicesController.php
+++ b/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/Api/ServicesController.php
@@ -28,7 +28,7 @@
 
 namespace OPNsense\Stunnel\Api;
 
-use \OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Base\ApiMutableModelControllerBase;
 
 class ServicesController extends ApiMutableModelControllerBase
 {
diff --git a/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/ServicesController.php b/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/ServicesController.php
index dfb898991..caf2b73be 100644
--- a/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/ServicesController.php
+++ b/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/ServicesController.php
@@ -27,6 +27,7 @@
  */
 
 namespace OPNsense\Stunnel;
+
 use OPNsense\Base\{IndexController};
 
 class ServicesController extends IndexController
diff --git a/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php b/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php
index b84979a96..b1166611e 100755
--- a/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php
+++ b/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php
@@ -52,7 +52,7 @@ foreach ($stunnel->services->service->__items as $service) {
             foreach (explode(",", (string)$service->cacert) as $caid) {
                 foreach ($configObj->ca as $ca) {
                     if ((string)$ca->refid == $caid) {
-                        $all_certs["{$base_path}/{$this_uuid}.ca"] .= base64_decode((string)$ca->crt)."\n";
+                        $all_certs["{$base_path}/{$this_uuid}.ca"] .= base64_decode((string)$ca->crt) . "\n";
                     }
                 }
             }
@@ -73,7 +73,7 @@ foreach (glob("{$base_path}/*") as $filename) {
     }
 }
 
-foreach($all_certs as $filename => $content) {
+foreach ($all_certs as $filename => $content) {
     file_put_contents($filename, $content);
     chown($filename, "stunnel");
 }