|
 |
09195bf |
diff -up chromium-122.0.6261.29/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar chromium-122.0.6261.29/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
|
|
|
09195bf |
--- chromium-122.0.6261.29/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar 2024-02-07 19:49:25.000000000 +0100
|
|
|
09195bf |
+++ chromium-122.0.6261.29/chrome/browser/safe_browsing/download_protection/file_analyzer.cc 2024-02-11 18:55:29.964450604 +0100
|
|
|
09195bf |
@@ -79,8 +79,6 @@ void FileAnalyzer::Start(const base::Fil
|
|
|
1f8fd84 |
|
|
|
1f8fd84 |
if (inspection_type == DownloadFileType::ZIP) {
|
|
|
1f8fd84 |
StartExtractZipFeatures();
|
|
|
1f8fd84 |
- } else if (inspection_type == DownloadFileType::RAR) {
|
|
|
1f8fd84 |
- StartExtractRarFeatures();
|
|
|
1f8fd84 |
#if BUILDFLAG(IS_MAC)
|
|
|
1f8fd84 |
} else if (inspection_type == DownloadFileType::DMG) {
|
|
|
1f8fd84 |
StartExtractDmgFeatures();
|
|
|
09195bf |
diff -up chromium-122.0.6261.29/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-122.0.6261.29/chrome/common/safe_browsing/BUILD.gn
|
|
|
09195bf |
--- chromium-122.0.6261.29/chrome/common/safe_browsing/BUILD.gn.nounrar 2024-02-07 19:49:27.000000000 +0100
|
|
|
09195bf |
+++ chromium-122.0.6261.29/chrome/common/safe_browsing/BUILD.gn 2024-02-11 18:55:29.965450629 +0100
|
|
|
debc727 |
@@ -143,7 +143,6 @@ source_set("safe_browsing") {
|
|
|
1f8fd84 |
"//components/safe_browsing/content/common:file_type_policies",
|
|
|
1f8fd84 |
"//components/safe_browsing/core/common",
|
|
|
1f8fd84 |
"//third_party/lzma_sdk/google:seven_zip_reader",
|
|
|
1f8fd84 |
- "//third_party/unrar:unrar",
|
|
|
1f8fd84 |
]
|
|
|
1f8fd84 |
|
|
|
1f8fd84 |
public_deps = [
|
|
|
09195bf |
diff -up chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.cc
|
|
|
09195bf |
--- chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2024-02-07 19:49:27.000000000 +0100
|
|
|
09195bf |
+++ chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.cc 2024-02-11 23:49:25.061324007 +0100
|
|
|
debc727 |
@@ -74,6 +74,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
|
|
|
09195bf |
const std::optional<std::string>& password,
|
|
|
1f8fd84 |
mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
|
|
|
1f8fd84 |
AnalyzeRarFileCallback callback) {
|
|
|
1f8fd84 |
+#if 0
|
|
|
1f8fd84 |
DCHECK(rar_file.IsValid());
|
|
|
1f8fd84 |
temp_file_getter_.Bind(std::move(temp_file_getter));
|
|
|
1f8fd84 |
callback_ = std::move(callback);
|
|
|
debc727 |
@@ -90,6 +91,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
|
|
|
debc727 |
/*password=*/password,
|
|
|
1f8fd84 |
std::move(analysis_finished_callback),
|
|
|
1f8fd84 |
std::move(temp_file_getter_callback), &results_);
|
|
|
1f8fd84 |
+#else
|
|
|
1f8fd84 |
+ NOTREACHED();
|
|
|
1f8fd84 |
+#endif
|
|
|
1f8fd84 |
}
|
|
|
1f8fd84 |
|
|
|
1f8fd84 |
void SafeArchiveAnalyzer::AnalyzeSevenZipFile(
|
|
|
09195bf |
diff -up chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.h.nounrar chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.h
|
|
|
09195bf |
--- chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.h.nounrar 2024-02-07 19:49:27.000000000 +0100
|
|
|
09195bf |
+++ chromium-122.0.6261.29/chrome/services/file_util/safe_archive_analyzer.h 2024-02-11 18:55:29.966450653 +0100
|
|
|
09195bf |
@@ -9,7 +9,6 @@
|
|
|
1f8fd84 |
|
|
|
1f8fd84 |
#include "chrome/common/safe_browsing/archive_analyzer_results.h"
|
|
|
1f8fd84 |
#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
|
|
|
1f8fd84 |
-#include "chrome/utility/safe_browsing/rar_analyzer.h"
|
|
|
1f8fd84 |
#include "chrome/utility/safe_browsing/seven_zip_analyzer.h"
|
|
|
1f8fd84 |
#include "chrome/utility/safe_browsing/zip_analyzer.h"
|
|
|
1f8fd84 |
#include "mojo/public/cpp/bindings/remote.h"
|
|
|
09195bf |
@@ -67,7 +66,6 @@ class SafeArchiveAnalyzer : public chrom
|
|
|
1f8fd84 |
void Timeout();
|
|
|
1f8fd84 |
|
|
|
1f8fd84 |
safe_browsing::ZipAnalyzer zip_analyzer_;
|
|
|
1f8fd84 |
- safe_browsing::RarAnalyzer rar_analyzer_;
|
|
|
1f8fd84 |
safe_browsing::SevenZipAnalyzer seven_zip_analyzer_;
|
|
|
1f8fd84 |
#if BUILDFLAG(IS_MAC)
|
|
|
1f8fd84 |
safe_browsing::dmg::DMGAnalyzer dmg_analyzer_;
|