Mercurial > hg > nginx

changeset 8464:fdb8edc8e496 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/3: limited prefixed integer size by 62 bits.
author Roman Arutyunyan <arut@nginx.com>
date Fri, 03 Jul 2020 09:26:12 +0300
parents 2576485b93d4
children 5611bbb852ce
files src/http/v3/ngx_http_v3_parse.c
diffstat 1 files changed, 66 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/v3/ngx_http_v3_parse.c
+++ b/src/http/v3/ngx_http_v3_parse.c
@@ -119,6 +119,15 @@ ngx_http_v3_parse_prefix_int(ngx_connect
     case sw_value:
 
         st->value += (uint64_t) (ch & 0x7f) << st->shift;
+
+        if (st->shift == 56
+            && ((ch & 0x80) || (st->value & 0xc000000000000000)))
+        {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client exceeded integer size limit");
+            return NGX_HTTP_V3_ERR_EXCESSIVE_LOAD;
+        }
+
         if (ch & 0x80) {
             st->shift += 7;
             break;
@@ -281,8 +290,9 @@ ngx_http_v3_parse_header_block_prefix(ng
 
     case sw_req_insert_count:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 8, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 8, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->insert_count = st->pint.value;
@@ -298,8 +308,9 @@ ngx_http_v3_parse_header_block_prefix(ng
 
     case sw_read_delta_base:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->delta_base = st->pint.value;
@@ -521,8 +532,9 @@ ngx_http_v3_parse_header_ri(ngx_connecti
 
     case sw_index:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->index = st->pint.value;
@@ -578,8 +590,9 @@ ngx_http_v3_parse_header_lri(ngx_connect
 
     case sw_index:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 4, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 4, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->index = st->pint.value;
@@ -595,8 +608,9 @@ ngx_http_v3_parse_header_lri(ngx_connect
 
     case sw_read_value_len:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->literal.length = st->pint.value;
@@ -673,8 +687,9 @@ ngx_http_v3_parse_header_l(ngx_connectio
 
     case sw_name_len:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 3, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 3, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->literal.length = st->pint.value;
@@ -710,8 +725,9 @@ ngx_http_v3_parse_header_l(ngx_connectio
 
     case sw_read_value_len:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->literal.length = st->pint.value;
@@ -773,8 +789,9 @@ ngx_http_v3_parse_header_pbi(ngx_connect
 
     case sw_index:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 4, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 4, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->index = st->pint.value;
@@ -825,8 +842,9 @@ ngx_http_v3_parse_header_lpbi(ngx_connec
 
     case sw_index:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 3, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 3, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->index = st->pint.value;
@@ -842,8 +860,9 @@ ngx_http_v3_parse_header_lpbi(ngx_connec
 
     case sw_read_value_len:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->literal.length = st->pint.value;
@@ -1188,8 +1207,9 @@ ngx_http_v3_parse_encoder(ngx_connection
 
     case sw_capacity:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 5, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 5, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         rc = ngx_http_v3_set_capacity(c, st->pint.value);
@@ -1201,8 +1221,9 @@ ngx_http_v3_parse_encoder(ngx_connection
 
     case sw_duplicate:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 5, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 5, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         rc = ngx_http_v3_duplicate(c, st->pint.value);
@@ -1251,8 +1272,9 @@ ngx_http_v3_parse_header_inr(ngx_connect
 
     case sw_name_index:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->index = st->pint.value;
@@ -1268,8 +1290,9 @@ ngx_http_v3_parse_header_inr(ngx_connect
 
     case sw_read_value_len:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->literal.length = st->pint.value;
@@ -1343,8 +1366,9 @@ ngx_http_v3_parse_header_iwnr(ngx_connec
 
     case sw_name_len:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 5, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 5, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->literal.length = st->pint.value;
@@ -1380,8 +1404,9 @@ ngx_http_v3_parse_header_iwnr(ngx_connec
 
     case sw_read_value_len:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         st->literal.length = st->pint.value;
@@ -1465,8 +1490,9 @@ ngx_http_v3_parse_decoder(ngx_connection
 
     case sw_ack_header:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         rc = ngx_http_v3_ack_header(c, st->pint.value);
@@ -1478,8 +1504,9 @@ ngx_http_v3_parse_decoder(ngx_connection
 
     case sw_cancel_stream:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         rc = ngx_http_v3_cancel_stream(c, st->pint.value);
@@ -1491,8 +1518,9 @@ ngx_http_v3_parse_decoder(ngx_connection
 
     case sw_inc_insert_count:
 
-        if (ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch) != NGX_DONE) {
-            break;
+        rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, ch);
+        if (rc != NGX_DONE) {
+            return rc;
         }
 
         rc = ngx_http_v3_inc_insert_count(c, st->pint.value);