Merge pull request #2742 from lucas-clemente/handshake-fuzz-post-hand…

…shake-messages send post-handshake message in the handshake fuzzer
quic-go · Sep 11, 2020 · 9a20621 · 9a20621
2 parents 7f27925 + 9430dbf
commit 9a20621
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 16 deletions.
diff --git a/fuzzing/handshake/cmd/corpus.go b/fuzzing/handshake/cmd/corpus.go
@@ -81,9 +81,10 @@ func main() {
 		&wire.TransportParameters{},
 		runner,
 		&tls.Config{
-			ServerName: "localhost",
-			NextProtos: []string{alpn},
-			RootCAs:    testdata.GetRootCA(),
+			ServerName:         "localhost",
+			NextProtos:         []string{alpn},
+			RootCAs:            testdata.GetRootCA(),
+			ClientSessionCache: tls.NewLRUClientSessionCache(1),
 		},
 		false,
 		utils.NewRTTStats(),
@@ -143,6 +144,15 @@ messageLoop:
 		}
 	}
 
+	ticket, err := server.GetSessionTicket()
+	if err != nil {
+		log.Fatal(err)
+	}
+	if ticket == nil {
+		log.Fatal("expected a session ticket")
+	}
+	messages = append(messages, ticket)
+
 	for _, m := range messages {
 		if err := helper.WriteCorpusFileWithPrefix("corpus", m, fuzzhandshake.PrefixLen); err != nil {
 			log.Fatal(err)

diff --git a/fuzzing/handshake/fuzz.go b/fuzzing/handshake/fuzz.go
@@ -101,16 +101,14 @@ type handshakeRunner interface {
 }
 
 type runner struct {
-	role    string // only used for logging
-	errored bool
-
+	errored        bool
 	client, server *handshake.CryptoSetup
 }
 
 var _ handshakeRunner = &runner{}
 
-func newRunner(client, server *handshake.CryptoSetup, role string) *runner {
-	return &runner{role: role, client: client, server: server}
+func newRunner(client, server *handshake.CryptoSetup) *runner {
+	return &runner{client: client, server: server}
 }
 
 func (r *runner) OnReceivedParams(*wire.TransportParameters) {}
@@ -171,6 +169,8 @@ func Fuzz(data []byte) int {
 	enable0RTTClient := helper.NthBit(data[0], 0)
 	enable0RTTServer := helper.NthBit(data[0], 1)
 	useSessionTicketCache := helper.NthBit(data[0], 2)
+	sendPostHandshakeMessageToClient := helper.NthBit(data[0], 3)
+	sendPostHandshakeMessageToServer := helper.NthBit(data[0], 4)
 	messageToReplace := data[1] % 32
 	messageToReplaceEncLevel := toEncryptionLevel(data[1] >> 6)
 	data = data[PrefixLen:]
@@ -185,15 +185,15 @@ func Fuzz(data []byte) int {
 	}
 	cChunkChan, cInitialStream, cHandshakeStream := initStreams()
 	var client, server handshake.CryptoSetup
-	clientRunner := newRunner(&client, &server, "client")
+	runner := newRunner(&client, &server)
 	client, _ = handshake.NewCryptoSetupClient(
 		cInitialStream,
 		cHandshakeStream,
 		protocol.ConnectionID{},
 		nil,
 		nil,
 		&wire.TransportParameters{},
-		clientRunner,
+		runner,
 		clientConf,
 		enable0RTTClient,
 		utils.NewRTTStats(),
@@ -202,15 +202,14 @@ func Fuzz(data []byte) int {
 	)
 
 	sChunkChan, sInitialStream, sHandshakeStream := initStreams()
-	serverRunner := newRunner(&client, &server, "server")
 	server = handshake.NewCryptoSetupServer(
 		sInitialStream,
 		sHandshakeStream,
 		protocol.ConnectionID{},
 		nil,
 		nil,
 		&wire.TransportParameters{},
-		serverRunner,
+		runner,
 		&tls.Config{
 			Certificates: []tls.Certificate{*cert},
 			NextProtos:   []string{alpn},
@@ -229,7 +228,6 @@ func Fuzz(data []byte) int {
 	go func() {
 		defer close(serverHandshakeCompleted)
 		server.RunHandshake()
-		// TODO: send session ticket
 	}()
 
 	clientHandshakeCompleted := make(chan struct{})
@@ -269,13 +267,24 @@ messageLoop:
 		case <-done: // test done
 			break messageLoop
 		}
-		if clientRunner.errored || serverRunner.errored {
+		if runner.errored {
 			break messageLoop
 		}
 	}
 
-	<-serverHandshakeCompleted
-	<-clientHandshakeCompleted
+	<-done
+	if runner.errored {
+		return 1
+	}
+	if sendPostHandshakeMessageToClient {
+		if _, err := server.GetSessionTicket(); err != nil {
+			panic(err)
+		}
+		client.HandleMessage(data, messageToReplaceEncLevel)
+	}
+	if sendPostHandshakeMessageToServer {
+		server.HandleMessage(data, messageToReplaceEncLevel)
+	}
 
 	return 1
 }