Bug 1870807 - Adjust BucketFS gtests to new partitioning checks. r=dom-storage-reviewers,asuth

Differential Revision: https://phabricator.services.mozilla.com/D236998

Author: jjjalkanen

dom/fs/api/FileSystemManager.cpp

@@ -101,8 +101,8 @@ void FileSystemManager::BeginRequest(
 
   nsICookieJarSettings* cookieJarSettings = mGlobal->GetCookieJarSettings();
   nsIPrincipal* unpartitionedPrincipal = mGlobal->PrincipalOrNull();
-  if (NS_WARN_IF(!cookieJarSettings || !unpartitionedPrincipal ||
-                 unpartitionedPrincipal->GetIsInPrivateBrowsing())) {
+  if (NS_WARN_IF(!cookieJarSettings) || NS_WARN_IF(!unpartitionedPrincipal) ||
+      NS_WARN_IF(unpartitionedPrincipal->GetIsInPrivateBrowsing())) {
     // ePartition values can be returned for Private Browsing Mode
     // for third-party iframes, so we also need to check the private browsing
     // in that case which means we need to check the principal.
@@ -117,10 +117,7 @@ void FileSystemManager::BeginRequest(
   const bool allowed = access == StorageAccess::eAllow ||
                        StoragePartitioningEnabled(access, cookieJarSettings);
   if (NS_WARN_IF(!allowed)) {
-    const nsresult err = StorageAccess::ePrivateBrowsing == access
-                             ? NS_ERROR_DOM_NOT_SUPPORTED_ERR
-                             : NS_ERROR_DOM_SECURITY_ERR;
-    aFailure(err);
+    aFailure(NS_ERROR_DOM_SECURITY_ERR);
     return;
   }
 

dom/fs/test/gtest/FileSystemMocks.cpp

@@ -32,6 +32,13 @@ nsIGlobalObject* GetGlobal() {
   return global.get();
 }
 
+MockGlobalObject* GetMockGlobal() {
+  nsCOMPtr<nsIGlobalObject> global = GetGlobal();
+  MockGlobalObject* mock = new MockGlobalObject(std::move(global));
+
+  return mock;
+}
+
 nsresult GetAsString(const RefPtr<Promise>& aPromise, nsAString& aString) {
   AutoJSAPI jsapi;
   DebugOnly<bool> ok = jsapi.Init(xpc::PrivilegedJunkScope());
@@ -92,3 +99,23 @@ mozilla::ipc::PrincipalInfo GetPrincipalInfo() {
 }
 
 }  // namespace mozilla::dom::fs::test
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_CLASS(MockGlobalObject)
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(MockGlobalObject)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mGlobal)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(MockGlobalObject)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGlobal)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_INTERFACE_TABLE_HEAD(MockGlobalObject)
+  NS_WRAPPERCACHE_INTERFACE_TABLE_ENTRY
+  NS_INTERFACE_TABLE(MockGlobalObject, nsIGlobalObject)
+  NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(MockGlobalObject)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(MockGlobalObject)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(MockGlobalObject)

dom/fs/test/gtest/FileSystemMocks.h

@@ -34,6 +34,8 @@
 #include "nsISupportsImpl.h"
 #include "nsITimer.h"
 
+class MockGlobalObject;
+
 namespace mozilla::dom::fs {
 
 inline std::ostream& operator<<(std::ostream& aOut,
@@ -45,6 +47,8 @@ namespace test {
 
 nsIGlobalObject* GetGlobal();
 
+MockGlobalObject* GetMockGlobal();
+
 nsresult GetAsString(const RefPtr<Promise>& aPromise, nsAString& aString);
 
 mozilla::ipc::PrincipalInfo GetPrincipalInfo();
@@ -337,4 +341,64 @@ MOCK_PROMISE_LISTENER(
 MOCK_PROMISE_LISTENER(ExpectResolveCalled, mozilla::dom::fs::test::MockExpectMe,
                       mozilla::dom::fs::test::FailOnCall);
 
+#define MOCKGLOBALOBJECT_IID                  \
+  {/* c0a93d91-9c15-49e1-abed-890b3679ac6e */ \
+   0xc0a93d91,                                \
+   0x9c15,                                    \
+   0x49e1,                                    \
+   {0xab, 0xed, 0x89, 0x0b, 0x36, 0x79, 0xac, 0x6e}}
+
+class MockGlobalObject : public nsIGlobalObject, public nsWrapperCache {
+ public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_WRAPPERCACHE_CLASS(MockGlobalObject)
+
+  NS_DECLARE_STATIC_IID_ACCESSOR(MOCKGLOBALOBJECT_IID)
+
+  explicit MockGlobalObject(nsCOMPtr<nsIGlobalObject>&& aGlobal)
+      : mGlobal(std::move(aGlobal)) {}
+
+  JSObject* GetGlobalJSObject() override {
+    return mGlobal->GetGlobalJSObject();
+  }
+
+  JSObject* GetGlobalJSObjectPreserveColor() const override {
+    return mGlobal->GetGlobalJSObjectPreserveColor();
+  }
+
+  MOCK_METHOD(JSObject*, WrapObject,
+              (JSContext * aCx, JS::Handle<JSObject*> aGivenProto), (override));
+
+  MOCK_METHOD(nsICookieJarSettings*, GetCookieJarSettings, (), (override));
+
+  MOCK_METHOD(nsIPrincipal*, PrincipalOrNull, (), (const));
+
+  MOCK_METHOD(mozilla::StorageAccess, GetStorageAccess, (), (override));
+
+  JS::loader::ModuleLoaderBase* GetModuleLoader(JSContext* aCx) override {
+    return mGlobal->GetModuleLoader(aCx);
+  }
+
+  bool ShouldResistFingerprinting(RFPTarget aTarget) const override {
+    return mGlobal->ShouldResistFingerprinting(std::move(aTarget));
+  }
+
+  nsISerialEventTarget* SerialEventTarget() const override {
+    return mGlobal->SerialEventTarget();
+  }
+
+  nsresult Dispatch(already_AddRefed<nsIRunnable>&& aRunnable) const override {
+    return mGlobal->Dispatch(std::move(aRunnable));
+  }
+
+  mozilla::OriginTrials Trials() const override { return mGlobal->Trials(); }
+
+ protected:
+  ~MockGlobalObject() = default;
+
+  nsCOMPtr<nsIGlobalObject> mGlobal;
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(MockGlobalObject, MOCKGLOBALOBJECT_IID)
+
 #endif  // DOM_FS_TEST_GTEST_FILESYSTEMMOCKS_H_

dom/fs/test/gtest/child/TestFileSystemRequestHandler.cpp

@@ -20,6 +20,7 @@
 #include "mozilla/dom/StorageManager.h"
 #include "mozilla/ipc/FileDescriptorUtils.h"
 #include "mozilla/ipc/IPCCore.h"
+#include "mozilla/net/CookieJarSettings.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIFile.h"
 
@@ -33,6 +34,12 @@ namespace mozilla::dom::fs::test {
 class TestFileSystemRequestHandler : public ::testing::Test {
  protected:
   void SetUp() override {
+    mMockGlobal = GetMockGlobal();
+    mGlobal = mMockGlobal;
+
+    mCookieJarSettings = mozilla::net::CookieJarSettings::Create(
+        mozilla::net::CookieJarSettings::CreateMode::eRegular,
+        /* Should resist fingerprinting */ true);
     mListener = MakeAndAddRef<ExpectResolveCalled>();
 
     mChild = FileSystemChildMetadata("parent"_ns, u"ChildName"_ns);
@@ -92,17 +99,30 @@ class TestFileSystemRequestHandler : public ::testing::Test {
     ASSERT_TRUE(mManager->IsShutdown());
   }
 
-  nsIGlobalObject* mGlobal = GetGlobal();
+  void AllowStorageAccess() {
+    EXPECT_CALL(*mMockGlobal, GetCookieJarSettings())
+        .WillOnce(::testing::Return(&*mCookieJarSettings));
+
+    EXPECT_CALL(*mMockGlobal, GetStorageAccess())
+        .WillOnce(::testing::Return(mozilla::StorageAccess::eAllow));
+  }
+
+  MockGlobalObject* mMockGlobal;
+  nsCOMPtr<nsIGlobalObject> mGlobal;
+
   RefPtr<ExpectResolveCalled> mListener;
 
   FileSystemChildMetadata mChild;
   FileSystemEntryMetadata mEntry;
   nsString mName;
   RefPtr<TestFileSystemManagerChild> mFileSystemManagerChild;
   RefPtr<FileSystemManager> mManager;
+  RefPtr<nsICookieJarSettings> mCookieJarSettings;
 };
 
 TEST_F(TestFileSystemRequestHandler, isGetRootHandleSuccessful) {
+  AllowStorageAccess();
+
   auto fakeResponse = [](auto&& aResolve, auto&& /* aReject */) {
     EntryId expected = "expected"_ns;
     FileSystemGetHandleResponse response(expected);
@@ -132,6 +152,8 @@ TEST_F(TestFileSystemRequestHandler, isGetRootHandleBlockedAfterShutdown) {
 }
 
 TEST_F(TestFileSystemRequestHandler, isGetDirectoryHandleSuccessful) {
+  AllowStorageAccess();
+
   auto fakeResponse = [](const auto& /* aRequest */, auto&& aResolve,
                          auto&& /* aReject */) {
     EntryId expected = "expected"_ns;
@@ -164,6 +186,8 @@ TEST_F(TestFileSystemRequestHandler, isGetDirectoryHandleBlockedAfterShutdown) {
 }
 
 TEST_F(TestFileSystemRequestHandler, isGetFileHandleSuccessful) {
+  AllowStorageAccess();
+
   auto fakeResponse = [](const auto& /* aRequest */, auto&& aResolve,
                          auto&& /* aReject */) {
     EntryId expected = "expected"_ns;
@@ -195,6 +219,8 @@ TEST_F(TestFileSystemRequestHandler, isGetFileHandleBlockedAfterShutdown) {
 }
 
 TEST_F(TestFileSystemRequestHandler, isGetFileSuccessful) {
+  AllowStorageAccess();
+
   auto fakeResponse = [](const auto& /* aRequest */, auto&& aResolve,
                          auto&& /* aReject */) {
     // We have to create a temporary file
@@ -276,6 +302,8 @@ TEST_F(TestFileSystemRequestHandler, isGetWritableBlockedAfterShutdown) {
 }
 
 TEST_F(TestFileSystemRequestHandler, isGetEntriesSuccessful) {
+  AllowStorageAccess();
+
   auto fakeResponse = [](const auto& /* aRequest */, auto&& aResolve,
                          auto&& /* aReject */) {
     nsTArray<FileSystemEntryMetadata> files;
@@ -320,6 +348,8 @@ TEST_F(TestFileSystemRequestHandler, isGetEntriesBlockedAfterShutdown) {
 }
 
 TEST_F(TestFileSystemRequestHandler, isRemoveEntrySuccessful) {
+  AllowStorageAccess();
+
   auto fakeResponse = [](const auto& /* aRequest */, auto&& aResolve,
                          auto&& /* aReject */) {
     FileSystemRemoveEntryResponse response(mozilla::void_t{});