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

Update HAPROXY process to understand v1

Browse Source
This commit is contained in:
Deon George 2024-10-26 12:15:53 +11:00
parent 9aecd61a2f
commit 60214d3fbc
2 changed files with 111 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -49,6 +49,7 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
FIDO_DIR=fido FIDO_DIR=fido
FIDO_PACKET_KEEP= FIDO_PACKET_KEEP=
FIDO_STRICT=false FIDO_STRICT=false
FIDO_HAPROXY=false
FILESYSTEM_DISK=s3 FILESYSTEM_DISK=s3
AWS_ACCESS_KEY_ID= AWS_ACCESS_KEY_ID=

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

@ -59,9 +59,55 @@ final class SocketClient {
if ((! $originate) && config('fido.haproxy')) { if ((! $originate) && 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)); 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 (($x=$this->read(5,6)) === 'PROXY ')
$vers = 1;
elseif (($x === "\x0d\x0a\x0d\x0a\x00\x0d") && ($this->read('5,6') === "\x0aQUIT\x0a"))
$vers = 2;
else
throw new HAproxyException('Failed to initialise HAPROXY connection'); throw new HAproxyException('Failed to initialise HAPROXY connection');
switch ($vers) {
case 1:
// Protocol/Address Family
switch ($x=$this->read(5,5)) {
case 'TCP4 ':
$p = 4;
break;
case 'TCP6 ':
$p = 6;
break;
default:
throw new HAproxyException(sprintf('HAPROXY protocol [%d] is not handled',$x));
}
$read = $this->read(5,104-11);
// IPv4
if (($p === 4) || ($p === 6)) {
$parse = collect(sscanf($read,'%s %s %s %s'));
$src = Arr::get($parse,0);
$dst = Arr::get($parse,1);
$src_port = (int)Arr::get($parse,2);
$dst_port = (int)Arr::get($parse,3);
$len = $parse->map(fn($item)=>strlen($item))->sum()+3;
// The last 2 chars should be "\r\n"
if (($x=substr($read,$len)) !== "\r\n")
throw new HAproxyException(sprintf('HAPROXY parsing failed for version [%d] [%s] (%s)',$p,$read,hex_dump($x)));
} else {
throw new HAproxyException(sprintf('HAPROXY version [%d] is not handled [%s]',$p,$read));
}
$this->port_remote = $src_port;
break;
case 2:
// Version/Command // Version/Command
$vc = $this->read_ch(5); $vc = $this->read_ch(5);
@ -83,7 +129,6 @@ final class SocketClient {
// Protocol/Address Family // Protocol/Address Family
$pa = $this->read_ch(5); $pa = $this->read_ch(5);
$p = NULL;
switch ($x=($pa>>4)&0x7) { switch ($x=($pa>>4)&0x7) {
case 1: // AF_INET case 1: // AF_INET
@ -94,8 +139,7 @@ final class SocketClient {
$p = 6; $p = 6;
break; break;
default:
throw new HAproxyException(sprintf('HAPROXY protocol [%d] is not handled',$x));
} }
switch ($x=($pa&0x7)) { switch ($x=($pa&0x7)) {
@ -122,17 +166,24 @@ final class SocketClient {
} }
$src_port = unpack('n',$this->read(5,2)); $src_port = unpack('n',$this->read(5,2));
$dst_port = unpack('n',$this->read(5,2)); $dst_port = Arr::get(unpack('n',$this->read(5,2)),1);
$this->port_remote = Arr::get($src_port,1);
break;
default:
throw new HAproxyException('Failed to initialise HAPROXY connection');
}
$this->address_remote = $src; $this->address_remote = $src;
$this->port_remote = Arr::get($src_port,1);
Log::debug(sprintf('%s:- HAPROXY src [%s:%d] dst [%s:%d]', Log::debug(sprintf('%s:- HAPROXY src [%s:%d] dst [%s:%d]',
self::LOGKEY, self::LOGKEY,
$this->address_remote, $this->address_remote,
$this->port_remote, $this->port_remote,
$dst, $dst,
Arr::get($dst_port,1), $dst_port,
)); ));
} }