Return error and add GoAwayFrame

Author: AnandInguva

internal/transport/http2_server.go

@@ -352,12 +352,7 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
 
 	if streamID%2 != 1 || streamID <= t.maxStreamID {
 		// illegal gRPC stream id.
-		t.controlBuf.put(&goAway{
-			code:      http2.ErrCodeProtocol,
-			debugData: []byte(fmt.Sprintf("received an illegal stream id: %+v", streamID)),
-			closeConn: fmt.Errorf("received an illegal stream id: %v. headers frame: %+v", streamID, frame),
-		})
-		return nil
+		return fmt.Errorf("received an illegal stream id: %v. headers frame: %+v", streamID, frame)
 	}
 	t.maxStreamID = streamID
 
@@ -647,8 +642,12 @@ func (t *http2Server) HandleStreams(ctx context.Context, handle func(*Stream)) {
 		switch frame := frame.(type) {
 		case *http2.MetaHeadersFrame:
 			if err := t.operateHeaders(ctx, frame, handle); err != nil {
-				t.Close(err)
-				break
+				t.controlBuf.put(&goAway{
+					code:      http2.ErrCodeProtocol,
+					debugData: []byte(err.Error()),
+					closeConn: err,
+				})
+				continue
 			}
 		case *http2.DataFrame:
 			t.handleData(frame)

test/end2end_test.go

@@ -3927,9 +3927,9 @@ func (s) TestClientInvalidStreamID(t *testing.T) {
 	st.writeHeadersGRPC(2, "/grpc.testing.TestService/StreamingInputCall", true)
 	goAwayFrame := st.wantGoAway(http2.ErrCodeProtocol)
 	got := string(goAwayFrame.DebugData()[:])
-	want := "received an illegal stream id: 2"
+	want := "received an illegal stream id: 2. headers frame: [FrameHeader HEADERS flags=END_STREAM|END_HEADERS stream=2 len=60]"
 	if got != want {
-		t.Fatalf("Debug data received from stream %v, want: %v", got, want)
+		t.Fatalf("Error received: %v, want: %v", got, want)
 	}
 }