(Auth, radius) suppress accounting messages when not enabled

src/opnsense/mvc/app/library/OPNsense/Auth/Radius.php

@@ -48,7 +48,7 @@ class Radius implements IAuthConnector
     /**
      * @var null port to use for accounting
      */
-    private $acctPort = "1813";
+    private $acctPort = null;
 
     /**
      * @var null shared secret to use for this server
@@ -120,6 +120,8 @@ class Radius implements IAuthConnector
      */
     public function startAccounting($username, $sessionid)
     {
+        // only send messages if target port specified
+        if ($this->acctPort != null) {
             $radius = radius_auth_open();
 
             $error = null;
@@ -130,7 +132,8 @@ class Radius implements IAuthConnector
                 $this->sharedSecret,
                 $this->timeout,
                 $this->maxRetries
-        )) {
+            )
+            ) {
                 $error = radius_strerror($radius);
             } elseif (!radius_create_request($radius, RADIUS_ACCOUNTING_REQUEST)) {
                 $error = radius_strerror($radius);
@@ -162,7 +165,7 @@ class Radius implements IAuthConnector
                     syslog(LOG_ERR, 'RadiusError:' . radius_strerror($error));
                     exit;
                 }
-            switch($req) {
+                switch ($req) {
                     case RADIUS_ACCOUNTING_RESPONSE:
                         break;
                     default:
@@ -172,6 +175,7 @@ class Radius implements IAuthConnector
                 radius_close($radius);
             }
         }
+    }
 
     /**
      * stop radius accounting
@@ -181,6 +185,8 @@ class Radius implements IAuthConnector
      */
     public function stopAccounting($username, $sessionid, $session_time)
     {
+        // only send messages if target port specified
+        if ($this->acctPort != null) {
             $radius = radius_auth_open();
 
             $error = null;
@@ -191,7 +197,8 @@ class Radius implements IAuthConnector
                 $this->sharedSecret,
                 $this->timeout,
                 $this->maxRetries
-        )) {
+            )
+            ) {
                 $error = radius_strerror($radius);
             } elseif (!radius_create_request($radius, RADIUS_ACCOUNTING_REQUEST)) {
                 $error = radius_strerror($radius);
@@ -227,7 +234,7 @@ class Radius implements IAuthConnector
                     syslog(LOG_ERR, 'RadiusError:' . radius_strerror($error));
                     exit;
                 }
-            switch($req) {
+                switch ($req) {
                     case RADIUS_ACCOUNTING_RESPONSE:
                         break;
                     default:
@@ -237,6 +244,7 @@ class Radius implements IAuthConnector
                 radius_close($radius);
             }
         }
+    }
 
     /**
      * update radius accounting (interim update)
@@ -246,6 +254,8 @@ class Radius implements IAuthConnector
      */
     public function updateAccounting($username, $sessionid, $session_time)
     {
+        // only send messages if target port specified
+        if ($this->acctPort != null) {
             $radius = radius_auth_open();
             if (!defined('RADIUS_UPDATE')) {
                 define('RADIUS_UPDATE', 3);
@@ -259,7 +269,8 @@ class Radius implements IAuthConnector
                 $this->sharedSecret,
                 $this->timeout,
                 $this->maxRetries
-        )) {
+            )
+            ) {
                 $error = radius_strerror($radius);
             } elseif (!radius_create_request($radius, RADIUS_ACCOUNTING_REQUEST)) {
                 $error = radius_strerror($radius);
@@ -293,7 +304,7 @@ class Radius implements IAuthConnector
                     syslog(LOG_ERR, 'RadiusError:' . radius_strerror($error));
                     exit;
                 }
-            switch($req) {
+                switch ($req) {
                     case RADIUS_ACCOUNTING_RESPONSE:
                         break;
                     default:
@@ -303,6 +314,7 @@ class Radius implements IAuthConnector
                 radius_close($radius);
             }
         }
+    }
 
     /**
      * authenticate user against radius