http2: close stream and session on frameError

PR-URL: #42147
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

Author: RafaelGSS

lib/internal/http2/core.js

@@ -607,6 +607,8 @@ function onFrameError(id, type, code) {
 constemitter=session[kState].streams.get(id)||session;
 emitter[kUpdateTimer]();
 emitter.emit('frameError',type,code,id);
+session[kState].streams.get(id).close(code);
+session.close();
 }
 
 functiononAltSvc(stream,origin,alt){

src/node_http2.cc

@@ -1024,6 +1024,27 @@ void Http2Session::DecrefHeaders(const nghttp2_frame* frame) {
  }
 }
 
+uint32_tTranslateNghttp2ErrorCode(constint libErrorCode) {
+switch (libErrorCode) {
+caseNGHTTP2_ERR_STREAM_CLOSED:
+returnNGHTTP2_STREAM_CLOSED;
+caseNGHTTP2_ERR_HEADER_COMP:
+returnNGHTTP2_COMPRESSION_ERROR;
+caseNGHTTP2_ERR_FRAME_SIZE_ERROR:
+returnNGHTTP2_FRAME_SIZE_ERROR;
+caseNGHTTP2_ERR_FLOW_CONTROL:
+returnNGHTTP2_FLOW_CONTROL_ERROR;
+caseNGHTTP2_ERR_REFUSED_STREAM:
+returnNGHTTP2_REFUSED_STREAM;
+caseNGHTTP2_ERR_PROTO:
+caseNGHTTP2_ERR_HTTP_HEADER:
+caseNGHTTP2_ERR_HTTP_MESSAGING:
+returnNGHTTP2_PROTOCOL_ERROR;
+default:
+returnNGHTTP2_INTERNAL_ERROR;
+ }
+}
+
 // If nghttp2 is unable to send a queued up frame, it will call this callback
 // to let us know. If the failure occurred because we are in the process of
 // closing down the session or stream, we go ahead and ignore it. We don't
@@ -1060,7 +1081,7 @@ int Http2Session::OnFrameNotSent(nghttp2_session* handle,
  Local<Value> argv[3] = {
 Integer::New(isolate, frame->hd.stream_id),
 Integer::New(isolate, frame->hd.type),
-Integer::New(isolate, error_code)
+Integer::New(isolate, TranslateNghttp2ErrorCode(error_code))
  };
  session->MakeCallback(
  env->http2session_on_frame_error_function(),

test/parallel/test-http2-exceeds-server-trailer-size.js

@@ -0,0 +1,51 @@
+'use strict';
+
+constcommon=require('../common');
+if(!common.hasCrypto)
+common.skip('missing crypto');
+
+constassert=require('assert');
+const{ createServer, constants, connect }=require('http2');
+
+constserver=createServer();
+
+server.on('stream',(stream,headers)=>{
+stream.respond(undefined,{waitForTrailers: true});
+
+stream.on('data',common.mustNotCall());
+
+stream.on('wantTrailers',common.mustCall(()=>{
+// Trigger a frame error by sending a trailer that is too large
+stream.sendTrailers({'test-trailer': 'X'.repeat(64*1024)});
+}));
+
+stream.on('frameError',common.mustCall((frameType,errorCode)=>{
+assert.strictEqual(errorCode,constants.NGHTTP2_FRAME_SIZE_ERROR);
+}));
+
+stream.on('error',common.expectsError({
+code: 'ERR_HTTP2_STREAM_ERROR',
+}));
+
+stream.on('close',common.mustCall());
+
+stream.end();
+});
+
+server.listen(0,()=>{
+constclientSession=connect(`http://localhost:${server.address().port}`);
+
+clientSession.on('frameError',common.mustNotCall());
+clientSession.on('close',common.mustCall(()=>{
+server.close();
+}));
+
+constclientStream=clientSession.request();
+
+clientStream.on('close',common.mustCall());
+// These events mustn't be called once the frame size error is from the server
+clientStream.on('frameError',common.mustNotCall());
+clientStream.on('error',common.mustNotCall());
+
+clientStream.end();
+});

test/parallel/test-http2-options-max-headers-block-length.js

@@ -32,12 +32,12 @@ server.listen(0, common.mustCall(() => {
 }));
 
 req.on('frameError',common.mustCall((type,code)=>{
-assert.strictEqual(code,h2.constants.NGHTTP2_ERR_FRAME_SIZE_ERROR);
+assert.strictEqual(code,h2.constants.NGHTTP2_FRAME_SIZE_ERROR);
 }));
 
 req.on('error',common.expectsError({
 code: 'ERR_HTTP2_STREAM_ERROR',
 name: 'Error',
-message: 'Stream closed with error code NGHTTP2_REFUSED_STREAM'
+message: 'Stream closed with error code NGHTTP2_FRAME_SIZE_ERROR'
 }));
 }));