Eliminate double counting and redundant Balsa HTTP validation code counts Removes redundant and double-counted `QUICHE_CODE_COUNT` invocations from `balsa_frame.cc` and updates the corresponding `ExpectCodeCount` assertions in `balsa_frame_test.cc`: - `sanitize_cr_tab_in_first_line_sanitized` in `ParseHTTPFirstLine`: redundant with `tab_or_cr_found_in_firstline_sanitized` in `BalsaFrame::ProcessFirstLine`. - `sanitize_firstline_spaces_sanitized` in `ParseHTTPFirstLine`: redundant with `multiple_spaces_in_firstline_sanitized` in `BalsaFrame::ProcessFirstLine`. - `sanitize_obs_fold_in_header_values_enforced` in `BalsaFrame::FindColonsAndParseIntoKeyValue` and `BalsaFrame::ProcessHeaderLines`: double-counted across per-line parsing and header folding, and redundant with `obs_fold_in_header_values_sanitized` and `obs_fold_in_trailer_values_sanitized`. PiperOrigin-RevId: 1013315469
diff --git a/quiche/balsa/balsa_frame.cc b/quiche/balsa/balsa_frame.cc index 46c5dac..4340cac 100644 --- a/quiche/balsa/balsa_frame.cc +++ b/quiche/balsa/balsa_frame.cc
@@ -187,7 +187,6 @@ return false; } QUICHE_DCHECK(whitespace_option == FirstLineValidationOption::SANITIZE); - QUICHE_CODE_COUNT(sanitize_cr_tab_in_first_line_sanitized); std::replace_if( pos, end, [](char c) { return c == '\r' || c == '\t'; }, ' '); cr_tab_sanitized = true; @@ -281,7 +280,6 @@ begin + headers->non_whitespace_3_idx_, headers->whitespace_4_idx_ - headers->non_whitespace_3_idx_); - QUICHE_CODE_COUNT(sanitize_firstline_spaces_sanitized); headers->SetRequestFirstlineFromStringPieces(part1, part2, part3); begin = headers->BeginningOfFirstLine(); multiple_spaces_sanitized = true; @@ -588,7 +586,6 @@ protocol_defects_.obs_fold_in_header_values = true; } if (http_validation_policy().sanitize_obs_fold_in_header_values) { - QUICHE_CODE_COUNT(sanitize_obs_fold_in_header_values_enforced); *has_continuation_lines = true; header_has_continuation_line = true; if (is_trailer) { @@ -856,7 +853,6 @@ } if (http_validation_policy().sanitize_obs_fold_in_header_values && has_continuation_lines) { - QUICHE_CODE_COUNT(sanitize_obs_fold_in_header_values_enforced); headers->FoldContinuationLines(); } // At this point, we've parsed all of the headers/trailers. Time to look
diff --git a/quiche/balsa/balsa_frame_test.cc b/quiche/balsa/balsa_frame_test.cc index 530e693..7ea0e71 100644 --- a/quiche/balsa/balsa_frame_test.cc +++ b/quiche/balsa/balsa_frame_test.cc
@@ -928,8 +928,6 @@ code_counts, "sanitize_cr_tab_in_first_line_rejected", tc.expected_error == BalsaFrameEnums::INVALID_WS_IN_REQUEST_LINE ? 1 : 0); - ExpectCodeCount(code_counts, "sanitize_cr_tab_in_first_line_sanitized", - tc.tab_or_cr_sanitized ? 1 : 0); ExpectCodeCount(code_counts, "tab_or_cr_found_in_firstline_sanitized", tc.tab_or_cr_sanitized ? 1 : 0); } @@ -1190,8 +1188,6 @@ ExpectCodeCount( code_counts, "sanitize_cr_tab_in_first_line_rejected", expected_error == BalsaFrameEnums::INVALID_WS_IN_STATUS_LINE ? 1 : 0); - ExpectCodeCount(code_counts, "sanitize_cr_tab_in_first_line_sanitized", - sanitized ? 1 : 0); ExpectCodeCount(code_counts, "tab_or_cr_found_in_firstline_sanitized", sanitized ? 1 : 0); } @@ -1406,8 +1402,7 @@ ExpectCodeCount( code_counts, "obs_fold_in_header_values_detected", expected_error_code == BalsaFrameEnums::OBS_FOLD_IN_HEADERS ? 1 : 0); - ExpectCodeCount(code_counts, "sanitize_obs_fold_in_header_values_enforced", - 0); + ExpectCodeCount(code_counts, "obs_fold_in_header_values_sanitized", 0); ExpectCodeCount(code_counts, "disallow_header_continuation_lines_enforced", 0); } @@ -2667,7 +2662,7 @@ EXPECT_TRUE(balsa_frame_.protocol_defects().multiple_spaces_in_firstline); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_detected", 1); ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_rejected", 0); - ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_sanitized", 0); + ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_sanitized", 0); } TEST_F(HTTPBalsaFrameTest, FirstlinesWithMultipleSpacesRejected) { @@ -2689,7 +2684,7 @@ EXPECT_TRUE(balsa_frame_.protocol_defects().multiple_spaces_in_firstline); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_detected", 1); ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_rejected", 1); - ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_sanitized", 0); + ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_sanitized", 0); } TEST_F(HTTPBalsaFrameTest, FirstlinesWithMultipleSpacesSanitized) { @@ -2716,7 +2711,6 @@ balsa_frame_.protocol_defects().multiple_spaces_in_firstline_sanitized); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_detected", 1); ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_rejected", 0); - ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_sanitized", 1); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_sanitized", 1); } @@ -2741,7 +2735,7 @@ EXPECT_TRUE(balsa_frame_.protocol_defects().multiple_spaces_in_firstline); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_detected", 1); ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_rejected", 0); - ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_sanitized", 0); + ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_sanitized", 0); } TEST_F(HTTPBalsaFrameTest, ResponseFirstlinesWithMultipleSpacesRejected) { @@ -2764,7 +2758,7 @@ EXPECT_TRUE(balsa_frame_.protocol_defects().multiple_spaces_in_firstline); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_detected", 1); ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_rejected", 1); - ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_sanitized", 0); + ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_sanitized", 0); } TEST_F(HTTPBalsaFrameTest, ResponseFirstlinesWithMultipleSpacesSanitized) { @@ -2792,7 +2786,6 @@ balsa_frame_.protocol_defects().multiple_spaces_in_firstline_sanitized); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_detected", 1); ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_rejected", 0); - ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_sanitized", 1); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_sanitized", 1); } @@ -5445,8 +5438,6 @@ ExpectCodeCount(code_counts_, "obs_fold_in_header_values_detected", 8); ExpectCodeCount(code_counts_, "disallow_header_continuation_lines_enforced", 0); - ExpectCodeCount(code_counts_, "sanitize_obs_fold_in_header_values_enforced", - 9); ExpectCodeCount(code_counts_, "obs_fold_in_header_values_sanitized", 8); } @@ -5921,10 +5912,8 @@ // The first line contains tabs and (after sanitization) multiple spaces, // both of which are sanitized by the most strict policy. ExpectCodeCount(code_counts_, "tab_or_cr_found_in_firstline_detected", 1); - ExpectCodeCount(code_counts_, "sanitize_cr_tab_in_first_line_sanitized", 1); ExpectCodeCount(code_counts_, "tab_or_cr_found_in_firstline_sanitized", 1); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_detected", 1); - ExpectCodeCount(code_counts_, "sanitize_firstline_spaces_sanitized", 1); ExpectCodeCount(code_counts_, "multiple_spaces_in_firstline_sanitized", 1); // All chunk extensions are well-formed. ExpectCodeCount(code_counts_,