]> git.kaiwu.me - nginx.git/commitdiff
HTTP/3: require mandatory uni streams before additional ones.
authorRoman Arutyunyan <arut@nginx.com>
Thu, 29 Jul 2021 07:03:36 +0000 (10:03 +0300)
committerRoman Arutyunyan <arut@nginx.com>
Thu, 29 Jul 2021 07:03:36 +0000 (10:03 +0300)
As per quic-http-34:

   Endpoints SHOULD create the HTTP control stream as well as the
   unidirectional streams required by mandatory extensions (such as the
   QPACK encoder and decoder streams) first, and then create additional
   streams as allowed by their peer.

Previously, client could create and destroy additional uni streams unlimited
number of times before creating mandatory streams.

src/http/v3/ngx_http_v3_streams.c

index fa39be78aab024712ad38d3d4327682d6ba2b7d4..693225b891a2ba0cd67ec4f8bcb448f3671109f1 100644 (file)
@@ -91,6 +91,8 @@ ngx_http_v3_register_uni_stream(ngx_connection_t *c, uint64_t type)
     ngx_http_v3_session_t     *h3c;
     ngx_http_v3_uni_stream_t  *us;
 
+    h3c = ngx_http_v3_get_session(c);
+
     switch (type) {
 
     case NGX_HTTP_V3_STREAM_ENCODER:
@@ -119,12 +121,19 @@ ngx_http_v3_register_uni_stream(ngx_connection_t *c, uint64_t type)
 
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
                        "http3 stream 0x%02xL", type);
+
+        if (h3c->known_streams[NGX_HTTP_V3_STREAM_CLIENT_ENCODER] == NULL
+            || h3c->known_streams[NGX_HTTP_V3_STREAM_CLIENT_DECODER] == NULL
+            || h3c->known_streams[NGX_HTTP_V3_STREAM_CLIENT_CONTROL] == NULL)
+        {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0, "missing mandatory stream");
+            return NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR;
+        }
+
         index = -1;
     }
 
     if (index >= 0) {
-        h3c = ngx_http_v3_get_session(c);
-
         if (h3c->known_streams[index]) {
             ngx_log_error(NGX_LOG_INFO, c->log, 0, "stream exists");
             return NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR;