Bug 1950424 part 2 - make nsFilePicker call the new Content Analysis "batch" entry point r=dlp-reviewers,win-reviewers,rkraesig,handyman

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

toolkit/components/contentanalysis/ContentAnalysis.cpp

@@ -3487,7 +3487,11 @@ ContentAnalysis::CheckFilesInBatchMode(
     uri = aURI;
   }
   for (auto* file : aFiles) {
+#ifdef XP_WIN
     nsString pathString(file->NativePath());
+#else
+    nsString pathString = NS_ConvertUTF8toUTF16(file->NativePath());
+#endif
 
     RefPtr<nsIContentAnalysisRequest> request =
         new mozilla::contentanalysis::ContentAnalysisRequest(

widget/windows/nsFilePicker.cpp

@@ -699,61 +699,48 @@ nsFilePicker::CheckContentAnalysisService() {
   if (!contentAnalysisIsActive ||
       !mozilla::StaticPrefs::
           browser_contentanalysis_interception_point_file_upload_enabled()) {
-    return nsFilePicker::ContentAnalysisResponse::CreateAndResolve(true,
+    nsCOMArray<nsIFile> files;
-                                                                   __func__);
+    if (mMode == modeGetFolder || !mUnicodeFile.IsEmpty()) {
+      RefPtr<nsIFile> folderOrFile;
+      nsresult rv = GetFile(getter_AddRefs(folderOrFile));
+      if (NS_WARN_IF(NS_FAILED(rv) || !folderOrFile)) {
+        return nsFilePicker::ContentAnalysisResponse::CreateAndReject(rv,
+                                                                      __func__);
+      }
+      files.AppendElement(folderOrFile);
+    } else {
+      // multiple selections
+      files.AppendElements(mFiles);
+    }
+    return nsFilePicker::ContentAnalysisResponse::CreateAndResolve(
+        std::move(files), __func__);
   }
 
   // Entries may be files or folders.  Folder contents will be recursively
   // checked.
-  nsTArray<mozilla::PathString> filePaths;
+  nsCOMArray<nsIFile> files;
   if (mMode == modeGetFolder || !mUnicodeFile.IsEmpty()) {
-    RefPtr<nsIFile> folderOrFile;
+    nsCOMPtr<nsIFile> folderOrFile;
     nsresult rv = GetFile(getter_AddRefs(folderOrFile));
     if (NS_WARN_IF(NS_FAILED(rv) || !folderOrFile)) {
       return nsFilePicker::ContentAnalysisResponse::CreateAndReject(rv,
                                                                     __func__);
     }
-    filePaths.AppendElement(folderOrFile->NativePath());
+    files.AppendElement(folderOrFile);
   } else {
     // multiple selections
-    std::transform(mFiles.begin(), mFiles.end(), MakeBackInserter(filePaths),
+    files.AppendElements(mFiles);
-                   [](auto* entry) { return entry->NativePath(); });
   }
-  MOZ_ASSERT(!filePaths.IsEmpty());
+  MOZ_ASSERT(!files.IsEmpty());
-
-  auto promise =
-      mozilla::MakeRefPtr<nsFilePicker::ContentAnalysisResponse::Private>(
-          __func__);
-  auto contentAnalysisCallback =
-      mozilla::MakeRefPtr<mozilla::contentanalysis::ContentAnalysisCallback>(
-          [promise](nsIContentAnalysisResult* aResult) {
-            promise->Resolve(aResult->GetShouldAllowContent(), __func__);
-          });
-
   auto* windowGlobal = mBrowsingContext->Canonical()->GetCurrentWindowGlobal();
   NS_ENSURE_TRUE(
       windowGlobal,
       nsFilePicker::ContentAnalysisResponse::CreateAndReject(rv, __func__));
-
+  // This will check all of the files even if BLOCK responses are received for
-  nsTArray<RefPtr<nsIContentAnalysisRequest>> requests(filePaths.Length());
+  // some of them, and the promise will resolve with the files that are ALLOWed.
-  for (auto& path : filePaths) {
+  return mozilla::contentanalysis::ContentAnalysis::CheckFilesInBatchMode(
-#ifdef XP_WIN
+      std::move(files), windowGlobal,
-    nsString pathString(std::move(path));
+      nsIContentAnalysisRequest::Reason::eFilePickerDialog);
-#else
-    nsString pathString = NS_ConvertUTF8toUTF16(path);
-#endif
-
-    requests.AppendElement(new mozilla::contentanalysis::ContentAnalysisRequest(
-        nsIContentAnalysisRequest::AnalysisType::eFileAttached,
-        nsIContentAnalysisRequest::Reason::eFilePickerDialog, pathString,
-        true /* aStringIsFilePath */, EmptyCString(), nullptr,
-        nsIContentAnalysisRequest::OperationType::eCustomDisplayString,
-        windowGlobal));
-  }
-
-  contentAnalysis->AnalyzeContentRequestsCallback(
-      requests, true /* aAutoAcknowledge */, contentAnalysisCallback);
-  return promise;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -818,13 +805,23 @@ nsresult nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) {
             self->mMode != modeSave && retValue != ResultCode::returnCancel) {
           self->CheckContentAnalysisService()->Then(
               mozilla::GetMainThreadSerialEventTarget(), __func__,
-              [retValue, callback, self = RefPtr{self}](bool aAllowContent) {
+              [retValue, callback,
-                if (aAllowContent) {
+               self = RefPtr{self}](nsCOMArray<nsIFile> aAllowedFiles) {
-                  callback->Done(retValue);
+                if (aAllowedFiles.IsEmpty()) {
-                } else {
                   self->ClearFiles();
                   callback->Done(ResultCode::returnCancel);
                 }
+                if (self->mMode == modeGetFolder ||
+                    !self->mUnicodeFile.IsEmpty()) {
+                  //  Callers will use mUnicodeFile, so just call the callback
+                  callback->Done(retValue);
+                  return;
+                }
+                // Only the files in aAllowedFiles should be returned, so
+                // swap these into mFiles.
+                self->ClearFiles();
+                aAllowedFiles.SwapElements(self->mFiles);
+                callback->Done(retValue);
               },
               [callback, self = RefPtr{self}](nsresult aError) {
                 self->ClearFiles();

widget/windows/nsFilePicker.h

@@ -99,7 +99,8 @@ class nsFilePicker final : public nsBaseWinFilePicker {
       const nsString& aInitialDir);
 
   void ClearFiles();
-  using ContentAnalysisResponse = mozilla::MozPromise<bool, nsresult, true>;
+  using ContentAnalysisResponse =
+      mozilla::MozPromise<nsCOMArray<nsIFile>, nsresult, true>;
   RefPtr<ContentAnalysisResponse> CheckContentAnalysisService();
 
  protected: