Move HAproxy exceptions into their own class, and downgrade HAproxy errors since they are handled

app/Classes/Protocol.php

@@ -7,8 +7,8 @@ use Illuminate\Support\Facades\Log;
 
 use App\Classes\File\{Receive,Send};
 use App\Classes\Protocol\EMSI;
+use App\Classes\Sock\Exception\SocketException;
 use App\Classes\Sock\SocketClient;
-use App\Classes\Sock\SocketException;
 use App\Models\{Address,Mailer,Setup,System,SystemLog};
 
 // @todo after receiving a mail packet/file, dont acknowledge it until we can validate that we can read it properly.

app/Classes/Protocol/Binkp.php

@@ -11,8 +11,8 @@ use League\Flysystem\UnreadableFileEncountered;
 use App\Classes\Crypt;
 use App\Classes\Node;
 use App\Classes\Protocol as BaseProtocol;
+use App\Classes\Sock\Exception\SocketException;
 use App\Classes\Sock\SocketClient;
-use App\Classes\Sock\SocketException;
 use App\Exceptions\{FileGrewException,InvalidFTNException};
 use App\Models\{Address,Mailer};
 

app/Classes/Protocol/EMSI.php

@@ -6,12 +6,12 @@ use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
 
 use App\Classes\Protocol as BaseProtocol;
+use App\Classes\Sock\Exception\SocketException;
 use App\Classes\Sock\SocketClient;
-use App\Classes\Sock\SocketException;
 use App\Exceptions\InvalidFTNException;
-use App\Models\{Address,Mailer,Setup};
 use App\Interfaces\CRC as CRCInterface;
 use App\Interfaces\Zmodem as ZmodemInterface;
+use App\Models\{Address,Mailer,Setup};
 use App\Traits\CRC as CRCTrait;
 
 // http://ftsc.org/docs/fsc-0056.001

app/Classes/Protocol/Zmodem.php

@@ -5,9 +5,9 @@ namespace App\Classes\Protocol;
 use Illuminate\Support\Facades\Log;
 
 use App\Classes\{Node,Protocol};
-use App\Classes\Protocol\Zmodem as ZmodemClass;
 use App\Classes\File\{Receive,Send};
-use App\Classes\Sock\{SocketClient,SocketException};
+use App\Classes\Sock\Exception\SocketException;
+use App\Classes\Sock\SocketClient;
 use App\Interfaces\CRC as CRCInterface;
 use App\Interfaces\Zmodem as ZmodemInterface;
 use App\Models\{Address,Mailer};

app/Classes/Sock/Exception/HAproxyException.php

@@ -0,0 +1,6 @@
+<?php
+
+namespace App\Classes\Sock\Exception;
+
+final class HAproxyException extends \Exception {
+}

