RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-14 09:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: qpack: support bigger prefix-integer encoding

Browse Source 
Prefix-integer encoding function was incomplete. It was not able to deal
correctly with value encoded on more than 2 bytes. This maximum value depends
on the size of the prefix, but value greater than 254 were all impacted.

Most notably, this change is required to support header name/value with
sizeable length. Previously, length was incorrectly encoded. The client thus
closed the connection with QPACK_DECOMPRESSION_ERROR.
This commit is contained in:
Amaury Denoyelle 2022-05-30 14:24:40 +02:00
parent 5f6de8d77a
commit 11f5a796c1
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/qpack-enc.c
View File

@ -28,22 +28,37 @@ static size_t qpack_get_prefix_int_size(int i, int prefix_size)
* *
* Returns 0 if success else non-zero. * Returns 0 if success else non-zero.
*/ */
static int qpack_encode_prefix_integer(struct buffer *out, int i, int prefix_size, unsigned char before_prefix) static int qpack_encode_prefix_integer(struct buffer *out, int i,
int prefix_size,
unsigned char before_prefix)
{ {
BUG_ON(!prefix_size); const int mod = (1 << prefix_size) - 1;
BUG_ON_HOT(!prefix_size);
if (i < (1 << prefix_size) - 1) { if (i < mod) {
if (b_room(out) < 1) if (b_room(out) < 1)
return 1; return 1;
b_putchr(out, before_prefix | i); b_putchr(out, before_prefix | i);
} }
else { else {
if (b_room(out) < 2) int to_encode = i - mod;
const size_t sz = to_encode / mod;
if (b_room(out) < sz)
return 1; return 1;
b_putchr(out, before_prefix | ((1 << prefix_size) - 1)); b_putchr(out, before_prefix | mod);
b_putchr(out, i - ((1 << prefix_size) - 1)); while (1) {
if (to_encode > 0x7f) {
b_putchr(out, 0x80 | (to_encode & 0x7f));
to_encode >>= 7;
}
else {
b_putchr(out, to_encode & 0x7f);
break;
}
}
} }
return 0; return 0;