Issue 4938 - fix race conditions related to LazyFileSystem

test/WebRequest.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 15 matching lines @@
 namespace
 {
   class DefaultWebRequestTest : public ::testing::Test
   {
   protected:
     void SetUp()
     {
       JsEngineCreationParameters jsEngineParams;
       jsEngineParams.logSystem = CreateLogSystem();
       jsEngineParams.timer.reset(new NoopTimer());
-      jsEngineParams.fileSystem.reset(new LazyFileSystem());
+      jsEngineParams.fileSystem.reset(fileSystem = new LazyFileSystem());
       jsEngineParams.webRequest = CreateWebRequest();
       jsEngine = CreateJsEngine(std::move(jsEngineParams));
     }
 
     virtual WebRequestPtr CreateWebRequest()
     {
       return CreateDefaultWebRequest();
     }
 
     virtual LogSystemPtr CreateLogSystem()
     {
       return LogSystemPtr(new ThrowingLogSystem());
     }
 
     JsEnginePtr jsEngine;
+    LazyFileSystem* fileSystem;
   };
 
   class MockWebRequestTest : public DefaultWebRequestTest
   {
     virtual WebRequestPtr CreateWebRequest() override
     {
       return DelayedWebRequest::New(webRequestTasks);
     }
 
   protected:
@@ skipping 109 matching lines @@
   ASSERT_EQ("[Adblock Plus ", jsEngine->Evaluate("foo.responseText.substr(0, 14)").AsString());
   ASSERT_EQ("text/plain", jsEngine->Evaluate("foo.responseHeaders['content-type'].substr(0, 10)").AsString());
 #if defined(HAVE_CURL)
   ASSERT_EQ("gzip", jsEngine->Evaluate("foo.responseHeaders['content-encoding'].substr(0, 4)").AsString());
 #endif
   ASSERT_TRUE(jsEngine->Evaluate("foo.responseHeaders['location']").IsUndefined());
 }
 
 TEST_F(DefaultWebRequestTest, XMLHttpRequest)
 {
-  auto filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
+  auto filterEngine = CreateFilterEngine(*fileSystem, jsEngine);
 
   ResetTestXHR(jsEngine, "https://easylist-downloads.adblockplus.org/easylist.txt");
   jsEngine->Evaluate("\
     request.setRequestHeader('X', 'Y');\
     request.setRequestHeader('X2', 'Y2');\
     request.send(null);");
   WaitForVariable("result", jsEngine);
   ASSERT_EQ(IWebRequest::NS_OK, jsEngine->Evaluate("request.channel.status").AsInt());
   ASSERT_EQ(200, jsEngine->Evaluate("request.status").AsInt());
   ASSERT_EQ("[Adblock Plus ", jsEngine->Evaluate("result.substr(0, 14)").AsString());
   ASSERT_EQ("text/plain", jsEngine->Evaluate("request.getResponseHeader('Content-Type').substr(0, 10)").AsString());
 #if defined(HAVE_CURL)
   ASSERT_EQ("gzip", jsEngine->Evaluate("request.getResponseHeader('Content-Encoding').substr(0, 4)").AsString());
 #endif
   ASSERT_TRUE(jsEngine->Evaluate("request.getResponseHeader('Location')").IsNull());
 }
 #else
 TEST_F(DefaultWebRequestTest, DummyWebRequest)
 {
   jsEngine->Evaluate("_webRequest.GET('https://easylist-downloads.adblockplus.org/easylist.txt', {}, function(result) {foo = result;} )");
   WaitForVariable("this.foo", jsEngine);
   ASSERT_EQ(IWebRequest::NS_ERROR_FAILURE, jsEngine->Evaluate("foo.status").AsInt());
   ASSERT_EQ(0, jsEngine->Evaluate("foo.responseStatus").AsInt());
   ASSERT_EQ("", jsEngine->Evaluate("foo.responseText").AsString());
   ASSERT_EQ("{}", jsEngine->Evaluate("JSON.stringify(foo.responseHeaders)").AsString());
 }
 
 TEST_F(DefaultWebRequestTest, XMLHttpRequest)
 {
-  auto filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
+  auto filterEngine = CreateFilterEngine(*fileSystem, jsEngine);
 
   ResetTestXHR(jsEngine);
   jsEngine->Evaluate("\
     request.setRequestHeader('X', 'Y');\
     request.send(null);");
   WaitForVariable("result", jsEngine);
   ASSERT_EQ(IWebRequest::NS_ERROR_FAILURE, jsEngine->Evaluate("request.channel.status").AsInt());
   ASSERT_EQ(0, jsEngine->Evaluate("request.status").AsInt());
   ASSERT_EQ("error", jsEngine->Evaluate("result").AsString());
   ASSERT_TRUE(jsEngine->Evaluate("request.getResponseHeader('Content-Type')").IsNull());
@@ skipping 35 matching lines @@
     {
       return LogSystemPtr(catchLogSystem = new CatchLogSystem());
     }
   protected:
     CatchLogSystem* catchLogSystem;
   };
 }
 
 TEST_F(MockWebRequestAndLogSystemTest, RequestHeaderValidation)
 {
-  auto filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
+  auto filterEngine = CreateFilterEngine(*fileSystem, jsEngine);
 
   const std::string msg = "Attempt to set a forbidden header was denied: ";
 
   // The test will check that console.warn has been called when the
   // header is rejected. While this is an implementation detail, we
   // have no other way to check this
 
   // test 'Accept-Encoding' is rejected
   catchLogSystem->clear();
   std::string url = ResetTestXHR(jsEngine);
@@ skipping 77 matching lines @@
   EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, catchLogSystem->lastLogLevel);
   EXPECT_EQ("", catchLogSystem->lastMessage);
   ProcessPendingWebRequests();
   {
     auto headersRequest = GetHeadersForRequest(url);
     EXPECT_TRUE(headersRequest.first);
     const auto& headers = headersRequest.second;
     EXPECT_FALSE(headers.cend() == headers.find("Security"));
   }
 }