Use AMSI for archive malware scanning #4910
+233
−113
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,82 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT License. | ||
| #include "pch.h" | ||
| #include "TestCommon.h" | ||
| #include "WorkflowCommon.h" | ||
| #include <winget/Archive.h> | ||
| #include <Workflows/ShellExecuteInstallerHandler.h> | ||
|
|
||
| using namespace AppInstaller::Archive; | ||
| using namespace AppInstaller::CLI::Workflow; | ||
| using namespace AppInstaller::Settings; | ||
| using namespace TestCommon; | ||
|
|
||
| constexpr std::string_view s_ZipFile = "TestZip.zip"; | ||
| constexpr std::string_view s_TarGzFile = "TestTarGz.tar.gz"; | ||
| constexpr std::string_view s_Large7zFile = "TestLarge7z.7z"; | ||
|
|
||
| TEST_CASE("Extract_ZipArchive", "[archive]") | ||
| { | ||
| TestCommon::TempDirectory tempDirectory("TempDirectory"); | ||
| TestDataFile testZip(s_ZipFile); | ||
|
|
||
| const auto& testZipPath = testZip.GetPath(); | ||
| const auto& tempDirectoryPath = tempDirectory.GetPath(); | ||
|
|
||
| HRESULT hr = TryExtractArchive(testZipPath, tempDirectoryPath); | ||
|
|
||
| std::filesystem::path expectedPath = tempDirectoryPath / "test.txt"; | ||
| REQUIRE(SUCCEEDED(hr)); | ||
| REQUIRE(std::filesystem::exists(expectedPath)); | ||
| } | ||
|
|
||
| TEST_CASE("Scan_ZipArchive", "[archive]") | ||
| { | ||
| TestDataFile testZip(s_ZipFile); | ||
|
|
||
| const auto& testZipPath = testZip.GetPath(); | ||
| bool result = ScanZipFile(testZipPath); | ||
| REQUIRE(result); | ||
| } | ||
|
|
||
| TEST_CASE("Extract_TarGzArchive", "[archive]") | ||
| { | ||
| TestCommon::TempDirectory tempDirectory("TempDirectory"); | ||
| TestDataFile testTarGz(s_TarGzFile); | ||
|
|
||
| TestCommon::TestUserSettings testSettings; | ||
| testSettings.Set<Setting::ArchiveExtractionMethod>(AppInstaller::Archive::ExtractionMethod::Tar); | ||
|
|
||
| const auto& testTarGzPath = testTarGz.GetPath(); | ||
| const auto& tempDirectoryPath = tempDirectory.GetPath(); | ||
|
|
||
| ShellExecuteExtractArchive(testTarGzPath, tempDirectoryPath); | ||
|
|
||
| std::ostringstream extractOutput; | ||
| TestContext context{ extractOutput, std::cin }; | ||
| context << ShellExecuteExtractArchive(testTarGzPath, tempDirectoryPath); | ||
|
|
||
| std::filesystem::path expectedPath = tempDirectoryPath / "test.txt"; | ||
| REQUIRE(SUCCEEDED(context.GetTerminationHR())); | ||
| REQUIRE(std::filesystem::exists(expectedPath)); | ||
| INFO(extractOutput.str()); | ||
| } | ||
|
|
||
| TEST_CASE("Scan_TarGzArchive", "[archive]") | ||
| { | ||
| TestDataFile testTarGz(s_TarGzFile); | ||
|
|
||
| const auto& testTarGzPath = testTarGz.GetPath(); | ||
| bool result = ScanZipFile(testTarGzPath); | ||
| REQUIRE(result); | ||
| } | ||
|
|
||
| //TEST_CASE("Scan_Large7zArchive", "[archive]") | ||
| //{ | ||
| // TestDataFile testLarge7z(s_Large7zFile); | ||
| // | ||
| // const auto& testTarGzPath = testLarge7z.GetPath(); | ||
| // bool result = ScanZipFile(testTarGzPath); | ||
| // REQUIRE(result); | ||
| //} | ||
|
|
||
|
There was a problem hiding this comment. This may be me being paranoid but I would be slightly concerned about having a binary checked without knowing what it is. Would be great if you could share how it gas generated so that we can validate that it's that (assuming it's a deterministic process) |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is missing