Handle empty password fast path in caching_sha2_password

nikic · nikic · commit 32cd373dfd4e · 2019-12-27T17:27:45.000+01:00
If an empty password is used, no additional packets are exchanged
during caching_sha2_password auth. We're only looking for an
OK/ERR response.
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
@@ -1066,8 +1066,13 @@ mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plu
 {
 	DBG_ENTER("mysqlnd_caching_sha2_handle_server_response");
 	MYSQLND_PACKET_CACHED_SHA2_RESULT result_packet;
-	conn->payload_decoder_factory->m.init_cached_sha2_result_packet(&result_packet);
 
+	if (passwd_len == 0) {
+		DBG_INF("empty password fast path");
+		DBG_RETURN(PASS);
+	}
+
+	conn->payload_decoder_factory->m.init_cached_sha2_result_packet(&result_packet);
 	if (FAIL == PACKET_READ(conn, &result_packet)) {
 		DBG_RETURN(PASS);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1066,8 +1066,13 @@ mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plu`
`1066`	`1066`	`{`
`1067`	`1067`	`DBG_ENTER("mysqlnd_caching_sha2_handle_server_response");`
`1068`	`1068`	`MYSQLND_PACKET_CACHED_SHA2_RESULT result_packet;`
`1069`		`- conn->payload_decoder_factory->m.init_cached_sha2_result_packet(&result_packet);`
`1070`	`1069`
	`1070`	`+ if (passwd_len == 0) {`
	`1071`	`+ DBG_INF("empty password fast path");`
	`1072`	`+ DBG_RETURN(PASS);`
	`1073`	`+ }`
	`1074`	`+`
	`1075`	`+ conn->payload_decoder_factory->m.init_cached_sha2_result_packet(&result_packet);`
`1071`	`1076`	`if (FAIL == PACKET_READ(conn, &result_packet)) {`
`1072`	`1077`	`DBG_RETURN(PASS);`
`1073`	`1078`	`}`