Reject unadvertised encodings

net/url_request/url_request_http_job_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_http_job.h"
 
 #include <stdint.h>
 
 #include <cstddef>
 #include <memory>
@@ skipping 124 matching lines @@
   std::unique_ptr<TestURLRequestHttpJob> job(
       new TestURLRequestHttpJob(request.get()));
   job->set_use_null_source_stream(true);
   test_job_interceptor_->set_main_intercept_job(std::move(job));
   request->Start();
 
   base::RunLoop().Run();
   EXPECT_EQ(ERR_CONTENT_DECODING_INIT_FAILED, delegate_.request_status());
 }
 
-// Tests that if there is an unknown content-encoding type, the raw response
-// body is passed through.
+// Tests that if there is an unknown content-encoding type.
 TEST_F(URLRequestHttpJobSetUpSourceTest, UnknownEncoding) {
   MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
                                "Content-Encoding: foo, gzip\r\n"
                                "Content-Length: 12\r\n\r\n"),
                       MockRead("Test Content")};
 
   StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
                                        arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   std::unique_ptr<URLRequest> request = context_.CreateRequest(
       GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate_);
   std::unique_ptr<TestURLRequestHttpJob> job(
       new TestURLRequestHttpJob(request.get()));
   test_job_interceptor_->set_main_intercept_job(std::move(job));
   request->Start();
 
   base::RunLoop().Run();
-  EXPECT_EQ(OK, delegate_.request_status());
-  EXPECT_EQ("Test Content", delegate_.data_received());
+  EXPECT_EQ(ERR_INVALID_CONTENT_ENCODING, delegate_.request_status());
 }
 
 // Received a malformed SDCH encoded response when there is no SdchManager.
 TEST_F(URLRequestHttpJobSetUpSourceTest, SdchNotAdvertisedGotSdchResponse) {
   MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
                                "Content-Encoding: sdch\r\n"
                                "Content-Length: 12\r\n\r\n"),
                       MockRead("Test Content")};
 
   StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
                                        arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   // This test expects TestURLRequestContexts to have no SdchManager.
   DCHECK(!context_.sdch_manager());
 
   std::unique_ptr<URLRequest> request = context_.CreateRequest(
       GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate_);
   std::unique_ptr<TestURLRequestHttpJob> job(
       new TestURLRequestHttpJob(request.get()));
   test_job_interceptor_->set_main_intercept_job(std::move(job));
   request->Start();
 
   base::RunLoop().Run();
-  // Pass through the raw response the same way as if received unknown encoding.
-  EXPECT_EQ(OK, delegate_.request_status());
-  EXPECT_EQ("Test Content", delegate_.data_received());
+  EXPECT_EQ(ERR_INVALID_CONTENT_ENCODING, delegate_.request_status());
 }
 
 class URLRequestHttpJobTest : public ::testing::Test {
  protected:
   URLRequestHttpJobTest() : context_(true) {
     context_.set_http_transaction_factory(&network_layer_);
 
     // The |test_job_factory_| takes ownership of the interceptor.
     test_job_interceptor_ = new TestJobInterceptor();
     EXPECT_TRUE(test_job_factory_.SetProtocolHandler(
@@ skipping 984 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(delegate_.request_status(), IsError(ERR_IO_PENDING));
   EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called());
 }
 
 #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
 
 }  // namespace
 
 }  // namespace net