app/Classes/Sock/Exception/SocketException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes\Sock;
+namespace App\Classes\Sock\Exception;
 
 // @todo Can we change this to use socket_strerr() && socket_last_error()
 final class SocketException extends \Exception {

app/Classes/Sock/SocketClient.php

@@ -6,6 +6,8 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
+use App\Classes\Sock\Exception\{HAproxyException,SocketException};
+
 /**
  * Class SocketClient
  *
@@ -57,34 +59,26 @@ final class SocketClient {
 			if (config('fido.haproxy')) {
 				Log::debug(sprintf('%s:+ HAPROXY connection host [%s] on port [%d] (%s)',self::LOGKEY,$this->address_remote,$this->port_remote,$this->type));
 
-				if ($this->read(5,12) !== "\x0d\x0a\x0d\x0a\x00\x0d\x0aQUIT\x0a") {
+				if ($this->read(5,12) !== "\x0d\x0a\x0d\x0a\x00\x0d\x0aQUIT\x0a")
-					Log::error(sprintf('%s:! Failed to initialise HAPROXY connection',self::LOGKEY));
+					throw new HAproxyException('Failed to initialise HAPROXY connection');
-					throw new SocketException(SocketException::CANT_CONNECT,'Failed to initialise HAPROXY connection');
-				}
 
 				// Version/Command
 				$vc = $this->read_ch(5);
 
-				if (($x=($vc>>4)&0x7) !== 2) {
+				if (($x=($vc>>4)&0x7) !== 2)
-					Log::error(sprintf('%s:! HAPROXY version [%d] is not handled',self::LOGKEY,$x));
+					throw new HAproxyException(sprintf('Unknown HAPROXY version [%d]',$x));
-
-					throw new SocketException(SocketException::CANT_CONNECT,'Unknown HAPROXY version');
-				}
 
 				switch ($x=($vc&0x7)) {
 					// HAPROXY internal
 					case 0:
-						Log::debug(sprintf('%s:! HAPROXY internal health-check',self::LOGKEY));
+						throw new HAproxyException('HAPROXY internal health-check');
-						throw new SocketException(SocketException::CANT_CONNECT,'Healthcheck');
 
 					// PROXY connection
 					case 1:
 						break;
 
 					default:
-						Log::error(sprintf('%s:! HAPROXY command [%d] is not handled',self::LOGKEY,$x));
+						throw new HAproxyException(sprintf('HAPROXY command [%d] is not handled',$x));
-
-						throw new SocketException(SocketException::CANT_CONNECT,'Unknown HAPROXY command');
 				}
 
 				// Protocol/Address Family
@@ -101,8 +95,7 @@ final class SocketClient {
 						break;
 
 					default:
-						Log::error(sprintf('%s:! HAPROXY protocol [%d] is not handled',self::LOGKEY,$x));
+						throw new HAproxyException(sprintf('HAPROXY protocol [%d] is not handled',$x));
-						throw new SocketException(SocketException::CANT_CONNECT,'Unknown HAPROXY protocol');
 				}
 
 				switch ($x=($pa&0x7)) {
@@ -110,8 +103,7 @@ final class SocketClient {
 						break;
 
 					default:
-						Log::error(sprintf('%s:! HAPROXY address family [%d] is not handled',self::LOGKEY,$x));
+						throw new HAproxyException(sprintf('HAPROXY address family [%d] is not handled',$x));
-						throw new SocketException(SocketException::CANT_CONNECT,'Unknown HAPROXY address family');
 				}
 
 				$len = Arr::get(unpack('n',$this->read(5,2)),1);
@@ -126,8 +118,7 @@ final class SocketClient {
 					$dst = inet_ntop($this->read(5,16));
 
 				} else {
-					Log::error(sprintf('%s:! HAPROXY address len [%d:%d] is not handled',self::LOGKEY,$p,$len));
+					throw new HAproxyException(sprintf('HAPROXY address len [%d:%d] is not handled',$p,$len));
-					throw new SocketException(SocketException::CANT_CONNECT,'Unknown HAPROXY address length');
 				}
 
 				$src_port = unpack('n',$this->read(5,2));

app/Classes/Sock/SocketServer.php

@@ -4,6 +4,8 @@ namespace App\Classes\Sock;
 
 use Illuminate\Support\Facades\Log;
 
+use App\Classes\Sock\Exception\{HAproxyException,SocketException};
+
 final class SocketServer {
 	private const LOGKEY = 'SS-';
 
@@ -128,8 +130,13 @@ final class SocketServer {
 			try {
 				$r = new SocketClient($accept);
 
+			} catch (HAproxyException $e) {
+				Log::notice(sprintf('%s:! HAPROXY Exception [%s]',self::LOGKEY,$e->getMessage()));
+				socket_close($accept);
+				continue;
+
 			} catch (\Exception $e) {
-				Log::error(sprintf('%s:! Creating Socket client failed? [%s]',self::LOGKEY,$e->getMessage()));
+				Log::notice(sprintf('%s:! Creating Socket client failed? [%s]',self::LOGKEY,$e->getMessage()));
 				socket_close($accept);
 				continue;
 			}

app/Console/Commands/CommBinkpReceive.php

@@ -6,7 +6,7 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
 use App\Classes\Protocol\Binkp;
-use App\Classes\Sock\SocketException;
+use App\Classes\Sock\Exception\SocketException;
 use App\Classes\Sock\SocketServer;
 use App\Models\Setup;
 

app/Console/Commands/CommEMSIReceive.php

@@ -6,7 +6,7 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
 use App\Classes\Protocol\EMSI;
-use App\Classes\Sock\SocketException;
+use App\Classes\Sock\Exception\SocketException;
 use App\Classes\Sock\SocketServer;
 use App\Models\Setup;
 

app/Console/Commands/ServerStart.php

@@ -6,7 +6,8 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
 use App\Classes\Protocol\{Binkp,DNS,EMSI};
-use App\Classes\Sock\{SocketException,SocketServer};
+use App\Classes\Sock\Exception\SocketException;
+use App\Classes\Sock\SocketServer;
 use App\Models\Setup;
 
 class ServerStart extends Command

app/Jobs/AddressPoll.php

@@ -15,8 +15,8 @@ use Illuminate\Support\Facades\Notification;
 
 use App\Classes\Protocol;
 use App\Classes\Protocol\{Binkp,EMSI};
+use App\Classes\Sock\Exception\SocketException;
 use App\Classes\Sock\SocketClient;
-use App\Classes\Sock\SocketException;
 use App\Models\{Address,Mailer,Setup};
 use App\Notifications\Netmails\PollingFailed;
 use App\Traits\ObjectIssetFix;