bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: bbs:b5f22bea863b2eaf4849b09cf2ea1f13584aeb9a
Branches Tags
bbs:master
bbs:bbs
..
compare: bbs:81f59dcbb859fd0033a0787ecb8142b57d7c179b
Branches Tags
bbs:master
bbs:bbs

No commits in common. "b5f22bea863b2eaf4849b09cf2ea1f13584aeb9a" and "81f59dcbb859fd0033a0787ecb8142b57d7c179b" have entirely different histories.
b5f22bea86 ... 81f59dcbb8

13 changed files with 37 additions and 42 deletions
Show Stats Expand all files Collapse all files

2
app/Classes/Protocol.php
View File

@ -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.

2
app/Classes/Protocol/Binkp.php
View File

@ -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};

10
app/Classes/Protocol/DNS.php
View File

@ -110,7 +110,7 @@ final class DNS extends BaseProtocol
$this->query = new BaseProtocol\DNS\Query($this->client->read(0,512));
} catch (\Exception $e) {
Log::notice(sprintf('%s:! Ignoring bad DNS query (%s)',self::LOGKEY,$e->getMessage()));
Log::error(sprintf('%s:! Ignoring bad DNS query (%s)',self::LOGKEY,$e->getMessage()));
return FALSE;
}
@ -119,7 +119,7 @@ final class DNS extends BaseProtocol
// If the wrong class
if ($this->query->class !== self::DNS_QUERY_IN) {
Log::notice(sprintf('%s:! We only service Internet queries [%d]',self::LOGKEY,$this->query->class));
Log::error(sprintf('%s:! We only service Internet queries [%d]',self::LOGKEY,$this->query->class));
return $this->reply(self::DNS_NOTIMPLEMENTED,[],$this->soa());
}
@ -272,7 +272,7 @@ final class DNS extends BaseProtocol
// Other attributes return NOTIMPL
default:
Log::notice(sprintf('%s:! We dont support DNS query types [%d]',self::LOGKEY,$this->query->type));
Log::error(sprintf('%s:! We dont support DNS query types [%d]',self::LOGKEY,$this->query->type));
return $this->reply(self::DNS_NOTIMPLEMENTED,[],$this->soa());
}
@ -309,14 +309,14 @@ final class DNS extends BaseProtocol
private function nameerr(): int
{
Log::notice(sprintf('%s:! DNS query for a resource we dont manage [%s]',self::LOGKEY,$this->query->domain));
Log::error(sprintf('%s:! DNS query for a resource we dont manage [%s]',self::LOGKEY,$this->query->domain));
return $this->reply(self::DNS_NAMEERR,[],$this->soa());
}
private function nodata(): int
{
Log::notice(sprintf('%s:! DNS query for a resource we dont manage [%s] in our zone(s)',self::LOGKEY,$this->query->domain));
Log::error(sprintf('%s:! DNS query for a resource we dont manage [%s] in our zone(s)',self::LOGKEY,$this->query->domain));
return $this->reply(self::DNS_NOERROR,[],$this->soa());
}

4
app/Classes/Protocol/EMSI.php
View File

@ -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

4
app/Classes/Protocol/Zmodem.php
View File

@ -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\Exception\SocketException;
use App\Classes\Sock\SocketClient;
use App\Classes\Sock\{SocketClient,SocketException};
use App\Interfaces\CRC as CRCInterface;
use App\Interfaces\Zmodem as ZmodemInterface;
use App\Models\{Address,Mailer};

6
app/Classes/Sock/Exception/HAproxyException.php
View File

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

31
app/Classes/Sock/SocketClient.php
View File

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

2
app/Classes/Sock/Exception/SocketException.php → app/Classes/Sock/SocketException.php
View File

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

9
app/Classes/Sock/SocketServer.php
View File

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

2
app/Console/Commands/CommBinkpReceive.php
View File

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

2
app/Console/Commands/CommEMSIReceive.php
View File

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

3
app/Console/Commands/ServerStart.php
View File

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

2
app/Jobs/AddressPoll.php
View File

@ -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;