Browse Source

QUIC sniffer: Fix potential slice panic (#4732)

Fixes https://github.com/XTLS/Xray-core/issues/3914#issuecomment-2853392827
风扇滑翔翼 5 months ago
parent
commit
ef1c165cc5
2 changed files with 22 additions and 0 deletions
  1. 4 0
      common/protocol/quic/sniff.go
  2. 18 0
      common/protocol/quic/sniff_test.go

+ 4 - 0
common/protocol/quic/sniff.go

@@ -114,6 +114,10 @@ func SniffQUIC(b []byte) (*SniffHeader, error) {
 		if err != nil {
 			return nil, errNotQuic
 		}
+		// packetLen is impossible to be shorter than this
+		if packetLen < 4 {
+			return nil, errNotQuic
+		}
 
 		hdrLen := len(b) - int(buffer.Len())
 		if len(b) < hdrLen+int(packetLen) {

+ 18 - 0
common/protocol/quic/sniff_test.go

@@ -267,3 +267,21 @@ func TestSniffQUICPacketNumberLength4(t *testing.T) {
 		t.Error("failed")
 	}
 }
+
+func TestSniffFakeQUICPacketWithInvalidPacketNumberLength(t *testing.T) {
+	pkt, err := hex.DecodeString("cb00000001081c8c6d5aeb53d54400000090709b8600000000000000000000000000000000")
+	common.Must(err)
+	_, err = quic.SniffQUIC(pkt)
+	if err == nil {
+		t.Error("failed")
+	}
+}
+
+func TestSniffFakeQUICPacketWithTooShortData(t *testing.T) {
+	pkt, err := hex.DecodeString("cb00000001081c8c6d5aeb53d54400000090709b86")
+	common.Must(err)
+	_, err = quic.SniffQUIC(pkt)
+	if err == nil {
+		t.Error("failed")
+	}
+}