[PATCH http-server 1/2] fix #8021: websocket: check length of close payload

[PATCH http-server 1/2] fix #8021: websocket: check length of close payload

[Fabian Grünbichler]

before unpacking the contained status code, otherwise the debug log might print
a warning.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/PVE/APIServer/AnyEvent.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
index 915d678..12701aa 100644
--- a/src/PVE/APIServer/AnyEvent.pm
+++ b/src/PVE/APIServer/AnyEvent.pm
@@ -674,8 +674,12 @@ sub websocket_proxy {
                     if ($opcode == 1 || $opcode == 2) {
                         $reqstate->{proxyhdl}->push_write($payload) if $reqstate->{proxyhdl};
                     } elsif ($opcode == 8) {
-                        my $statuscode = unpack("n", $payload);
-                        $self->dprint("websocket received close. status code: '$statuscode'");
+                        if ($payload_len < 2) {
+                            $self->dprint("websocket received close with too short payload: $payload_len");
+                        } else {
+                            my $statuscode = unpack("n", $payload);
+                            $self->dprint("websocket received close. status code: '$statuscode'");
+                        }
                         if (my $proxyhdl = $reqstate->{proxyhdl}) {
                             $proxyhdl->{block_disconnect} = 1 if length $proxyhdl->{wbuf};
 
-- 
2.47.3

[PATCH http-server 2/2] websocket: include close reason in debug log

[Fabian Grünbichler]

if given by the client.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/PVE/APIServer/AnyEvent.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
index 12701aa..44e4568 100644
--- a/src/PVE/APIServer/AnyEvent.pm
+++ b/src/PVE/APIServer/AnyEvent.pm
@@ -678,7 +678,9 @@ sub websocket_proxy {
                             $self->dprint("websocket received close with too short payload: $payload_len");
                         } else {
                             my $statuscode = unpack("n", $payload);
-                            $self->dprint("websocket received close. status code: '$statuscode'");
+                            my $reason = substr($payload, 2, $payload_len - 2);
+                            $reason = '-' if !$reason;
+                            $self->dprint("websocket received close. status code: '$statuscode', reason: '$reason'");
                         }
                         if (my $proxyhdl = $reqstate->{proxyhdl}) {
                             $proxyhdl->{block_disconnect} = 1 if length $proxyhdl->{wbuf};
-- 
2.47.3

Re: [PATCH http-server 2/2] websocket: include close reason in debug log

[Dominik Csapak]

Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>

On 9/9/26 2:03 PM, Fabian Grünbichler wrote:
> if given by the client.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>   src/PVE/APIServer/AnyEvent.pm | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
> index 12701aa..44e4568 100644
> --- a/src/PVE/APIServer/AnyEvent.pm
> +++ b/src/PVE/APIServer/AnyEvent.pm
> @@ -678,7 +678,9 @@ sub websocket_proxy {
>                               $self->dprint("websocket received close with too short payload: $payload_len");
>                           } else {
>                               my $statuscode = unpack("n", $payload);
> -                            $self->dprint("websocket received close. status code: '$statuscode'");
> +                            my $reason = substr($payload, 2, $payload_len - 2);
> +                            $reason = '-' if !$reason;
> +                            $self->dprint("websocket received close. status code: '$statuscode', reason: '$reason'");
>                           }
>                           if (my $proxyhdl = $reqstate->{proxyhdl}) {
>                               $proxyhdl->{block_disconnect} = 1 if length $proxyhdl->{wbuf};

Re: [PATCH http-server 1/2] fix #8021: websocket: check length of close payload

[Dominik Csapak]

Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>

On 9/9/26 2:03 PM, Fabian Grünbichler wrote:
> before unpacking the contained status code, otherwise the debug log might print
> a warning.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>   src/PVE/APIServer/AnyEvent.pm | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
> index 915d678..12701aa 100644
> --- a/src/PVE/APIServer/AnyEvent.pm
> +++ b/src/PVE/APIServer/AnyEvent.pm
> @@ -674,8 +674,12 @@ sub websocket_proxy {
>                       if ($opcode == 1 || $opcode == 2) {
>                           $reqstate->{proxyhdl}->push_write($payload) if $reqstate->{proxyhdl};
>                       } elsif ($opcode == 8) {
> -                        my $statuscode = unpack("n", $payload);
> -                        $self->dprint("websocket received close. status code: '$statuscode'");
> +                        if ($payload_len < 2) {
> +                            $self->dprint("websocket received close with too short payload: $payload_len");
> +                        } else {
> +                            my $statuscode = unpack("n", $payload);
> +                            $self->dprint("websocket received close. status code: '$statuscode'");
> +                        }
>                           if (my $proxyhdl = $reqstate->{proxyhdl}) {
>                               $proxyhdl->{block_disconnect} = 1 if length $proxyhdl->{wbuf};
>