Send GoAwayFrame when illegal streamID is received

Author: AnandInguva

internal/transport/http2_server.go

@@ -349,10 +349,15 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
 		})
 		return nil
 	}
-
+	
 	if streamID%2 != 1 || streamID <= t.maxStreamID {
 		// illegal gRPC stream id.
-		return fmt.Errorf("received an illegal stream id: %v. headers frame: %+v", streamID, frame)
+		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
 	}
 	t.maxStreamID = streamID
 

internal/transport/transport_test.go

@@ -2592,22 +2592,3 @@ func TestConnectionError_Unwrap(t *testing.T) {
 		t.Error("ConnectionError does not unwrap")
 	}
 }
-
-// Test gRPC server's operateHeaders on a header with even stream ID.
-// Per [HTTP/2 spec]: Streams initiated by a client MUST use
-// odd-numbered stream identifiers. When received even stream ID, the
-// operateHeader returns error instead of writing the frame to the transport.
-//
-// [HTTP/2 spec]: https://httpwg.org/specs/rfc7540.html#StreamIdentifiers
-func TestServerOperateHeaderFailOnEvenStreamID(t *testing.T) {
-	hf := &http2.HeadersFrame{FrameHeader: http2.FrameHeader{StreamID: 2}}
-	metaHeaderFrame := &http2.MetaHeadersFrame{HeadersFrame: hf}
-	s := http2Server{}
-	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
-	defer cancel()
-	err := s.operateHeaders(ctx, metaHeaderFrame, nil)
-	want := "received an illegal stream id: 2. headers frame: [FrameHeader DATA stream=2 len=0]"
-	if got := err.Error(); got != want {
-		t.Fatalf("http2Server.operateHeaders() returned err: %v; want: %v", got, want)
-	}
-}

test/end2end_test.go

@@ -3925,9 +3925,15 @@ func (s) TestClientInvalidStreamID(t *testing.T) {
 	st := newServerTesterFromConn(t, conn)
 	st.greet()
 	st.writeHeadersGRPC(2, "/grpc.testing.TestService/StreamingInputCall", true)
-	_, err = st.fr.ReadFrame()
-	if err != io.EOF {
-		t.Fatalf("Error expected when Client StreamID is even %v", err)
+	frame, err := st.fr.ReadFrame()
+	switch frame := frame.(type) {
+	case *http2.GoAwayFrame:
+		// do nothing since GoAwayFrame is expected.
+		if frame.ErrCode != http2.ErrCodeProtocol {
+			t.Fatalf("GoAway Frame received with code %v, want code: http.ErrCodeProtocol", frame.ErrCode)
+		}
+	default:
+		t.Fatalf("want: GoAwayFrame. got: %v", frame)
 	}
 }