Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix renaming issue with invalid file character url #2708

Merged
merged 3 commits into from
Nov 19, 2022
Merged

Fix renaming issue with invalid file character url #2708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
335161e
Fix wininet download api
yao-msft Nov 17, 2022
6333938
Fix rename
yao-msft Nov 17, 2022
b3c6153
tests
yao-msft Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/AppInstallerCLICore/Workflows/DownloadFlow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ namespace AppInstaller::CLI::Workflow

filename += installerExtension;

// Make file name suitable for file system path
filename = Utility::ConvertToUTF16(Utility::MakeSuitablePathPart(filename.u8string()));

return filename;
}

Expand Down
3 changes: 3 additions & 0 deletions src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,9 @@
<CopyFileToFolders Include="TestData\InstallFlowTest_Exe.yaml">
<DeploymentContent>true</DeploymentContent>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallFlowTest_InvalidFileCharacterUrl.yaml">
<DeploymentContent>true</DeploymentContent>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallFlowTest_Msix_DownloadFlow.yaml">
<DeploymentContent>true</DeploymentContent>
</CopyFileToFolders>
Expand Down
3 changes: 3 additions & 0 deletions src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,9 @@
<CopyFileToFolders Include="TestData\InstallFlowTest_Exe.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallFlowTest_InvalidFileCharacterUrl.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallFlowTest_LicenseAgreement.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
Expand Down
18 changes: 18 additions & 0 deletions src/AppInstallerCLITests/TestData/InstallFlowTest_InvalidFileCharacterUrl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Id: AppInstallerCliTest.InvalidFileCharacterUrlTest
Version: 1.0.0.0
Name: AppInstaller Test Exe Installer
Publisher: Microsoft Corporation
AppMoniker: AICLITestExe
License: Test
ProductCode: AppInstallerCliTest.TestExeInstaller
Installers:
- Arch: x64
Url: https://EncodedUrlTest/te*st.exe
InstallerType: exe
Sha256: 65DB2F2AC2686C7F2FD69D4A4C6683B888DC55BFA20A0E32CA9F838B51689A3B
Switches:
Custom: /invalidFileCharacterUrl
SilentWithProgress: /silentwithprogress
Silent: /silence
Update: /update
ManifestVersion: 0.1.0
32 changes: 32 additions & 0 deletions src/AppInstallerCLITests/WorkFlow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,38 @@ TEST_CASE("InstallFlow_RenameFromEncodedUrl", "[InstallFlow][workflow]")
REQUIRE(installResultStr.find("/encodedUrl") != std::string::npos);
}

TEST_CASE("InstallFlow_RenameFromInvalidFileCharacterUrl", "[InstallFlow][workflow]")
{
TestCommon::TempFile installResultPath("TestExeInstalled.txt");

std::ostringstream installOutput;
TestContext context{ installOutput, std::cin };
auto previousThreadGlobals = context.SetForCurrentThread();
OverrideForCheckExistingInstaller(context);
context.Override({ DownloadInstallerFile, [](TestContext& context)
{
context.Add<Data::HashPair>({ {}, {} });
auto installerPath = std::filesystem::temp_directory_path();
installerPath /= "InvalidFileCharacterUrlTest.exe";
std::filesystem::copy(TestDataFile("AppInstallerTestExeInstaller.exe"), installerPath, std::filesystem::copy_options::overwrite_existing);
context.Add<Data::InstallerPath>(installerPath);
} });
OverrideForUpdateInstallerMotw(context);
context.Args.AddArg(Execution::Args::Type::Manifest, TestDataFile("InstallFlowTest_InvalidFileCharacterUrl.yaml").GetPath().u8string());

InstallCommand install({});
install.Execute(context);
INFO(installOutput.str());

// Verify Installer is called and parameters are passed in.
REQUIRE(std::filesystem::exists(installResultPath.GetPath()));
std::ifstream installResultFile(installResultPath.GetPath());
REQUIRE(installResultFile.is_open());
std::string installResultStr;
std::getline(installResultFile, installResultStr);
REQUIRE(installResultStr.find("/invalidFileCharacterUrl") != std::string::npos);
}

TEST_CASE("InstallFlowNonZeroExitCode", "[InstallFlow][workflow]")
{
TestCommon::TempFile installResultPath("TestExeInstalled.txt");
Expand Down
14 changes: 8 additions & 6 deletions src/AppInstallerCommonCore/Downloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,19 @@ namespace AppInstaller::Utility

AICLI_LOG(Core, Info, << "WinINet downloading from url: " << url);

wil::unique_hinternet session(InternetOpenA(
Runtime::GetDefaultUserAgent().get().c_str(),
auto agentWide = Utility::ConvertToUTF16(Runtime::GetDefaultUserAgent().get());
wil::unique_hinternet session(InternetOpen(
agentWide.c_str(),
INTERNET_OPEN_TYPE_PRECONFIG,
NULL,
NULL,
0));
THROW_LAST_ERROR_IF_NULL_MSG(session, "InternetOpen() failed.");

wil::unique_hinternet urlFile(InternetOpenUrlA(
auto urlWide = Utility::ConvertToUTF16(url);
wil::unique_hinternet urlFile(InternetOpenUrl(
session.get(),
url.c_str(),
urlWide.c_str(),
NULL,
0,
INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS, // This allows http->https redirection
Expand All @@ -53,7 +55,7 @@ namespace AppInstaller::Utility
DWORD requestStatus = 0;
DWORD cbRequestStatus = sizeof(requestStatus);

THROW_LAST_ERROR_IF_MSG(!HttpQueryInfoA(urlFile.get(),
THROW_LAST_ERROR_IF_MSG(!HttpQueryInfo(urlFile.get(),
HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER,
&requestStatus,
&cbRequestStatus,
Expand All @@ -71,7 +73,7 @@ namespace AppInstaller::Utility
LONGLONG contentLength = 0;
DWORD cbContentLength = sizeof(contentLength);

HttpQueryInfoA(
HttpQueryInfo(
urlFile.get(),
HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER64,
&contentLength,
Expand Down